Browse Source

Cleanup

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3349 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.2
sletz 16 years ago
parent
commit
9f0d5c605b
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      linux/alsa/JackAlsaDriver.cpp

+ 3
- 3
linux/alsa/JackAlsaDriver.cpp View File

@@ -2138,13 +2138,13 @@ int JackAlsaDriver::Detach()
return JackAudioDriver::Detach(); return JackAudioDriver::Detach();
} }


static int card_to_num(const char *device)
static int card_to_num(const char* device)
{ {
const char* t; const char* t;
int i; int i;


if ((t = strchr(device, ':'))) if ((t = strchr(device, ':')))
device = t+1;
device = t + 1;


if ((i = snd_card_get_index(device)) < 0) { if ((i = snd_card_get_index(device)) < 0) {
i = atoi(device); i = atoi(device);
@@ -2187,7 +2187,7 @@ int JackAlsaDriver::Open(jack_nframes_t nframes,


#if defined(JACK_DBUS) #if defined(JACK_DBUS)
if (audio_reservation_init() < 0) { if (audio_reservation_init() < 0) {
jack_error("Audio reservation sevice not available....");
jack_error("Audio device reservation service not available....");
} else if (strcmp(capture_driver_name, playback_driver_name) == 0) { // Same device for input and output } 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)); fReservedCaptureDevice = audio_acquire(card_to_num(capture_driver_name));
if (fReservedCaptureDevice == NULL) { if (fReservedCaptureDevice == NULL) {


Loading…
Cancel
Save