diff options
| author | Tom Rondeau | 2012-12-12 18:15:32 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-12-12 18:15:32 -0500 |
| commit | 9ac98067a8529d80501ab3c8122b3ce11e896657 (patch) | |
| tree | 31d9b7b384156d9cd3d9a23e57611563b5576487 /gr-blocks/lib/file_source_impl.h | |
| parent | 619a167471d060e2f1b49a9aac55a23b327afa88 (diff) | |
| parent | aeb7bbfdcb7cdab610de4b2576ecf7a3a92f8d50 (diff) | |
| download | gnuradio-9ac98067a8529d80501ab3c8122b3ce11e896657.tar.gz gnuradio-9ac98067a8529d80501ab3c8122b3ce11e896657.tar.bz2 gnuradio-9ac98067a8529d80501ab3c8122b3ce11e896657.zip | |
Merge branch 'master' into file_meta_data
Conflicts:
gr-utils/src/python/CMakeLists.txt
Diffstat (limited to 'gr-blocks/lib/file_source_impl.h')
| -rw-r--r-- | gr-blocks/lib/file_source_impl.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gr-blocks/lib/file_source_impl.h b/gr-blocks/lib/file_source_impl.h index c35d563d1..600fe80ab 100644 --- a/gr-blocks/lib/file_source_impl.h +++ b/gr-blocks/lib/file_source_impl.h @@ -31,15 +31,22 @@ namespace gr { class BLOCKS_API file_source_impl : public file_source { private: - size_t d_itemsize; - void *d_fp; - bool d_repeat; + size_t d_itemsize; + FILE *d_fp; + FILE *d_new_fp; + bool d_repeat; + bool d_updated; + boost::mutex fp_mutex; + void do_update(); + public: file_source_impl(size_t itemsize, const char *filename, bool repeat); ~file_source_impl(); bool seek(long seek_point, int whence); + void open(const char *filename, bool repeat); + void close(); int work(int noutput_items, gr_vector_const_void_star &input_items, |