From 490f0b31a86b1aa6cec327809ee8d528eb0e3f5b Mon Sep 17 00:00:00 2001 From: joq Date: Wed, 27 Aug 2003 14:03:25 +0000 Subject: [PATCH] [0.79.3] Takashi's -P fix git-svn-id: svn+ssh://jackaudio.org/trunk/jack@472 0c269be4-1314-0410-8aa9-9f06e86f4224 --- configure.in | 2 +- drivers/alsa/alsa_driver.c | 40 +++++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/configure.in b/configure.in index 7ee854d..8caf21e 100644 --- a/configure.in +++ b/configure.in @@ -14,7 +14,7 @@ dnl changes are made dnl --- JACK_MAJOR_VERSION=0 JACK_MINOR_VERSION=79 -JACK_MICRO_VERSION=2 +JACK_MICRO_VERSION=3 dnl --- dnl HOWTO: updating the jack protocal version diff --git a/drivers/alsa/alsa_driver.c b/drivers/alsa/alsa_driver.c index 5bd126c..7359dbd 100644 --- a/drivers/alsa/alsa_driver.c +++ b/drivers/alsa/alsa_driver.c @@ -476,28 +476,32 @@ alsa_driver_set_parameters (alsa_driver_t *driver, jack_nframes_t frames_per_cyc driver->playback_sample_bytes = snd_pcm_format_physical_width (driver->playback_sample_format) / 8; driver->capture_sample_bytes = snd_pcm_format_physical_width (driver->capture_sample_format) / 8; - switch (driver->playback_sample_format) { - case SND_PCM_FORMAT_S32_LE: - case SND_PCM_FORMAT_S16_LE: - case SND_PCM_FORMAT_S32_BE: - case SND_PCM_FORMAT_S16_BE: - break; + if (driver->playback_handle) { + switch (driver->playback_sample_format) { + case SND_PCM_FORMAT_S32_LE: + case SND_PCM_FORMAT_S16_LE: + case SND_PCM_FORMAT_S32_BE: + case SND_PCM_FORMAT_S16_BE: + break; - default: - jack_error ("programming error: unhandled format type for playback"); - exit (1); + default: + jack_error ("programming error: unhandled format type for playback"); + exit (1); + } } - switch (driver->capture_sample_format) { - case SND_PCM_FORMAT_S32_LE: - case SND_PCM_FORMAT_S16_LE: - case SND_PCM_FORMAT_S32_BE: - case SND_PCM_FORMAT_S16_BE: - break; + if (driver->capture_handle) { + switch (driver->capture_sample_format) { + case SND_PCM_FORMAT_S32_LE: + case SND_PCM_FORMAT_S16_LE: + case SND_PCM_FORMAT_S32_BE: + case SND_PCM_FORMAT_S16_BE: + break; - default: - jack_error ("programming error: unhandled format type for capture"); - exit (1); + default: + jack_error ("programming error: unhandled format type for capture"); + exit (1); + } } if (driver->playback_interleaved) {