Browse Source

Fix some assert in Linux drivers.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2750 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 17 years ago
parent
commit
69faf9a92b
3 changed files with 6 additions and 6 deletions
  1. +2
    -2
      linux/alsa/JackAlsaDriver.cpp
  2. +2
    -2
      linux/firewire/JackFFADODriver.cpp
  3. +2
    -2
      linux/freebob/JackFreebobDriver.cpp

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

@@ -2134,8 +2134,8 @@ int JackAlsaDriver::Attach()
char name[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];
char alias[JACK_CLIENT_NAME_SIZE + JACK_PORT_NAME_SIZE];

assert(fCaptureChannels < PORT_NUM);
assert(fPlaybackChannels < PORT_NUM);
assert(fCaptureChannels < DRIVER_PORT_NUM);
assert(fPlaybackChannels < DRIVER_PORT_NUM);

port_flags = JackPortIsOutput | JackPortIsPhysical | JackPortIsTerminal;



+ 2
- 2
linux/firewire/JackFFADODriver.cpp View File

@@ -639,8 +639,8 @@ int JackFFADODriver::Attach()
}
}

assert(fCaptureChannels < PORT_NUM);
assert(fPlaybackChannels < PORT_NUM);
assert(fCaptureChannels < DRIVER_PORT_NUM);
assert(fPlaybackChannels < DRIVER_PORT_NUM);

if (ffado_streaming_prepare(driver->dev)) {
printError("Could not prepare streaming device!");


+ 2
- 2
linux/freebob/JackFreebobDriver.cpp View File

@@ -786,8 +786,8 @@ int JackFreebobDriver::Attach()
fCaptureChannels = driver->capture_nchannels_audio;
fPlaybackChannels = driver->playback_nchannels_audio;

assert(fCaptureChannels < PORT_NUM);
assert(fPlaybackChannels < PORT_NUM);
assert(fCaptureChannels < DRIVER_PORT_NUM);
assert(fPlaybackChannels < DRIVER_PORT_NUM);

// this makes no sense...
assert(fCaptureChannels + fPlaybackChannels > 0);


Loading…
Cancel
Save