diff options
| author | Tom Rondeau | 2011-09-26 23:23:14 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-09-26 23:23:14 -0400 |
| commit | 4fec8eba2eb3d362319c8e09bf370edaa10cd1b9 (patch) | |
| tree | e41ff025b20b5c4ad8928fa0651a06dca884dc6f /gr-audio/lib/alsa/audio_alsa_source.cc | |
| parent | 79e7183bda0e3850c79dee7f086a8676311607fa (diff) | |
| parent | e3b56bfd879f16c2fa1f284f330ed3df6a211ec1 (diff) | |
| download | gnuradio-4fec8eba2eb3d362319c8e09bf370edaa10cd1b9.tar.gz gnuradio-4fec8eba2eb3d362319c8e09bf370edaa10cd1b9.tar.bz2 gnuradio-4fec8eba2eb3d362319c8e09bf370edaa10cd1b9.zip | |
Merge branch 'next' into digital
Conflicts:
gnuradio-core/src/lib/general/general.i
gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc
gnuradio-core/src/lib/general/gr_pll_refout_cc.cc
gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py
gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py
gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py
gr-digital/lib/digital_constellation_receiver_cb.cc
gr-digital/python/Makefile.am
gr-digital/python/__init__.py
gr-digital/python/generic_mod_demod.py
gr-digital/python/pkt.py
gr-digital/python/psk2.py
gr-digital/python/qam.py
Diffstat (limited to 'gr-audio/lib/alsa/audio_alsa_source.cc')
| -rw-r--r-- | gr-audio/lib/alsa/audio_alsa_source.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gr-audio/lib/alsa/audio_alsa_source.cc b/gr-audio/lib/alsa/audio_alsa_source.cc index 4f0042b22..2f4506f71 100644 --- a/gr-audio/lib/alsa/audio_alsa_source.cc +++ b/gr-audio/lib/alsa/audio_alsa_source.cc @@ -217,8 +217,14 @@ audio_alsa_source::check_topology (int ninputs, int noutputs) unsigned int nchan = noutputs; int err; - // FIXME check_topology may be called more than once. + // Check the state of the stream // Ensure that the pcm is in a state where we can still mess with the hw_params + snd_pcm_state_t state; + state=snd_pcm_state(d_pcm_handle); + if ( state== SND_PCM_STATE_RUNNING) + return true; // If stream is running, don't change any parameters + else if(state == SND_PCM_STATE_XRUN ) + snd_pcm_prepare ( d_pcm_handle ); // Prepare stream on underrun, and we can set parameters; bool special_case = nchan == 1 && d_special_case_stereo_to_mono; if (special_case) |