diff options
| author | Adam Miartus <amiartus@de.adit-jv.com> | 2019-09-30 14:57:52 +0200 |
|---|---|---|
| committer | Filipe Coelho <falktx@falktx.com> | 2020-10-11 22:43:49 +0200 |
| commit | 87da6c7d3866db889cda57f2b8926dc010ee9e1b (patch) | |
| tree | 340bc169fe40829a11a91d982e25506a6beca6a9 | |
| parent | 4f8849bdc6ac897a9cf7cf3e23827da6d4c1d663 (diff) | |
| download | jack2-87da6c7d3866db889cda57f2b8926dc010ee9e1b.tar.gz | |
jack alsa: reoganize code for readability
Change-Id: I3d79e5f2516d8709b70dc700e5c9a04534619661
Signed-off-by: Adam Miartus <amiartus@de.adit-jv.com>
(cherry picked from commit 7a7d3b3524877533c0d5a9d3490d862d4323d280)
Signed-off-by: Timo Wischer <twischer@de.adit-jv.com>
| -rw-r--r-- | linux/alsa/JackAlsaDriver.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index 0bd904d5..0ac29198 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/linux/alsa/JackAlsaDriver.cpp @@ -352,21 +352,22 @@ int JackAlsaDriver::Open(jack_nframes_t nframes, capture_latency, playback_latency, midi); - if (fDriver) { - // ALSA driver may have changed the in/out values - fCaptureChannels = ((alsa_driver_t *)fDriver)->capture_nchannels; - fPlaybackChannels = ((alsa_driver_t *)fDriver)->playback_nchannels; - if (JackServerGlobals::on_device_reservation_loop != NULL) { - device_reservation_loop_running = true; - if (JackPosixThread::StartImp(&fReservationLoopThread, 0, 0, on_device_reservation_loop, NULL) != 0) { - device_reservation_loop_running = false; - } - } - return 0; - } else { + if (!fDriver) { Close(); return -1; } + + // ALSA driver may have changed the in/out values + fCaptureChannels = ((alsa_driver_t *)fDriver)->capture_nchannels; + fPlaybackChannels = ((alsa_driver_t *)fDriver)->playback_nchannels; + if (JackServerGlobals::on_device_reservation_loop != NULL) { + device_reservation_loop_running = true; + if (JackPosixThread::StartImp(&fReservationLoopThread, 0, 0, on_device_reservation_loop, NULL) != 0) { + device_reservation_loop_running = false; + } + } + + return 0; } int JackAlsaDriver::Close() |