diff options
Diffstat (limited to 'gr-video-sdl')
| -rw-r--r-- | gr-video-sdl/gnuradio-video-sdl.pc.in | 2 | ||||
| -rw-r--r-- | gr-video-sdl/src/Makefile.am | 3 | ||||
| -rwxr-xr-x | gr-video-sdl/src/qa_video_sdl.py | 6 | ||||
| -rw-r--r-- | gr-video-sdl/src/video_sdl_sink_s.cc | 4 | ||||
| -rw-r--r-- | gr-video-sdl/src/video_sdl_sink_uc.cc | 4 |
5 files changed, 9 insertions, 10 deletions
diff --git a/gr-video-sdl/gnuradio-video-sdl.pc.in b/gr-video-sdl/gnuradio-video-sdl.pc.in index 9a8fe7d5e..8586a2884 100644 --- a/gr-video-sdl/gnuradio-video-sdl.pc.in +++ b/gr-video-sdl/gnuradio-video-sdl.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-comedi Description: GNU Radio blocks for the SDL library Requires: gnuradio-core sdl -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-video-sdl Cflags: -I${includedir} diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am index e623eb2a9..45cedfb21 100644 --- a/gr-video-sdl/src/Makefile.am +++ b/gr-video-sdl/src/Makefile.am @@ -43,8 +43,7 @@ libgnuradio_video_sdl_la_LIBADD = \ $(SDL_LIBS) \ $(GNURADIO_CORE_LA) -libgnuradio_video_sdl_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_video_sdl_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) if PYTHON ################################# diff --git a/gr-video-sdl/src/qa_video_sdl.py b/gr-video-sdl/src/qa_video_sdl.py index 98da85f6b..8f82a60b1 100755 --- a/gr-video-sdl/src/qa_video_sdl.py +++ b/gr-video-sdl/src/qa_video_sdl.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2006 Free Software Foundation, Inc. +# Copyright 2006,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,7 +23,7 @@ from gnuradio import gr, gr_unittest import video_sdl -class qa_video_sdl (gr_unittest.TestCase): +class test_video_sdl (gr_unittest.TestCase): def setUp (self): self.tb = gr.top_block () @@ -37,4 +37,4 @@ class qa_video_sdl (gr_unittest.TestCase): pass if __name__ == '__main__': - gr_unittest.main () + gr_unittest.run(test_video_sdl, "test_video_sdl.xml") diff --git a/gr-video-sdl/src/video_sdl_sink_s.cc b/gr-video-sdl/src/video_sdl_sink_s.cc index 825cd80cb..2be3ff072 100644 --- a/gr-video-sdl/src/video_sdl_sink_s.cc +++ b/gr-video-sdl/src/video_sdl_sink_s.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -118,7 +118,7 @@ video_sdl_sink_s::~video_sdl_sink_s () video_sdl_sink_s_sptr video_sdl_make_sink_s (double framerate,int width, int height,unsigned int format,int dst_width,int dst_height) { - return video_sdl_sink_s_sptr (new video_sdl_sink_s (framerate, width, height,format,dst_width,dst_height)); + return gnuradio::get_initial_sptr(new video_sdl_sink_s (framerate, width, height,format,dst_width,dst_height)); } void diff --git a/gr-video-sdl/src/video_sdl_sink_uc.cc b/gr-video-sdl/src/video_sdl_sink_uc.cc index 2d25399a8..58e4830e4 100644 --- a/gr-video-sdl/src/video_sdl_sink_uc.cc +++ b/gr-video-sdl/src/video_sdl_sink_uc.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -118,7 +118,7 @@ video_sdl_sink_uc::~video_sdl_sink_uc () video_sdl_sink_uc_sptr video_sdl_make_sink_uc (double framerate,int width, int height,unsigned int format,int dst_width,int dst_height) { - return video_sdl_sink_uc_sptr (new video_sdl_sink_uc (framerate, width, height,format,dst_width,dst_height)); + return gnuradio::get_initial_sptr(new video_sdl_sink_uc (framerate, width, height,format,dst_width,dst_height)); } void |