From 69faf9a92be7a7efd3199ffcecdc73abc59b9195 Mon Sep 17 00:00:00 2001 From: sletz Date: Wed, 30 Jul 2008 21:27:16 +0000 Subject: [PATCH] Fix some assert in Linux drivers. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2750 0c269be4-1314-0410-8aa9-9f06e86f4224 --- linux/alsa/JackAlsaDriver.cpp | 4 ++-- linux/firewire/JackFFADODriver.cpp | 4 ++-- linux/freebob/JackFreebobDriver.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index d4162b15..2ac32e57 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/linux/alsa/JackAlsaDriver.cpp @@ -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; diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp index 3bda6f9b..f7ce2942 100644 --- a/linux/firewire/JackFFADODriver.cpp +++ b/linux/firewire/JackFFADODriver.cpp @@ -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!"); diff --git a/linux/freebob/JackFreebobDriver.cpp b/linux/freebob/JackFreebobDriver.cpp index 87cc5f83..65ee2aa5 100644 --- a/linux/freebob/JackFreebobDriver.cpp +++ b/linux/freebob/JackFreebobDriver.cpp @@ -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);