Browse Source

jack alsa: reoganize code for readability

Change-Id: I3d79e5f2516d8709b70dc700e5c9a04534619661
Signed-off-by: Adam Miartus <amiartus@de.adit-jv.com>
(cherry picked from commit 7a7d3b3524)
Signed-off-by: Timo Wischer <twischer@de.adit-jv.com>
tags/v1.9.15
Adam Miartus Filipe Coelho <falktx@falktx.com> 6 years ago
parent
commit
87da6c7d38
1 changed files with 13 additions and 12 deletions
  1. +13
    -12
      linux/alsa/JackAlsaDriver.cpp

+ 13
- 12
linux/alsa/JackAlsaDriver.cpp View File

@@ -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()


Loading…
Cancel
Save