From 5faae9df3ad16bceb24b65fed63a8a8766b48ee9 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Wed, 2 Jan 2013 12:13:44 -0500 Subject: docs: fixing typo. --- docs/doxygen/other/metadata.dox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/doxygen/other/metadata.dox b/docs/doxygen/other/metadata.dox index f867a06f2..b527b2100 100644 --- a/docs/doxygen/other/metadata.dox +++ b/docs/doxygen/other/metadata.dox @@ -298,7 +298,7 @@ The file sink example can be switched to use a signal source instead of a UHD source, but no extra tagged data is used in this mode. The file source example pushes the data stream to a new raw file while -a tag debugger block prints out any tags observed in the metedata +a tag debugger block prints out any tags observed in the metadata file. A QT GUI time sink is used to look at the signal as well. The versions with 'vector' in the name are similar except they use -- cgit From f4500ccb63f9d7e35460d2699472e1cf498d8229 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 2 Jan 2013 09:32:12 -0800 Subject: blocks: fixed file_meta_sink/source_impl MSVC incompatibliity error --- gr-blocks/lib/file_meta_sink_impl.cc | 11 +++++++---- gr-blocks/lib/file_meta_source_impl.cc | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/gr-blocks/lib/file_meta_sink_impl.cc b/gr-blocks/lib/file_meta_sink_impl.cc index ad16e9fca..b707bfac4 100644 --- a/gr-blocks/lib/file_meta_sink_impl.cc +++ b/gr-blocks/lib/file_meta_sink_impl.cc @@ -26,14 +26,12 @@ #include "file_meta_sink_impl.h" #include +#include #include #include #include #include -#include - -namespace gr { - namespace blocks { +#include // win32 (mingw/msvc) specific #ifdef HAVE_IO_H @@ -52,6 +50,11 @@ namespace gr { #define OUR_O_LARGEFILE 0 #endif + +namespace gr { + namespace blocks { + + file_meta_sink::sptr file_meta_sink::make(size_t itemsize, const std::string &filename, double samp_rate, double relative_rate, diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc index fb39b205b..42fdabb54 100644 --- a/gr-blocks/lib/file_meta_source_impl.cc +++ b/gr-blocks/lib/file_meta_source_impl.cc @@ -26,14 +26,12 @@ #include "file_meta_source_impl.h" #include +#include #include #include #include #include -#include - -namespace gr { - namespace blocks { +#include // win32 (mingw/msvc) specific #ifdef HAVE_IO_H @@ -52,6 +50,11 @@ namespace gr { #define OUR_O_LARGEFILE 0 #endif + +namespace gr { + namespace blocks { + + file_meta_source::sptr file_meta_source::make(const std::string &filename, bool repeat, -- cgit