diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-05-19 02:55:33 -0700 |
| commit | bb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch) | |
| tree | 0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-blocks/lib/file_meta_source_impl.h | |
| parent | e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff) | |
| parent | 0fa219774dcf9141ae91204f948c029b05673f3f (diff) | |
Merged in next_docs branch.
Diffstat (limited to 'gr-blocks/lib/file_meta_source_impl.h')
| -rw-r--r-- | gr-blocks/lib/file_meta_source_impl.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gr-blocks/lib/file_meta_source_impl.h b/gr-blocks/lib/file_meta_source_impl.h index 3f8ebda6ee..00d8d7e86f 100644 --- a/gr-blocks/lib/file_meta_source_impl.h +++ b/gr-blocks/lib/file_meta_source_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_BLOCKS_FILE_META_SOURCE_IMPL_H #define INCLUDED_BLOCKS_FILE_META_SOURCE_IMPL_H -#include <blocks/file_meta_source.h> -#include <gr_tags.h> +#include <gnuradio/blocks/file_meta_source.h> +#include <gnuradio/tags.h> #include <pmt/pmt.h> -#include <thread/thread.h> +#include <gnuradio/thread/thread.h> -#include <blocks/file_meta_sink.h> +#include <gnuradio/blocks/file_meta_sink.h> using namespace pmt; @@ -55,15 +55,15 @@ namespace gr { FILE *d_fp, *d_hdr_fp; meta_state_t d_state; - std::vector<gr_tag_t> d_tags; + std::vector<tag_t> d_tags; protected: bool _open(FILE **fp, const char *filename); bool read_header(pmt_t &hdr, pmt_t &extras); void parse_header(pmt_t hdr, uint64_t offset, - std::vector<gr_tag_t> &tags); + std::vector<tag_t> &tags); void parse_extras(pmt_t extras, uint64_t offset, - std::vector<gr_tag_t> &tags); + std::vector<tag_t> &tags); public: file_meta_source_impl(const std::string &filename, |