diff options
| author |   Tom Rondeau <trondeau@vt.edu> | 2013-04-17 13:43:52 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-29 14:52:56 -0400 |
| commit | f3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch) | |
| tree | 140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-video-sdl | |
| parent | blocks: fix file meta data source to handle repeat of files. (diff) | |
| download | gnuradio-f3e2e07201c50033bf6c9d0c6a6f068557b4f17f.tar.xz gnuradio-f3e2e07201c50033bf6c9d0c6a6f068557b4f17f.zip | |
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-video-sdl')
| -rw-r--r-- | gr-video-sdl/include/video_sdl/api.h | 2 | ||||
| -rw-r--r-- | gr-video-sdl/include/video_sdl/sink_s.h | 4 | ||||
| -rw-r--r-- | gr-video-sdl/include/video_sdl/sink_uc.h | 4 | ||||
| -rw-r--r-- | gr-video-sdl/lib/sink_s_impl.cc | 8 | ||||
| -rw-r--r-- | gr-video-sdl/lib/sink_uc_impl.cc | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/gr-video-sdl/include/video_sdl/api.h b/gr-video-sdl/include/video_sdl/api.h index 981292658..b9df5fd06 100644 --- a/gr-video-sdl/include/video_sdl/api.h +++ b/gr-video-sdl/include/video_sdl/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_VIDEO_SDL_API_H #define INCLUDED_VIDEO_SDL_API_H -#include <attributes.h> +#include <gnuradio/attributes.h> #ifdef gnuradio_video_sdl_EXPORTS # define VIDEO_SDL_API __GR_ATTR_EXPORT diff --git a/gr-video-sdl/include/video_sdl/sink_s.h b/gr-video-sdl/include/video_sdl/sink_s.h index 2e2a9085e..076f065f0 100644 --- a/gr-video-sdl/include/video_sdl/sink_s.h +++ b/gr-video-sdl/include/video_sdl/sink_s.h @@ -24,7 +24,7 @@ #define INCLUDED_VIDEO_SDL_SINK_S_H #include <video_sdl/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace video_sdl { @@ -38,7 +38,7 @@ namespace gr { * Three streams: first is grey (Y), second is U, third is V * Input samples must be in the range [0,255]. */ - class VIDEO_SDL_API sink_s : virtual public gr_sync_block + class VIDEO_SDL_API sink_s : virtual public sync_block { public: // gr::video_sdl::sink_s::sptr diff --git a/gr-video-sdl/include/video_sdl/sink_uc.h b/gr-video-sdl/include/video_sdl/sink_uc.h index 215847fc0..5db316a21 100644 --- a/gr-video-sdl/include/video_sdl/sink_uc.h +++ b/gr-video-sdl/include/video_sdl/sink_uc.h @@ -24,7 +24,7 @@ #define INCLUDED_VIDEO_SDL_SINK_UC_H #include <video_sdl/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace video_sdl { @@ -38,7 +38,7 @@ namespace gr { * Three streams: first is grey (Y), second is U, third is V * Input samples must be in the range [0,255]. */ - class VIDEO_SDL_API sink_uc : virtual public gr_sync_block + class VIDEO_SDL_API sink_uc : virtual public sync_block { public: // gr::video_sdl::sink_uc::sptr diff --git a/gr-video-sdl/lib/sink_s_impl.cc b/gr-video-sdl/lib/sink_s_impl.cc index 2da9442d6..3ca19840b 100644 --- a/gr-video-sdl/lib/sink_s_impl.cc +++ b/gr-video-sdl/lib/sink_s_impl.cc @@ -25,7 +25,7 @@ #endif #include "sink_s_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -50,9 +50,9 @@ namespace gr { sink_s_impl::sink_s_impl(double framerate, int width, int height, unsigned int format, int dst_width, int dst_height) - : gr_sync_block("video_sdl_sink_s", - gr_make_io_signature(1, 3, sizeof(short)), - gr_make_io_signature(0, 0, 0)), + : sync_block("video_sdl_sink_s", + io_signature::make(1, 3, sizeof(short)), + io_signature::make(0, 0, 0)), d_chunk_size(width*height), d_framerate(framerate), d_wanted_frametime_ms(0), d_width(width), d_height(height), d_dst_width(dst_width), d_dst_height(dst_height), diff --git a/gr-video-sdl/lib/sink_uc_impl.cc b/gr-video-sdl/lib/sink_uc_impl.cc index 28333e241..85176704f 100644 --- a/gr-video-sdl/lib/sink_uc_impl.cc +++ b/gr-video-sdl/lib/sink_uc_impl.cc @@ -25,7 +25,7 @@ #endif #include "sink_uc_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -49,9 +49,9 @@ namespace gr { sink_uc_impl::sink_uc_impl(double framerate, int width, int height, unsigned int format, int dst_width, int dst_height) - : gr_sync_block("video_sdl_sink_uc", - gr_make_io_signature(1, 3, sizeof(unsigned char)), - gr_make_io_signature(0, 0, 0)), + : sync_block("video_sdl_sink_uc", + io_signature::make(1, 3, sizeof(unsigned char)), + io_signature::make(0, 0, 0)), d_chunk_size(width*height), d_framerate(framerate), d_wanted_frametime_ms(0), d_width(width), d_height(height), d_dst_width(dst_width), d_dst_height(dst_height), |