[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 72/101: Merge remote-tracking branch 'upstr
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 72/101: Merge remote-tracking branch 'upstream/next' into gtk3 |
|
Date: |
Thu, 16 Mar 2017 14:58:09 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch python3
in repository gnuradio.
commit 8e2886dc6b45b4e3f68d84887f728483fd2d1538
Merge: cbe1e43 fc1a6a8
Author: Sebastian Koslowski <address@hidden>
Date: Tue Aug 9 21:15:56 2016 +0200
Merge remote-tracking branch 'upstream/next' into gtk3
CMakeLists.txt | 54 +-
cmake/Modules/FindCodec2.cmake | 67 +
cmake/Modules/FindGSM.cmake | 52 +
cmake/Modules/GrMiscUtils.cmake | 56 +-
cmake/Modules/GrPackage.cmake | 182 -
cmake/Modules/GrPython.cmake | 4 +-
cmake/Modules/GrSwig.cmake | 5 +-
cmake/Modules/GrVersion.cmake | 21 +-
cmake/Modules/NSIS.InstallOptions.ini.in | 37 -
cmake/Modules/NSIS.template.in | 951 ---
cmake/Packaging/Fedora-15.cmake | 11 -
cmake/Packaging/Fedora-16.cmake | 11 -
cmake/Packaging/Fedora-17.cmake | 11 -
cmake/Packaging/Fedora-18.cmake | 11 -
cmake/Packaging/Ubuntu-10.04.cmake | 11 -
cmake/Packaging/Ubuntu-10.10.cmake | 11 -
cmake/Packaging/Ubuntu-11.04.cmake | 12 -
cmake/Packaging/Ubuntu-11.10.cmake | 11 -
cmake/Packaging/Ubuntu-12.04.cmake | 11 -
cmake/Packaging/Ubuntu-12.10.cmake | 11 -
cmake/Packaging/Ubuntu-13.04.cmake | 13 -
cmake/Packaging/Ubuntu-15.10.cmake | 13 -
cmake/Packaging/post_install.in | 4 -
cmake/Packaging/post_uninstall.in | 3 -
cmake/Packaging/postinst.in | 6 -
cmake/Packaging/postrm.in | 5 -
cmake/Packaging/pre_install.in | 1 -
cmake/Packaging/pre_uninstall.in | 3 -
cmake/Packaging/preinst.in | 5 -
cmake/Packaging/prerm.in | 5 -
docs/CMakeLists.txt | 17 -
docs/doxygen/CMakeLists.txt | 2 +-
docs/exploring-gnuradio/CMakeLists.txt | 1 -
docs/sphinx/source/blocks_blocks.rst | 1 +
docs/sphinx/source/index.rst | 1 +
gnuradio-runtime/CMakeLists.txt | 39 +-
gnuradio-runtime/apps/CMakeLists.txt | 1 -
gnuradio-runtime/examples/mp-sched/CMakeLists.txt | 2 -
gnuradio-runtime/examples/network/CMakeLists.txt | 2 -
.../examples/volk_benchmark/CMakeLists.txt | 2 -
gnuradio-runtime/include/gnuradio/CMakeLists.txt | 12 +-
gnuradio-runtime/include/gnuradio/attributes.h | 8 +-
gnuradio-runtime/include/gnuradio/basic_block.h | 6 +
gnuradio-runtime/include/gnuradio/block.h | 24 +
gnuradio-runtime/include/gnuradio/hier_block2.h | 25 +
.../include/gnuradio/{logger.h.in => logger.h} | 140 -
.../include/gnuradio/messages/CMakeLists.txt | 1 -
.../include/gnuradio/thread/CMakeLists.txt | 1 -
gnuradio-runtime/include/pmt/CMakeLists.txt | 2 +-
gnuradio-runtime/lib/CMakeLists.txt | 4 +-
gnuradio-runtime/lib/block.cc | 14 +
gnuradio-runtime/lib/controlport/CMakeLists.txt | 1 -
gnuradio-runtime/lib/hier_block2.cc | 12 +
gnuradio-runtime/lib/hier_block2_detail.cc | 18 +
gnuradio-runtime/lib/hier_block2_detail.h | 3 +
gnuradio-runtime/lib/logger.cc | 46 -
gnuradio-runtime/lib/pmt/CMakeLists.txt | 5 +-
gnuradio-runtime/lib/prefs.cc | 3 +-
gnuradio-runtime/lib/qa_logger.cc | 5 -
gnuradio-runtime/lib/tpb_thread_body.cc | 5 -
gnuradio-runtime/python/gnuradio/CMakeLists.txt | 1 -
.../python/gnuradio/ctrlport/CMakeLists.txt | 5 -
gnuradio-runtime/python/gnuradio/gr/CMakeLists.txt | 1 -
.../python/gnuradio/gru/CMakeLists.txt | 1 -
gnuradio-runtime/python/pmt/CMakeLists.txt | 1 -
gnuradio-runtime/swig/CMakeLists.txt | 9 -
gnuradio-runtime/swig/block.i | 3 +
gnuradio-runtime/swig/hier_block2.i | 3 +
gr-analog/CMakeLists.txt | 35 -
gr-analog/examples/CMakeLists.txt | 2 -
gr-analog/examples/tags/CMakeLists.txt | 1 -
gr-analog/grc/CMakeLists.txt | 3 +-
gr-analog/include/gnuradio/analog/CMakeLists.txt | 1 -
gr-analog/lib/CMakeLists.txt | 4 +-
gr-analog/lib/fmdet_cf_impl.cc | 2 +-
gr-analog/python/analog/CMakeLists.txt | 1 -
gr-analog/swig/CMakeLists.txt | 2 -
gr-audio/CMakeLists.txt | 42 -
gr-audio/examples/c++/CMakeLists.txt | 1 -
gr-audio/examples/grc/CMakeLists.txt | 1 -
gr-audio/examples/python/CMakeLists.txt | 1 -
gr-audio/grc/CMakeLists.txt | 2 +-
gr-audio/include/gnuradio/audio/CMakeLists.txt | 1 -
gr-audio/lib/CMakeLists.txt | 6 +-
gr-audio/python/audio/CMakeLists.txt | 1 -
gr-audio/swig/CMakeLists.txt | 2 -
gr-blocks/CMakeLists.txt | 35 -
gr-blocks/examples/CMakeLists.txt | 3 +-
gr-blocks/examples/ctrlport/CMakeLists.txt | 2 -
gr-blocks/examples/metadata/CMakeLists.txt | 1 -
gr-blocks/examples/msg_passing/CMakeLists.txt | 1 -
gr-blocks/examples/tags/CMakeLists.txt | 2 -
gr-blocks/grc/CMakeLists.txt | 2 +-
gr-blocks/grc/blocks_block_tree.xml | 1 +
gr-blocks/grc/blocks_tcp_server_sink.xml | 77 +
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 3 +-
.../include/gnuradio/blocks/stream_to_vector.h | 2 +-
.../include/gnuradio/blocks/tcp_server_sink.h | 66 +
gr-blocks/lib/CMakeLists.txt | 5 +-
gr-blocks/lib/tcp_server_sink_impl.cc | 161 +
gr-blocks/lib/tcp_server_sink_impl.h | 73 +
gr-blocks/python/blocks/CMakeLists.txt | 1 -
gr-blocks/python/blocks/qa_logger.py | 96 +
gr-blocks/python/blocks/qa_tcp_server_sink.py | 87 +
gr-blocks/python/grc_gnuradio/CMakeLists.txt | 2 -
gr-blocks/swig/CMakeLists.txt | 5 +-
gr-blocks/swig/blocks_swig5.i | 3 +
gr-channels/CMakeLists.txt | 35 -
gr-channels/examples/CMakeLists.txt | 1 -
gr-channels/grc/CMakeLists.txt | 2 +-
.../include/gnuradio/channels/CMakeLists.txt | 1 -
gr-channels/lib/CMakeLists.txt | 4 +-
gr-channels/python/channels/CMakeLists.txt | 1 -
gr-channels/swig/CMakeLists.txt | 2 -
gr-comedi/CMakeLists.txt | 35 -
gr-comedi/include/gnuradio/comedi/CMakeLists.txt | 1 -
gr-comedi/lib/CMakeLists.txt | 4 +-
gr-comedi/python/comedi/CMakeLists.txt | 1 -
gr-comedi/swig/CMakeLists.txt | 2 -
gr-digital/CMakeLists.txt | 35 -
gr-digital/examples/CMakeLists.txt | 7 -
gr-digital/grc/CMakeLists.txt | 2 +-
gr-digital/include/gnuradio/digital/CMakeLists.txt | 1 -
gr-digital/lib/CMakeLists.txt | 4 +-
gr-digital/python/digital/CMakeLists.txt | 2 -
gr-digital/python/grc_gnuradio/CMakeLists.txt | 1 -
gr-digital/swig/CMakeLists.txt | 2 -
gr-dtv/CMakeLists.txt | 35 -
gr-dtv/apps/CMakeLists.txt | 1 -
gr-dtv/examples/CMakeLists.txt | 2 -
gr-dtv/examples/README.atsc | 7 +
gr-dtv/examples/file_atsc_tx.grc | 1015 ++-
gr-dtv/examples/uhd_atsc_tx.grc | 3166 ++++++++
gr-dtv/grc/CMakeLists.txt | 1 -
gr-dtv/grc/dtv_dvbs2_modulator_bc.xml | 29 +-
gr-dtv/include/gnuradio/dtv/CMakeLists.txt | 1 -
gr-dtv/include/gnuradio/dtv/dvb_config.h | 1 +
gr-dtv/lib/CMakeLists.txt | 22 +-
gr-dtv/lib/atsc/atsc_viterbi_decoder_impl.cc | 2 +-
gr-dtv/lib/atsc/atsc_viterbi_mux.h | 2539 ++++++
gr-dtv/lib/dvbs2/dvbs2_modulator_bc_impl.cc | 11 +
.../lib/dvbt/dvbt_bit_inner_deinterleaver_impl.cc | 10 +-
gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc | 13 +-
gr-dtv/python/dtv/CMakeLists.txt | 1 -
gr-dtv/swig/CMakeLists.txt | 2 -
gr-fec/CMakeLists.txt | 36 +-
gr-fec/apps/CMakeLists.txt | 2 -
gr-fec/examples/CMakeLists.txt | 1 -
gr-fec/grc/CMakeLists.txt | 6 +-
gr-fec/include/gnuradio/fec/CMakeLists.txt | 5 +-
gr-fec/lib/CMakeLists.txt | 4 +-
gr-fec/lib/generic_decoder.cc | 8 +-
gr-fec/lib/generic_encoder.cc | 8 +-
gr-fec/lib/reed-solomon/CMakeLists.txt | 1 -
gr-fec/lib/viterbi/CMakeLists.txt | 1 -
gr-fec/python/fec/CMakeLists.txt | 1 -
gr-fec/python/fec/LDPC/CMakeLists.txt | 3 +-
gr-fec/python/fec/polar/CMakeLists.txt | 4 -
gr-fec/python/fec/polar/polar_channel_construction | 44 +-
gr-fec/swig/CMakeLists.txt | 4 +-
gr-fft/CMakeLists.txt | 35 -
gr-fft/grc/CMakeLists.txt | 1 -
gr-fft/include/gnuradio/fft/CMakeLists.txt | 3 -
gr-fft/lib/CMakeLists.txt | 4 +-
gr-fft/python/fft/CMakeLists.txt | 1 -
gr-fft/swig/CMakeLists.txt | 2 -
gr-filter/CMakeLists.txt | 35 -
gr-filter/apps/CMakeLists.txt | 1 -
gr-filter/examples/CMakeLists.txt | 2 -
gr-filter/examples/benchmark_filters.py | 32 +-
gr-filter/examples/fft_filter_ccc.py | 56 +-
gr-filter/examples/fir_filter_ccc.py | 50 +-
gr-filter/examples/fir_filter_fff.py | 50 +-
gr-filter/grc/CMakeLists.txt | 1 -
gr-filter/grc/filter_fractional_resampler_xx.xml | 7 +-
gr-filter/include/gnuradio/filter/CMakeLists.txt | 1 -
.../gnuradio/filter/fractional_resampler_cc.h | 5 +
.../gnuradio/filter/fractional_resampler_ff.h | 6 +
gr-filter/lib/CMakeLists.txt | 4 +-
gr-filter/lib/fractional_resampler_cc_impl.cc | 26 +
gr-filter/lib/fractional_resampler_cc_impl.h | 2 +
gr-filter/lib/fractional_resampler_ff_impl.cc | 27 +
gr-filter/lib/fractional_resampler_ff_impl.h | 2 +
gr-filter/python/filter/CMakeLists.txt | 1 -
gr-filter/python/filter/design/CMakeLists.txt | 1 -
gr-filter/python/filter/gui/CMakeLists.txt | 1 -
gr-filter/swig/CMakeLists.txt | 2 -
gr-qtgui/CMakeLists.txt | 37 -
gr-qtgui/apps/CMakeLists.txt | 2 -
gr-qtgui/apps/gr_constellation_plot | 31 +-
gr-qtgui/apps/gr_psd_plot_b | 15 +-
gr-qtgui/apps/gr_psd_plot_c | 15 +-
gr-qtgui/apps/gr_psd_plot_f | 15 +-
gr-qtgui/apps/gr_psd_plot_i | 15 +-
gr-qtgui/apps/gr_psd_plot_s | 15 +-
gr-qtgui/apps/gr_spectrogram_plot | 57 +-
gr-qtgui/apps/gr_spectrogram_plot_b | 15 +-
gr-qtgui/apps/gr_spectrogram_plot_c | 15 +-
gr-qtgui/apps/gr_spectrogram_plot_f | 15 +-
gr-qtgui/apps/gr_spectrogram_plot_i | 15 +-
gr-qtgui/apps/gr_spectrogram_plot_s | 15 +-
gr-qtgui/apps/gr_time_plot_b | 11 +-
gr-qtgui/apps/gr_time_plot_c | 11 +-
gr-qtgui/apps/gr_time_plot_f | 11 +-
gr-qtgui/apps/gr_time_plot_i | 11 +-
gr-qtgui/apps/gr_time_plot_s | 11 +-
gr-qtgui/apps/gr_time_raster_b | 13 +-
gr-qtgui/apps/gr_time_raster_f | 13 +-
gr-qtgui/apps/plot_base.py | 2 -
gr-qtgui/apps/plot_psd_base.py | 40 +-
gr-qtgui/apps/plot_spectrogram_base.py | 43 +-
gr-qtgui/apps/plot_time_base.py | 33 +-
gr-qtgui/apps/plot_time_raster_base.py | 41 +-
gr-qtgui/examples/CMakeLists.txt | 2 -
gr-qtgui/examples/c++/CMakeLists.txt | 1 -
gr-qtgui/grc/CMakeLists.txt | 2 +-
gr-qtgui/grc/qtgui_number_sink.xml | 2 +-
gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 1 -
gr-qtgui/lib/CMakeLists.txt | 4 +-
gr-qtgui/python/qtgui/CMakeLists.txt | 1 -
gr-qtgui/swig/CMakeLists.txt | 2 -
gr-trellis/CMakeLists.txt | 48 -
gr-trellis/doc/CMakeLists.txt | 2 -
gr-trellis/examples/grc/CMakeLists.txt | 1 -
gr-trellis/examples/python/CMakeLists.txt | 3 -
gr-trellis/grc/CMakeLists.txt | 1 -
gr-trellis/include/gnuradio/trellis/CMakeLists.txt | 1 -
gr-trellis/lib/CMakeLists.txt | 4 +-
gr-trellis/python/trellis/CMakeLists.txt | 1 -
gr-trellis/swig/CMakeLists.txt | 2 -
gr-uhd/CMakeLists.txt | 42 -
gr-uhd/apps/CMakeLists.txt | 7 -
gr-uhd/apps/uhd_app.py | 35 +-
gr-uhd/apps/uhd_fft | 58 +-
gr-uhd/apps/uhd_siggen_base.py | 94 +-
gr-uhd/apps/uhd_siggen_gui | 33 +-
gr-uhd/examples/c++/CMakeLists.txt | 1 -
gr-uhd/examples/grc/CMakeLists.txt | 1 -
gr-uhd/examples/python/CMakeLists.txt | 1 -
gr-uhd/grc/CMakeLists.txt | 1 -
gr-uhd/include/gnuradio/uhd/CMakeLists.txt | 1 -
gr-uhd/lib/CMakeLists.txt | 4 +-
gr-uhd/lib/usrp_source_impl.cc | 1 +
gr-uhd/python/uhd/CMakeLists.txt | 1 -
gr-uhd/swig/CMakeLists.txt | 2 -
gr-utils/CMakeLists.txt | 10 -
gr-utils/python/modtool/CMakeLists.txt | 4 -
gr-utils/python/modtool/__init__.py | 3 +-
.../gr-newmod/cmake/Modules/GrMiscUtils.cmake | 55 +-
.../modtool/gr-newmod/cmake/Modules/GrPython.cmake | 4 +-
.../modtool/gr-newmod/cmake/Modules/GrSwig.cmake | 5 +-
.../python/modtool/gr-newmod/lib/CMakeLists.txt | 3 +-
gr-utils/python/modtool/modtool_add.py | 44 +-
gr-utils/python/modtool/modtool_base.py | 78 +-
gr-utils/python/modtool/modtool_disable.py | 19 +-
gr-utils/python/modtool/modtool_help.py | 68 -
gr-utils/python/modtool/modtool_info.py | 20 +-
gr-utils/python/modtool/modtool_makexml.py | 25 +-
gr-utils/python/modtool/modtool_newmod.py | 24 +-
gr-utils/python/modtool/modtool_rename.py | 39 +-
gr-utils/python/modtool/modtool_rm.py | 19 +-
gr-utils/python/modtool/templates.py | 6 -
gr-utils/python/modtool/util_functions.py | 9 -
gr-utils/python/utils/CMakeLists.txt | 2 -
gr-utils/python/utils/gr_modtool | 28 +-
gr-utils/python/utils/gr_plot_char | 33 +-
gr-utils/python/utils/gr_plot_const | 30 +-
gr-utils/python/utils/gr_plot_fft | 8 +-
gr-utils/python/utils/gr_plot_fft_c | 11 +-
gr-utils/python/utils/gr_plot_fft_f | 12 +-
gr-utils/python/utils/gr_plot_float | 27 +-
gr-utils/python/utils/gr_plot_int | 27 +-
gr-utils/python/utils/gr_plot_iq | 31 +-
gr-utils/python/utils/gr_plot_psd | 8 +-
gr-utils/python/utils/gr_plot_psd_c | 13 +-
gr-utils/python/utils/gr_plot_psd_f | 13 +-
gr-utils/python/utils/gr_plot_short | 27 +-
gr-utils/python/utils/gr_read_file_metadata | 20 +-
gr-utils/python/utils/grcc | 14 +-
gr-utils/python/utils/plot_data.py | 1 -
gr-utils/python/utils/plot_fft_base.py | 33 +-
gr-utils/python/utils/plot_psd_base.py | 48 +-
gr-video-sdl/CMakeLists.txt | 35 -
gr-video-sdl/grc/CMakeLists.txt | 2 -
.../include/gnuradio/video_sdl/CMakeLists.txt | 1 -
gr-video-sdl/lib/CMakeLists.txt | 4 +-
gr-video-sdl/python/video_sdl/CMakeLists.txt | 1 -
gr-video-sdl/swig/CMakeLists.txt | 2 -
gr-vocoder/CMakeLists.txt | 59 +-
gr-vocoder/examples/CMakeLists.txt | 19 +-
gr-vocoder/grc/CMakeLists.txt | 23 +-
gr-vocoder/grc/vocoder_codec2_decode_ps.xml | 10 +-
gr-vocoder/grc/vocoder_codec2_encode_sp.xml | 10 +-
gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt | 20 +-
gr-vocoder/include/gnuradio/vocoder/codec2.h | 10 +-
gr-vocoder/lib/CMakeLists.txt | 169 +-
gr-vocoder/lib/codec2/CMakeLists.txt | 201 -
gr-vocoder/lib/codec2/_kiss_fft_guts.h | 164 -
gr-vocoder/lib/codec2/ampexp.c | 1093 ---
gr-vocoder/lib/codec2/ampexp.h | 39 -
gr-vocoder/lib/codec2/c2dec.c | 291 -
gr-vocoder/lib/codec2/c2demo.c | 101 -
gr-vocoder/lib/codec2/c2enc.c | 117 -
gr-vocoder/lib/codec2/c2sim.c | 934 ---
gr-vocoder/lib/codec2/codebook/dlsp1.txt | 35 -
gr-vocoder/lib/codec2/codebook/dlsp10.txt | 35 -
gr-vocoder/lib/codec2/codebook/dlsp2.txt | 35 -
gr-vocoder/lib/codec2/codebook/dlsp3.txt | 35 -
gr-vocoder/lib/codec2/codebook/dlsp4.txt | 35 -
gr-vocoder/lib/codec2/codebook/dlsp5.txt | 35 -
gr-vocoder/lib/codec2/codebook/dlsp6.txt | 35 -
gr-vocoder/lib/codec2/codebook/dlsp7.txt | 35 -
gr-vocoder/lib/codec2/codebook/dlsp8.txt | 35 -
gr-vocoder/lib/codec2/codebook/dlsp9.txt | 35 -
gr-vocoder/lib/codec2/codebook/gecb.txt | 257 -
gr-vocoder/lib/codec2/codebook/lsp1.txt | 17 -
gr-vocoder/lib/codec2/codebook/lsp10.txt | 6 -
gr-vocoder/lib/codec2/codebook/lsp2.txt | 17 -
gr-vocoder/lib/codec2/codebook/lsp3.txt | 17 -
gr-vocoder/lib/codec2/codebook/lsp4.txt | 17 -
gr-vocoder/lib/codec2/codebook/lsp45678910.txt | 4097 ----------
gr-vocoder/lib/codec2/codebook/lsp5.txt | 19 -
gr-vocoder/lib/codec2/codebook/lsp6.txt | 19 -
gr-vocoder/lib/codec2/codebook/lsp7.txt | 19 -
gr-vocoder/lib/codec2/codebook/lsp8.txt | 11 -
gr-vocoder/lib/codec2/codebook/lsp9.txt | 11 -
gr-vocoder/lib/codec2/codebook/lspdt1.txt | 9 -
gr-vocoder/lib/codec2/codebook/lspdt10.txt | 3 -
gr-vocoder/lib/codec2/codebook/lspdt2.txt | 9 -
gr-vocoder/lib/codec2/codebook/lspdt3.txt | 5 -
gr-vocoder/lib/codec2/codebook/lspdt4.txt | 5 -
gr-vocoder/lib/codec2/codebook/lspdt5.txt | 5 -
gr-vocoder/lib/codec2/codebook/lspdt6.txt | 5 -
gr-vocoder/lib/codec2/codebook/lspdt7.txt | 3 -
gr-vocoder/lib/codec2/codebook/lspdt8.txt | 3 -
gr-vocoder/lib/codec2/codebook/lspdt9.txt | 3 -
gr-vocoder/lib/codec2/codebook/lspjnd5-10.txt | 8317 --------------------
gr-vocoder/lib/codec2/codebook/lspjvm1.txt | 513 --
gr-vocoder/lib/codec2/codebook/lspjvm2.txt | 513 --
gr-vocoder/lib/codec2/codebook/lspjvm3.txt | 513 --
gr-vocoder/lib/codec2/codebook/lspvqanssi1.txt | 257 -
gr-vocoder/lib/codec2/codebook/lspvqanssi2.txt | 129 -
gr-vocoder/lib/codec2/codebook/lspvqanssi3.txt | 65 -
gr-vocoder/lib/codec2/codebook/lspvqanssi4.txt | 65 -
gr-vocoder/lib/codec2/codec2.c | 1539 ----
gr-vocoder/lib/codec2/codec2.h | 76 -
gr-vocoder/lib/codec2/codec2_fdmdv.h | 124 -
gr-vocoder/lib/codec2/codec2_fifo.h | 51 -
gr-vocoder/lib/codec2/codec2_internal.h | 63 -
gr-vocoder/lib/codec2/comp.h | 38 -
gr-vocoder/lib/codec2/defines.h | 94 -
gr-vocoder/lib/codec2/dump.c | 629 --
gr-vocoder/lib/codec2/dump.h | 78 -
gr-vocoder/lib/codec2/fdmdv.c | 1573 ----
gr-vocoder/lib/codec2/fdmdv_internal.h | 176 -
gr-vocoder/lib/codec2/fifo.c | 142 -
gr-vocoder/lib/codec2/generate_codebook.c | 179 -
gr-vocoder/lib/codec2/globals.c | 49 -
gr-vocoder/lib/codec2/globals.h | 47 -
gr-vocoder/lib/codec2/glottal.c | 257 -
gr-vocoder/lib/codec2/hanning.h | 644 --
gr-vocoder/lib/codec2/interp.c | 323 -
gr-vocoder/lib/codec2/interp.h | 45 -
gr-vocoder/lib/codec2/kiss_fft.c | 408 -
gr-vocoder/lib/codec2/kiss_fft.h | 124 -
gr-vocoder/lib/codec2/lpc.c | 309 -
gr-vocoder/lib/codec2/lpc.h | 43 -
gr-vocoder/lib/codec2/lsp.c | 325 -
gr-vocoder/lib/codec2/lsp.h | 37 -
gr-vocoder/lib/codec2/machdep.h | 51 -
gr-vocoder/lib/codec2/nlp.c | 589 --
gr-vocoder/lib/codec2/nlp.h | 38 -
gr-vocoder/lib/codec2/os.h | 53 -
gr-vocoder/lib/codec2/pack.c | 140 -
gr-vocoder/lib/codec2/phase.c | 253 -
gr-vocoder/lib/codec2/phase.h | 39 -
gr-vocoder/lib/codec2/phaseexp.c | 1455 ----
gr-vocoder/lib/codec2/phaseexp.h | 39 -
gr-vocoder/lib/codec2/pilot_coeff.h | 34 -
gr-vocoder/lib/codec2/postfilter.c | 142 -
gr-vocoder/lib/codec2/postfilter.h | 33 -
gr-vocoder/lib/codec2/quantise.c | 1970 -----
gr-vocoder/lib/codec2/quantise.h | 126 -
gr-vocoder/lib/codec2/rn.h | 964 ---
gr-vocoder/lib/codec2/sine.c | 648 --
gr-vocoder/lib/codec2/sine.h | 48 -
gr-vocoder/lib/codec2/test_bits.h | 164 -
gr-vocoder/lib/gsm/CMakeLists.txt | 49 -
gr-vocoder/lib/gsm/COPYRIGHT | 16 -
gr-vocoder/lib/gsm/README | 4 -
gr-vocoder/lib/gsm/README.gsm | 37 -
gr-vocoder/lib/gsm/add.c | 235 -
gr-vocoder/lib/gsm/code.c | 100 -
gr-vocoder/lib/gsm/config.h | 37 -
gr-vocoder/lib/gsm/debug.c | 76 -
gr-vocoder/lib/gsm/decode.c | 63 -
gr-vocoder/lib/gsm/gsm.h | 73 -
gr-vocoder/lib/gsm/gsm_create.c | 45 -
gr-vocoder/lib/gsm/gsm_decode.c | 361 -
gr-vocoder/lib/gsm/gsm_destroy.c | 26 -
gr-vocoder/lib/gsm/gsm_encode.c | 451 --
gr-vocoder/lib/gsm/gsm_explode.c | 417 -
gr-vocoder/lib/gsm/gsm_implode.c | 515 --
gr-vocoder/lib/gsm/gsm_option.c | 69 -
gr-vocoder/lib/gsm/gsm_print.c | 167 -
gr-vocoder/lib/gsm/long_term.c | 949 ---
gr-vocoder/lib/gsm/lpc.c | 341 -
gr-vocoder/lib/gsm/preprocess.c | 113 -
gr-vocoder/lib/gsm/private.h | 268 -
gr-vocoder/lib/gsm/proto.h | 65 -
gr-vocoder/lib/gsm/rpe.c | 488 --
gr-vocoder/lib/gsm/short_term.c | 429 -
gr-vocoder/lib/gsm/table.c | 63 -
gr-vocoder/lib/gsm/unproto.h | 23 -
gr-vocoder/lib/gsm_fr_decode_ps_impl.cc | 3 +-
gr-vocoder/lib/gsm_fr_encode_sp_impl.cc | 3 +-
gr-vocoder/python/vocoder/CMakeLists.txt | 24 +-
gr-vocoder/swig/CMakeLists.txt | 12 +-
gr-vocoder/swig/vocoder_swig.i | 46 +-
gr-wavelet/CMakeLists.txt | 35 -
gr-wavelet/include/gnuradio/wavelet/CMakeLists.txt | 1 -
gr-wavelet/lib/CMakeLists.txt | 4 +-
gr-wavelet/python/wavelet/CMakeLists.txt | 1 -
gr-wavelet/swig/CMakeLists.txt | 2 -
gr-wxgui/CMakeLists.txt | 33 -
gr-wxgui/grc/CMakeLists.txt | 3 +-
gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt | 1 -
gr-wxgui/lib/CMakeLists.txt | 6 +-
gr-wxgui/python/wxgui/CMakeLists.txt | 3 -
gr-wxgui/swig/CMakeLists.txt | 2 -
gr-zeromq/CMakeLists.txt | 36 -
gr-zeromq/examples/CMakeLists.txt | 1 -
gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt | 1 -
gr-zeromq/lib/CMakeLists.txt | 4 +-
gr-zeromq/swig/CMakeLists.txt | 2 -
grc/CMakeLists.txt | 24 -
grc/blocks/CMakeLists.txt | 1 -
grc/checks.py | 83 -
grc/core/CMakeLists.txt | 2 -
grc/core/Config.py | 13 +-
grc/core/Constants.py | 1 +
grc/core/Param.py | 6 +-
grc/core/Platform.py | 9 +-
grc/core/generator/CMakeLists.txt | 2 -
grc/core/generator/Generator.py | 3 +-
grc/core/utils/CMakeLists.txt | 1 -
grc/grc.conf.in | 1 +
grc/gui/ActionHandler.py | 15 +-
grc/gui/BlockTreeWindow.py | 4 +-
grc/gui/CMakeLists.txt | 1 -
grc/gui/Preferences.py | 4 +-
grc/scripts/CMakeLists.txt | 1 -
grc/scripts/freedesktop/CMakeLists.txt | 3 +-
grc/scripts/gnuradio-companion | 88 +-
454 files changed, 8444 insertions(+), 42210 deletions(-)
diff --cc grc/core/Platform.py
index 9956391,0dc6eb0..7ef944b
--- a/grc/core/Platform.py
+++ b/grc/core/Platform.py
@@@ -56,11 -60,12 +56,8 @@@ class Platform(Element)
callback_finished=lambda: self.block_docstrings_loaded_callback()
)
- self._block_dtd = Constants.BLOCK_DTD
- self._default_flow_graph = Constants.DEFAULT_FLOW_GRAPH
- # Create a dummy flow graph for the blocks
- self._flow_graph = Element(self)
- self._flow_graph.connections = []
--
- self.blocks = odict()
- self._blocks_n = odict()
+ self.blocks = {}
+ self._blocks_n = {}
self._block_categories = {}
self.domains = {}
self.connection_templates = {}
@@@ -187,21 -185,20 +184,21 @@@
def load_block_xml(self, xml_file):
"""Load block description from xml file"""
# Validate and import
- ParseXML.validate_dtd(xml_file, self._block_dtd)
+ ParseXML.validate_dtd(xml_file, Constants.BLOCK_DTD)
- n = ParseXML.from_file(xml_file).find('block')
+ n = ParseXML.from_file(xml_file).get('block', {})
n['block_wrapper_path'] = xml_file # inject block wrapper path
- # Get block instance and add it to the list of blocks
- block = self.Block(self._flow_graph, n)
- key = block.get_key()
+ key = n.pop('key')
+
if key in self.blocks:
- print >> sys.stderr, 'Warning: Block with key "{}" already
exists.\n\tIgnoring: {}'.format(key, xml_file)
- else: # Store the block
- self.blocks[key] = block
- self._blocks_n[key] = n
+ print('Warning: Block with key "{}" already exists.\n'
+ '\tIgnoring: {}'.format(key, xml_file), file=sys.stderr)
+ return
+ # Store the block
+ self.blocks[key] = block = self.get_new_block(self._flow_graph, key,
**n)
+ self._blocks_n[key] = n
self._docstring_extractor.query(
- block.get_key(),
+ key,
block.get_imports(raw=True),
block.get_make(raw=True)
)
diff --cc grc/core/generator/Generator.py
index a9ce933,3062440..f042b49
--- a/grc/core/generator/Generator.py
+++ b/grc/core/generator/Generator.py
@@@ -86,7 -81,11 +86,8 @@@ class TopBlockGenerator(object)
dirname = tempfile.gettempdir()
filename = self._flow_graph.get_option('id') + '.py'
self.file_path = os.path.join(dirname, filename)
+ self._dirname = dirname
- def get_file_path(self):
- return self.file_path
-
def write(self):
"""generate output and write it to files"""
# Do throttle warning
diff --cc grc/gui/ActionHandler.py
index 9e57565,f18fcea..ca16a7e
--- a/grc/gui/ActionHandler.py
+++ b/grc/gui/ActionHandler.py
@@@ -112,14 -116,11 +112,11 @@@ class ActionHandler
# Initialize/Quit
##################################################
if action == Actions.APPLICATION_INITIALIZE:
- if not self.init_file_paths:
- self.init_file_paths = list(filter(os.path.exists,
Preferences.get_open_files()))
- if not self.init_file_paths: self.init_file_paths = ['']
- for file_path in self.init_file_paths:
- if file_path: main.new_page(file_path) #load pages from file
paths
- if Preferences.file_open() in self.init_file_paths:
- main.new_page(Preferences.file_open(), show=True)
- if not self.main_window.current_page:
+ file_path_to_show = Preferences.file_open()
+ for file_path in (self.init_file_paths or
Preferences.get_open_files()):
+ if os.path.exists(file_path):
+ main.new_page(file_path, show=file_path_to_show ==
file_path)
- if not self.get_page():
++ if not main.current_page:
main.new_page() # ensure that at least a blank page exists
main.btwin.search_entry.hide()
diff --cc grc/gui/BlockTreeWindow.py
index 90d4b56,900cbd3..8504200
--- a/grc/gui/BlockTreeWindow.py
+++ b/grc/gui/BlockTreeWindow.py
@@@ -179,11 -202,12 +179,11 @@@ class BlockTreeWindow(Gtk.VBox)
"""Update the documentation column of every block"""
def update_doc(model, _, iter_):
- if model.iter_has_child(iter_):
- return # category node, no doc string
key = model.get_value(iter_, KEY_INDEX)
+ if not key:
+ return # category node, no doc string
block = self.platform.blocks[key]
- doc = Utils.parse_template(DOC_MARKUP_TMPL, doc=block.get_doc())
- model.set_value(iter_, DOC_INDEX, doc)
+ model.set_value(iter_, DOC_INDEX,
_format_doc(block.documentation))
self.treestore.foreach(update_doc)
self.treestore_search.foreach(update_doc)
diff --cc grc/gui/Preferences.py
index 8756a7a,d377018..d917537
--- a/grc/gui/Preferences.py
+++ b/grc/gui/Preferences.py
@@@ -77,7 -74,7 +77,7 @@@ def entry(key, value=None, default=None
}.get(_type, _config_parser.get)
try:
result = getter('main', key)
- except configparser.Error:
- except (AttributeError, ConfigParser.Error):
++ except (AttributeError, configparser.Error):
result = _type() if default is None else default
return result
@@@ -109,7 -106,7 +109,7 @@@ def get_file_list(key)
try:
files = [value for name, value in _config_parser.items(key)
if name.startswith('%s_' % key)]
- except configparser.Error:
- except (AttributeError, ConfigParser.Error):
++ except (AttributeError, configparser.Error):
files = []
return files
diff --cc grc/scripts/gnuradio-companion
index 6130582,34bb0bf..8f267c8
--- a/grc/scripts/gnuradio-companion
+++ b/grc/scripts/gnuradio-companion
@@@ -20,22 -20,80 +20,82 @@@ Foundation, Inc., 51 Franklin Street, F
import os
import sys
+ import warnings
- script_path = os.path.dirname(os.path.abspath(__file__))
- source_tree_subpath = "/grc/scripts"
- if not script_path.endswith(source_tree_subpath):
- # run the installed version
- from gnuradio.grc import checks
- checks.do_all()
- from gnuradio.grc.main import main
- exit(main())
+ GR_IMPORT_ERROR_MESSAGE = """\
+ Cannot import gnuradio.
+
+ Is the model path environment variable set correctly?
+ All OS: PYTHONPATH
+
+ Is the library path environment variable set correctly?
+ Linux: LD_LIBRARY_PATH
+ Windows: PATH
+ MacOSX: DYLD_LIBRARY_PATH
+ """
+
+
+ def die(error, message):
+ msg = "{0}\n\n({1})".format(message, error)
+ try:
- import gtk
- d = gtk.MessageDialog(
- type=gtk.MESSAGE_ERROR,
- buttons=gtk.BUTTONS_CLOSE,
- message_format=msg,
++ from gi.repository import Gtk
++ d = Gtk.MessageDialog(
++ message_type=Gtk.MessageType.ERROR,
++ buttons=Gtk.ButtonsType.CLOSE,
++ text=msg,
+ )
+ d.set_title(type(error).__name__)
+ d.run()
+ exit(1)
+ except ImportError:
+ exit(type(error).__name__ + '\n\n' + msg)
+
+
+ def check_gtk():
+ try:
+ warnings.filterwarnings("error")
- import pygtk
- pygtk.require('2.0')
- import gtk
- gtk.init_check()
++ import gi
++ gi.require_version('Gtk', '3.0')
++ gi.require_version('PangoCairo', '1.0')
+
- else:
- print("Running from source tree")
- sys.path.insert(1, script_path[:-len(source_tree_subpath)])
- from grc import checks
- checks.do_all()
- from grc.main import main
++ from gi.repository import Gtk
++ Gtk.init_check()
+ warnings.filterwarnings("always")
+ except Exception as err:
+ die(err, "Failed to initialize GTK. If you are running over ssh, "
+ "did you enable X forwarding and start ssh with -X?")
+
+
+ def check_gnuradio_import():
+ try:
+ from gnuradio import gr
+ except ImportError as err:
+ die(err, GR_IMPORT_ERROR_MESSAGE)
+
+
+ def check_blocks_path():
+ if 'GR_DONT_LOAD_PREFS' in os.environ and not
os.environ.get('GRC_BLOCKS_PATH', ''):
+ die(EnvironmentError("No block definitions available"),
+ "Can't find block definitions. Use config.conf or
GRC_BLOCKS_PATH.")
+
+
+ def run_main():
+ script_path = os.path.dirname(os.path.abspath(__file__))
+ source_tree_subpath = "/grc/scripts"
+
+ if not script_path.endswith(source_tree_subpath):
+ # run the installed version
+ from gnuradio.grc.main import main
+ else:
+ print("Running from source tree")
+ sys.path.insert(1, script_path[:-len(source_tree_subpath)])
+ from grc.main import main
exit(main())
+
+ if __name__ == '__main__':
+ check_gnuradio_import()
+ check_gtk()
+ check_blocks_path()
+ run_main()
- [Commit-gnuradio] [gnuradio] 94/101: grc: gtk3: reimplemented custom bg colors for param entry boxes, (continued)
- [Commit-gnuradio] [gnuradio] 94/101: grc: gtk3: reimplemented custom bg colors for param entry boxes, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 98/101: cmake: add DIRECTORY support to GR_PYTHON_INSTALL and use it for grc, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 11/101: grc: py3k compat using python-modernize, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 75/101: grc: gtk3: rewrite file dialogs and support multiple extentions for screenshots, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 70/101: grc: gtk3: fancier coloring for disabled and bypassed blocks, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 83/101: grc: refactor: Cleaned up imports, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 88/101: grc: gtk3: fix multi-block move, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 91/101: grc: gtk3: fix canvas extent after zooming, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 100/101: grc: gtk minor fixes, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 01/101: grc: Main window opens with pygobject and gtk3. Still throws tons of errors., git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 72/101: Merge remote-tracking branch 'upstream/next' into gtk3,
git <=
- [Commit-gnuradio] [gnuradio] 71/101: grc: gtk3: fixup dialogs, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 78/101: Merge remote-tracking branch 'upstream/next' into gtk3, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 79/101: grc: refactor: move drawables in subpackage, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 95/101: grc: gtk3: curved connections, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 82/101: grc: gtk3: Converted to Gtk.Application (ActionHandler) and Gtk.ApplicationWindow (MainWindow), git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 96/101: grc: gtk3: invalid connection all red, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 90/101: Merge remote-tracking branch 'upstream/next' into gtk3, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 97/101: grc: gtk3: drag to connect, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 84/101: grc: refactor: Moved preferences to Config.py, git, 2017/03/16
- [Commit-gnuradio] [gnuradio] 101/101: Merge branch 'gtk3' into python3, git, 2017/03/16