diff options
Diffstat (limited to 'gr-atsc/src')
-rw-r--r-- | gr-atsc/src/lib/Makefile.am | 3 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_bit_timing_loop.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_deinterleaver.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_depad.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_derandomizer.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_ds_to_softds.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_equalizer.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_field_sync_demux.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_field_sync_mux.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_fpll.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_fs_checker.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_interleaver.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_pad.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_randomizer.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_rs_decoder.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_rs_encoder.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_trellis_encoder.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/atsc_viterbi_decoder.cc | 4 | ||||
-rw-r--r-- | gr-atsc/src/lib/test_atsci.cc | 13 |
19 files changed, 45 insertions, 39 deletions
diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index 8aeb80c0a..bf9c6626a 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -92,8 +92,7 @@ BUILT_SOURCES = \ libgnuradio_atsc_la_LIBADD = \ $(GNURADIO_CORE_LA) -libgnuradio_atsc_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_atsc_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) noinst_LTLIBRARIES = libgnuradio-atsc-qa.la diff --git a/gr-atsc/src/lib/atsc_bit_timing_loop.cc b/gr-atsc/src/lib/atsc_bit_timing_loop.cc index a661e708b..d87a2c3fd 100644 --- a/gr-atsc/src/lib/atsc_bit_timing_loop.cc +++ b/gr-atsc/src/lib/atsc_bit_timing_loop.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 * @@ -37,7 +37,7 @@ double ratio_of_rx_clock_to_symbol_freq = input_rate / ATSC_SYMBOL_RATE; atsc_bit_timing_loop_sptr atsc_make_bit_timing_loop() { - return atsc_bit_timing_loop_sptr(new atsc_bit_timing_loop()); + return gnuradio::get_initial_sptr(new atsc_bit_timing_loop()); } diff --git a/gr-atsc/src/lib/atsc_deinterleaver.cc b/gr-atsc/src/lib/atsc_deinterleaver.cc index af58777dd..aee9cd58b 100644 --- a/gr-atsc/src/lib/atsc_deinterleaver.cc +++ b/gr-atsc/src/lib/atsc_deinterleaver.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 * @@ -32,7 +32,7 @@ atsc_deinterleaver_sptr atsc_make_deinterleaver() { - return atsc_deinterleaver_sptr(new atsc_deinterleaver()); + return gnuradio::get_initial_sptr(new atsc_deinterleaver()); } atsc_deinterleaver::atsc_deinterleaver() diff --git a/gr-atsc/src/lib/atsc_depad.cc b/gr-atsc/src/lib/atsc_depad.cc index f1e830568..5cf0c3de2 100644 --- a/gr-atsc/src/lib/atsc_depad.cc +++ b/gr-atsc/src/lib/atsc_depad.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2008 Free Software Foundation, Inc. + * Copyright 2006,2008,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -31,7 +31,7 @@ atsc_depad_sptr atsc_make_depad() { - return atsc_depad_sptr(new atsc_depad()); + return gnuradio::get_initial_sptr(new atsc_depad()); } atsc_depad::atsc_depad() diff --git a/gr-atsc/src/lib/atsc_derandomizer.cc b/gr-atsc/src/lib/atsc_derandomizer.cc index 361b781ad..7dc4cf4c1 100644 --- a/gr-atsc/src/lib/atsc_derandomizer.cc +++ b/gr-atsc/src/lib/atsc_derandomizer.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 * @@ -32,7 +32,7 @@ atsc_derandomizer_sptr atsc_make_derandomizer() { - return atsc_derandomizer_sptr(new atsc_derandomizer()); + return gnuradio::get_initial_sptr(new atsc_derandomizer()); } atsc_derandomizer::atsc_derandomizer() diff --git a/gr-atsc/src/lib/atsc_ds_to_softds.cc b/gr-atsc/src/lib/atsc_ds_to_softds.cc index 8d3fc3385..c589bbb9f 100644 --- a/gr-atsc/src/lib/atsc_ds_to_softds.cc +++ b/gr-atsc/src/lib/atsc_ds_to_softds.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 * @@ -32,7 +32,7 @@ atsc_ds_to_softds_sptr atsc_make_ds_to_softds() { - return atsc_ds_to_softds_sptr(new atsc_ds_to_softds()); + return gnuradio::get_initial_sptr(new atsc_ds_to_softds()); } atsc_ds_to_softds::atsc_ds_to_softds() diff --git a/gr-atsc/src/lib/atsc_equalizer.cc b/gr-atsc/src/lib/atsc_equalizer.cc index 3053c00b8..3e68de992 100644 --- a/gr-atsc/src/lib/atsc_equalizer.cc +++ b/gr-atsc/src/lib/atsc_equalizer.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 * @@ -34,7 +34,7 @@ atsc_equalizer_sptr atsc_make_equalizer() { - return atsc_equalizer_sptr(new atsc_equalizer()); + return gnuradio::get_initial_sptr(new atsc_equalizer()); } // had atsc_equalizer(atsci_equalizer *equalizer) diff --git a/gr-atsc/src/lib/atsc_field_sync_demux.cc b/gr-atsc/src/lib/atsc_field_sync_demux.cc index b6195c6df..3b321eae6 100644 --- a/gr-atsc/src/lib/atsc_field_sync_demux.cc +++ b/gr-atsc/src/lib/atsc_field_sync_demux.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 * @@ -44,7 +44,7 @@ static const int DEC = ATSC_DATA_SEGMENT_LENGTH; // nominal decimation fa atsc_field_sync_demux_sptr atsc_make_field_sync_demux() { - return atsc_field_sync_demux_sptr(new atsc_field_sync_demux()); + return gnuradio::get_initial_sptr(new atsc_field_sync_demux()); } atsc_field_sync_demux::atsc_field_sync_demux() diff --git a/gr-atsc/src/lib/atsc_field_sync_mux.cc b/gr-atsc/src/lib/atsc_field_sync_mux.cc index 526599aed..3d0e20a1c 100644 --- a/gr-atsc/src/lib/atsc_field_sync_mux.cc +++ b/gr-atsc/src/lib/atsc_field_sync_mux.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 * @@ -33,7 +33,7 @@ atsc_field_sync_mux_sptr atsc_make_field_sync_mux() { - return atsc_field_sync_mux_sptr(new atsc_field_sync_mux()); + return gnuradio::get_initial_sptr(new atsc_field_sync_mux()); } atsc_field_sync_mux::atsc_field_sync_mux() diff --git a/gr-atsc/src/lib/atsc_fpll.cc b/gr-atsc/src/lib/atsc_fpll.cc index f5bf39d20..676a7453e 100644 --- a/gr-atsc/src/lib/atsc_fpll.cc +++ b/gr-atsc/src/lib/atsc_fpll.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 * @@ -34,7 +34,7 @@ atsc_fpll_sptr atsc_make_fpll() { - return atsc_fpll_sptr(new atsc_fpll()); + return gnuradio::get_initial_sptr(new atsc_fpll()); } diff --git a/gr-atsc/src/lib/atsc_fs_checker.cc b/gr-atsc/src/lib/atsc_fs_checker.cc index 69406650e..6162c9ef6 100644 --- a/gr-atsc/src/lib/atsc_fs_checker.cc +++ b/gr-atsc/src/lib/atsc_fs_checker.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 * @@ -35,7 +35,7 @@ atsc_fs_checker_sptr atsc_make_fs_checker() { - return atsc_fs_checker_sptr(new atsc_fs_checker()); + return gnuradio::get_initial_sptr(new atsc_fs_checker()); } atsc_fs_checker::atsc_fs_checker() diff --git a/gr-atsc/src/lib/atsc_interleaver.cc b/gr-atsc/src/lib/atsc_interleaver.cc index d9fd98bb3..a87091436 100644 --- a/gr-atsc/src/lib/atsc_interleaver.cc +++ b/gr-atsc/src/lib/atsc_interleaver.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 * @@ -32,7 +32,7 @@ atsc_interleaver_sptr atsc_make_interleaver() { - return atsc_interleaver_sptr(new atsc_interleaver()); + return gnuradio::get_initial_sptr(new atsc_interleaver()); } atsc_interleaver::atsc_interleaver() diff --git a/gr-atsc/src/lib/atsc_pad.cc b/gr-atsc/src/lib/atsc_pad.cc index cd1353e26..8a36307af 100644 --- a/gr-atsc/src/lib/atsc_pad.cc +++ b/gr-atsc/src/lib/atsc_pad.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 * @@ -33,7 +33,7 @@ static const int INTR = ATSC_MPEG_PKT_LENGTH; atsc_pad_sptr atsc_make_pad() { - return atsc_pad_sptr(new atsc_pad()); + return gnuradio::get_initial_sptr(new atsc_pad()); } atsc_pad::atsc_pad() diff --git a/gr-atsc/src/lib/atsc_randomizer.cc b/gr-atsc/src/lib/atsc_randomizer.cc index e6756c6ed..cd797b8f5 100644 --- a/gr-atsc/src/lib/atsc_randomizer.cc +++ b/gr-atsc/src/lib/atsc_randomizer.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 * @@ -32,7 +32,7 @@ atsc_randomizer_sptr atsc_make_randomizer() { - return atsc_randomizer_sptr(new atsc_randomizer()); + return gnuradio::get_initial_sptr(new atsc_randomizer()); } atsc_randomizer::atsc_randomizer() diff --git a/gr-atsc/src/lib/atsc_rs_decoder.cc b/gr-atsc/src/lib/atsc_rs_decoder.cc index 680d64e43..aa3f9369e 100644 --- a/gr-atsc/src/lib/atsc_rs_decoder.cc +++ b/gr-atsc/src/lib/atsc_rs_decoder.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 * @@ -32,7 +32,7 @@ atsc_rs_decoder_sptr atsc_make_rs_decoder() { - return atsc_rs_decoder_sptr(new atsc_rs_decoder()); + return gnuradio::get_initial_sptr(new atsc_rs_decoder()); } atsc_rs_decoder::atsc_rs_decoder() diff --git a/gr-atsc/src/lib/atsc_rs_encoder.cc b/gr-atsc/src/lib/atsc_rs_encoder.cc index faf9bfff3..f98ff664c 100644 --- a/gr-atsc/src/lib/atsc_rs_encoder.cc +++ b/gr-atsc/src/lib/atsc_rs_encoder.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 * @@ -32,7 +32,7 @@ atsc_rs_encoder_sptr atsc_make_rs_encoder() { - return atsc_rs_encoder_sptr(new atsc_rs_encoder()); + return gnuradio::get_initial_sptr(new atsc_rs_encoder()); } atsc_rs_encoder::atsc_rs_encoder() diff --git a/gr-atsc/src/lib/atsc_trellis_encoder.cc b/gr-atsc/src/lib/atsc_trellis_encoder.cc index efd088310..4cf81a045 100644 --- a/gr-atsc/src/lib/atsc_trellis_encoder.cc +++ b/gr-atsc/src/lib/atsc_trellis_encoder.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 * @@ -32,7 +32,7 @@ atsc_trellis_encoder_sptr atsc_make_trellis_encoder() { - return atsc_trellis_encoder_sptr(new atsc_trellis_encoder()); + return gnuradio::get_initial_sptr(new atsc_trellis_encoder()); } atsc_trellis_encoder::atsc_trellis_encoder() diff --git a/gr-atsc/src/lib/atsc_viterbi_decoder.cc b/gr-atsc/src/lib/atsc_viterbi_decoder.cc index 9db040121..81ad9178a 100644 --- a/gr-atsc/src/lib/atsc_viterbi_decoder.cc +++ b/gr-atsc/src/lib/atsc_viterbi_decoder.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 * @@ -35,7 +35,7 @@ using std::endl; atsc_viterbi_decoder_sptr atsc_make_viterbi_decoder() { - return atsc_viterbi_decoder_sptr(new atsc_viterbi_decoder()); + return gnuradio::get_initial_sptr(new atsc_viterbi_decoder()); } atsc_viterbi_decoder::atsc_viterbi_decoder() diff --git a/gr-atsc/src/lib/test_atsci.cc b/gr-atsc/src/lib/test_atsci.cc index 5267e0d4f..184895a90 100644 --- a/gr-atsc/src/lib/test_atsci.cc +++ b/gr-atsc/src/lib/test_atsci.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2002,2006 Free Software Foundation, Inc. + * Copyright 2002,2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -20,16 +20,23 @@ * Boston, MA 02110-1301, USA. */ +#include <gr_unittests.h> #include <cppunit/TextTestRunner.h> +#include <cppunit/XmlOutputter.h> #include <qa_atsci.h> int main (int argc, char **argv) { - - CppUnit::TextTestRunner runner; + char path[200]; + get_unittest_path ("gr_atsc.xml", path, 200); + + CppUnit::TextTestRunner runner; + std::ofstream xmlfile(path); + CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile); runner.addTest (qa_atsc::suite ()); + runner.setOutputter(xmlout); bool was_successful = runner.run ("", false); |