diff options
| author | Tom Rondeau | 2012-01-06 14:44:51 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-01-06 14:44:51 -0500 |
| commit | 1b80996597fc1800c28e17f77b7cb09f9783d290 (patch) | |
| tree | 33b1938eedc12b15040acafd2d0171b0123523dd /gr-audio/lib | |
| parent | d94c47d652d170760ffca728dc61e45d629fcc04 (diff) | |
| parent | e337d7ce6b89403d68cfe75177811ec23571abe5 (diff) | |
| download | gnuradio-1b80996597fc1800c28e17f77b7cb09f9783d290.tar.gz gnuradio-1b80996597fc1800c28e17f77b7cb09f9783d290.tar.bz2 gnuradio-1b80996597fc1800c28e17f77b7cb09f9783d290.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gr-audio/lib')
| -rw-r--r-- | gr-audio/lib/alsa/audio_alsa_source.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gr-audio/lib/alsa/audio_alsa_source.cc b/gr-audio/lib/alsa/audio_alsa_source.cc index 08d4996a8..a90552ff5 100644 --- a/gr-audio/lib/alsa/audio_alsa_source.cc +++ b/gr-audio/lib/alsa/audio_alsa_source.cc @@ -348,12 +348,11 @@ audio_alsa_source::work_s16_2x1 (int noutput_items, typedef gr_int16 sample_t; // the type of samples we're creating static const float scale_factor = 1.0 / std::pow(2.0f, 16-1); - unsigned int nchan = output_items.size (); float **out = (float **) &output_items[0]; sample_t *buf = (sample_t *) d_buffer; int bi; - assert (nchan == 1); + assert (output_items.size () == 1); unsigned int sizeof_frame = d_hw_nchan * sizeof (sample_t); assert (d_buffer_size_bytes == d_period_size * sizeof_frame); @@ -425,12 +424,11 @@ audio_alsa_source::work_s32_2x1 (int noutput_items, typedef gr_int32 sample_t; // the type of samples we're creating static const float scale_factor = 1.0 / std::pow(2.0f, 32-1); - unsigned int nchan = output_items.size (); float **out = (float **) &output_items[0]; sample_t *buf = (sample_t *) d_buffer; int bi; - assert (nchan == 1); + assert (output_items.size () == 1); unsigned int sizeof_frame = d_hw_nchan * sizeof (sample_t); assert (d_buffer_size_bytes == d_period_size * sizeof_frame); |