diff --git a/ChangeLog b/ChangeLog index b749c620..5c5496b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,50 +18,54 @@ Fernando Lopez-Lezcano Romain Moret Florian Faber Michael Voigt -Torben Hohn +Torben Hohn Paul Davis --------------------------- Jackdmp changes log ---------------------------- - +--------------------------- + +2009-04-20 Stephane Letz + + * In ALSA audio card reservation code, tries to open the card even if reservation fails. + 2009-04-08 Stephane Letz - - * Native MIDI backend (JackCoreMidiDriver, JackWinMMEDriver) in progress. - + + * Native MIDI backend (JackCoreMidiDriver, JackWinMMEDriver) in progress. + 2009-04-03 Stephane Letz - - * Simplify JackClient RT code, jack_thread_wait API marked deprecated." - + + * Simplify JackClient RT code, jack_thread_wait API marked deprecated." + 2009-03-29 Stephane Letz - - * Cleanup JackInternalClient code. - + + * Cleanup JackInternalClient code. + 2009-03-27 Stephane Letz - - * Add a buffer size callback for netmaster that just remove the client (it will be recreated with the new parameters). - + + * Add a buffer size callback for netmaster that just remove the client (it will be recreated with the new parameters). + 2009-03-26 Stephane Letz - - * First working JackBoomerDriver two threads version. - + + * First working JackBoomerDriver two threads version. + 2009-03-24 Stephane Letz - - * New JackBoomerDriver class for Boomer driver on Solaris. + + * New JackBoomerDriver class for Boomer driver on Solaris. * Add mixed 32/64 bits mode (off by default). - + 2009-03-23 Stephane Letz - + * Version 1.9.3 started. - + 2009-03-19 Stephane Letz - + * Tim Blechmann optimization patch (inlining some heavy used methods). - + 2009-03-12 Stephane Letz * Virtualize and allow overriding of thread creation function, to allow Wine support (from JACK1). - + 2009-03-12 Stephane Letz * Try automatic adaptative mode in adapters. diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index 455f73ca..8836a82a 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/linux/alsa/JackAlsaDriver.cpp @@ -2193,19 +2193,16 @@ int JackAlsaDriver::Open(jack_nframes_t nframes, } else if (strcmp(capture_driver_name, playback_driver_name) == 0) { // Same device for input and output fReservedCaptureDevice = audio_acquire(card_to_num(capture_driver_name)); if (fReservedCaptureDevice == NULL) { - jack_error("Error audio device %s not available...", capture_driver_name); - return -1; + jack_error("Error audio device %s cannot be acquired, trying to open it anyway...", capture_driver_name); } } else { fReservedCaptureDevice = audio_acquire(card_to_num(capture_driver_name)); if (fReservedCaptureDevice == NULL) { - jack_error("Error capture audio device %s not available...", capture_driver_name); - return -1; - } + jack_error("Error capture audio device %s cannot be acquired, trying to open it anyway...", capture_driver_name); + } fReservedPlaybackDevice = audio_acquire(card_to_num(playback_driver_name)); if (fReservedPlaybackDevice == NULL) { - jack_error("Error playback audio device %s not available...", playback_driver_name); - return -1; + jack_error("Error playback audio device %s cannot be acquired, trying to open it anyway...", playback_driver_name); } } #endif