diff options
author | Ron Economos <w6rz@comcast.net> | 2020-11-10 13:33:17 -0800 |
---|---|---|
committer | Martin Braun <martin@gnuradio.org> | 2020-12-07 02:48:40 -0800 |
commit | 0bf355c912497eebd74f9059e1e55bd8c6547bc2 (patch) | |
tree | a4c811880d04bce3642d64c20b7ca23ea3d34606 | |
parent | a3061b8fe69fb8407d52d7f43cae57796015d185 (diff) |
build: Remove clang unused variable warnings.
-rw-r--r-- | gr-audio/lib/alsa/alsa_source.h | 5 | ||||
-rw-r--r-- | gr-blocks/lib/wavfile_sink_impl.h | 4 | ||||
-rw-r--r-- | gr-dtv/lib/dvbt/dvbt_demap_impl.cc | 1 | ||||
-rw-r--r-- | gr-dtv/lib/dvbt/dvbt_demap_impl.h | 2 | ||||
-rw-r--r-- | gr-dtv/lib/dvbt/dvbt_map_impl.cc | 1 | ||||
-rw-r--r-- | gr-dtv/lib/dvbt/dvbt_map_impl.h | 2 | ||||
-rw-r--r-- | gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc | 1 | ||||
-rw-r--r-- | gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.h | 2 | ||||
-rw-r--r-- | gr-vocoder/lib/freedv_rx_ss_impl.cc | 4 | ||||
-rw-r--r-- | gr-vocoder/lib/freedv_rx_ss_impl.h | 10 | ||||
-rw-r--r-- | gr-vocoder/lib/freedv_tx_ss_impl.cc | 4 | ||||
-rw-r--r-- | gr-vocoder/lib/freedv_tx_ss_impl.h | 8 |
12 files changed, 5 insertions, 39 deletions
diff --git a/gr-audio/lib/alsa/alsa_source.h b/gr-audio/lib/alsa/alsa_source.h index 1e34d9a24b..940d50f1dc 100644 --- a/gr-audio/lib/alsa/alsa_source.h +++ b/gr-audio/lib/alsa/alsa_source.h @@ -50,9 +50,8 @@ class alsa_source : public source alsa_internal::hwparam_wrap d_hw_params; snd_pcm_format_t d_format; unsigned int d_nperiods; - unsigned int d_period_time_us; // microseconds - snd_pcm_uframes_t d_period_size = 0; // in frames - unsigned int d_buffer_size_bytes = 0; // sizeof of d_buffer + unsigned int d_period_time_us; // microseconds + snd_pcm_uframes_t d_period_size = 0; // in frames std::vector<char> d_buffer; work_t d_worker = 0; // the work method to use unsigned int d_hw_nchan = 0; // # of configured h/w channels diff --git a/gr-blocks/lib/wavfile_sink_impl.h b/gr-blocks/lib/wavfile_sink_impl.h index 957c5a40da..0958150d2d 100644 --- a/gr-blocks/lib/wavfile_sink_impl.h +++ b/gr-blocks/lib/wavfile_sink_impl.h @@ -25,10 +25,6 @@ private: int d_bytes_per_sample_new; bool d_append; - float d_max_sample_val; - float d_min_sample_val; - float d_normalize_shift; - float d_normalize_fac; std::vector<float> d_buffer; SNDFILE* d_fp; diff --git a/gr-dtv/lib/dvbt/dvbt_demap_impl.cc b/gr-dtv/lib/dvbt/dvbt_demap_impl.cc index f2f36f9f3a..208fa1613d 100644 --- a/gr-dtv/lib/dvbt/dvbt_demap_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_demap_impl.cc @@ -46,7 +46,6 @@ dvbt_demap_impl::dvbt_demap_impl(int nsize, transmission), d_nsize(nsize), d_constellation_size(config.d_constellation_size), - d_transmission_mode(config.d_transmission_mode), d_step(config.d_step), d_alpha(config.d_alpha), d_gain(gain * config.d_norm), diff --git a/gr-dtv/lib/dvbt/dvbt_demap_impl.h b/gr-dtv/lib/dvbt/dvbt_demap_impl.h index 11741c9a92..7a86accddd 100644 --- a/gr-dtv/lib/dvbt/dvbt_demap_impl.h +++ b/gr-dtv/lib/dvbt/dvbt_demap_impl.h @@ -25,8 +25,6 @@ private: // Constellation size const unsigned char d_constellation_size; - // Transmission mode - dvbt_transmission_mode_t d_transmission_mode; // Step on each axis of the constellation unsigned char d_step; // Keep Alpha internally diff --git a/gr-dtv/lib/dvbt/dvbt_map_impl.cc b/gr-dtv/lib/dvbt/dvbt_map_impl.cc index 53fe80f6bb..2d79f6a4e4 100644 --- a/gr-dtv/lib/dvbt/dvbt_map_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_map_impl.cc @@ -47,7 +47,6 @@ dvbt_map_impl::dvbt_map_impl(int nsize, transmission), d_nsize(nsize), d_constellation_size(config.d_constellation_size), - d_transmission_mode(config.d_transmission_mode), d_step(config.d_step), d_alpha(config.d_alpha), d_gain(gain * config.d_norm), diff --git a/gr-dtv/lib/dvbt/dvbt_map_impl.h b/gr-dtv/lib/dvbt/dvbt_map_impl.h index 24ca570c8f..1a12174819 100644 --- a/gr-dtv/lib/dvbt/dvbt_map_impl.h +++ b/gr-dtv/lib/dvbt/dvbt_map_impl.h @@ -24,8 +24,6 @@ private: // Constellation size const unsigned char d_constellation_size; - // Keeps transmission mode - const dvbt_transmission_mode_t d_transmission_mode; // Step on each axis of the constellation const unsigned char d_step; // Keep Alpha internally diff --git a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc index b2d528ba53..ee4f982b7a 100644 --- a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc +++ b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.cc @@ -524,7 +524,6 @@ dvbt_viterbi_decoder_impl::dvbt_viterbi_decoder_impl(dvb_constellation_t constel d_bsize(bsize), d_nsymbols(d_bsize * d_n / d_m), d_nbits(2 * d_k * d_bsize), - d_nout(d_nbits / 2 / 8), d_inbits(d_nbits) { if (config.d_code_rate_HP == C1_2) { diff --git a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.h b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.h index 9b24f47126..198d88ff29 100644 --- a/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.h +++ b/gr-dtv/lib/dvbt/dvbt_viterbi_decoder_impl.h @@ -93,8 +93,6 @@ private: const int d_nsymbols; // Number of bits after depuncturing a block (before decoding) const int d_nbits; - // Number of full packed out bytes - const int d_nout; // Traceback (in bytes) int d_ntraceback; diff --git a/gr-vocoder/lib/freedv_rx_ss_impl.cc b/gr-vocoder/lib/freedv_rx_ss_impl.cc index 266e2954fa..d5d91d7a09 100644 --- a/gr-vocoder/lib/freedv_rx_ss_impl.cc +++ b/gr-vocoder/lib/freedv_rx_ss_impl.cc @@ -35,9 +35,7 @@ freedv_rx_ss_impl::freedv_rx_ss_impl(int mode, io_signature::make(1, 1, sizeof(short)), io_signature::make(1, 1, sizeof(short))), d_port(pmt::mp("text")), - d_mode(mode), - d_squelch_thresh(squelch_thresh), - d_interleave_frames(interleave_frames) + d_squelch_thresh(squelch_thresh) { #ifdef FREEDV_MODE_700D if (mode == FREEDV_MODE_700D) { diff --git a/gr-vocoder/lib/freedv_rx_ss_impl.h b/gr-vocoder/lib/freedv_rx_ss_impl.h index 6a6c8a55b9..4161321af6 100644 --- a/gr-vocoder/lib/freedv_rx_ss_impl.h +++ b/gr-vocoder/lib/freedv_rx_ss_impl.h @@ -19,30 +19,22 @@ namespace vocoder { class freedv_rx_ss_impl : public freedv_rx_ss { private: - short* d_speech_out; - short* d_demod_in; struct freedv* d_freedv; - int d_nin, d_nout, d_frame; + int d_nin, d_nout; std::string d_rx_str; static void put_next_rx_char(void* callback_state, char c); const pmt::pmt_t d_port; struct MODEM_STATS d_stats; - int d_mode; int d_sync; - int d_total_bits; int d_total_bit_errors; float d_snr_est; float d_squelch_thresh; bool d_squelch_en; int d_speech_samples; int d_max_modem_samples; - float d_clock_offset; - int d_use_codecrx; - int d_interleave_frames; #ifdef FREEDV_MODE_700D struct freedv_advanced d_adv; #endif - struct CODEC2* d_c2 = NULL; public: freedv_rx_ss_impl(int mode, float squelch_thresh, int interleave_frames); diff --git a/gr-vocoder/lib/freedv_tx_ss_impl.cc b/gr-vocoder/lib/freedv_tx_ss_impl.cc index b1160d1ac9..ec4d174f21 100644 --- a/gr-vocoder/lib/freedv_tx_ss_impl.cc +++ b/gr-vocoder/lib/freedv_tx_ss_impl.cc @@ -34,9 +34,7 @@ freedv_tx_ss_impl::freedv_tx_ss_impl(int mode, : block("vocoder_freedv_tx_ss", io_signature::make(1, 1, sizeof(short)), io_signature::make(1, 1, sizeof(short))), - d_mode(mode), - d_msg_text(msg_txt), - d_interleave_frames(interleave_frames) + d_msg_text(msg_txt) { #ifdef FREEDV_MODE_700D if (mode == FREEDV_MODE_700D) { diff --git a/gr-vocoder/lib/freedv_tx_ss_impl.h b/gr-vocoder/lib/freedv_tx_ss_impl.h index 1c4858a709..8557e20f08 100644 --- a/gr-vocoder/lib/freedv_tx_ss_impl.h +++ b/gr-vocoder/lib/freedv_tx_ss_impl.h @@ -19,26 +19,18 @@ namespace vocoder { class freedv_tx_ss_impl : public freedv_tx_ss { private: - short* d_speech_in; - short* d_mod_out; std::string d_tx_str; std::string::size_type d_tx_str_offset = 0; static char get_next_tx_char(void* callback_state); struct freedv* d_freedv; - int d_mode; std::string d_msg_text; - int d_interleave_frames; - float d_squelch_thresh; int d_speech_samples; int d_nom_modem_samples; - int d_use_codectx; - int d_use_datatx; int d_clip; int d_tx_bpf; #ifdef FREEDV_MODE_700D struct freedv_advanced d_adv; #endif - struct CODEC2* d_c2; public: freedv_tx_ss_impl(int mode, const std::string txt_msg, int interleave_frames); |