In ALSA audio card reservation code, tries to open the card even if reservation fails.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3507 0c269be4-1314-0410-8aa9-9f06e86f4224

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  <letz@grame.fr>
+
+	* In ALSA audio card reservation code, tries to open the card even if reservation fails.
+
 2009-04-08 Stephane Letz  <letz@grame.fr>
-
-	* Native MIDI backend (JackCoreMidiDriver, JackWinMMEDriver) in progress.
-
+
+	* Native MIDI backend (JackCoreMidiDriver, JackWinMMEDriver) in progress.
+
 2009-04-03 Stephane Letz  <letz@grame.fr>
-
-	* 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  <letz@grame.fr>
-
-	* Cleanup JackInternalClient code.
-
+
+	* Cleanup JackInternalClient code.
+
 2009-03-27 Stephane Letz  <letz@grame.fr>
-
-	* 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  <letz@grame.fr>
-
-	* First working JackBoomerDriver two threads version.
-
+
+	* First working JackBoomerDriver two threads version.
+
 2009-03-24 Stephane Letz  <letz@grame.fr>
-
-	* 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  <letz@grame.fr>
-
+
 	* Version 1.9.3 started.
-
+
 2009-03-19 Stephane Letz  <letz@grame.fr>
-
+
 	* Tim Blechmann optimization patch (inlining some heavy used methods).
-
+
 2009-03-12 Stephane Letz  <letz@grame.fr>
 
         * Virtualize and allow overriding of thread creation function, to allow Wine support (from JACK1).
-
+
 2009-03-12 Stephane Letz  <letz@grame.fr>
 
         * Try automatic adaptative mode in adapters.

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