Browse Source

Cleanup loopback backend.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3610 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/v1.9.3
sletz 16 years ago
parent
commit
3f6990c0c0
3 changed files with 28 additions and 3 deletions
  1. +16
    -0
      common/JackAudioDriver.cpp
  2. +10
    -0
      common/JackAudioDriver.h
  3. +2
    -3
      common/JackLoopbackDriver.cpp

+ 16
- 0
common/JackAudioDriver.cpp View File

@@ -79,6 +79,22 @@ int JackAudioDriver::Open(jack_nframes_t buffer_size,
return JackDriver::Open(buffer_size, samplerate, capturing, playing, inchannels, outchannels, monitor, capture_driver_name, playback_driver_name, capture_latency, playback_latency);
}

int JackAudioDriver::Open(bool capturing,
bool playing,
int inchannels,
int outchannels,
bool monitor,
const char* capture_driver_name,
const char* playback_driver_name,
jack_nframes_t capture_latency,
jack_nframes_t playback_latency)
{
fCaptureChannels = inchannels;
fPlaybackChannels = outchannels;
fWithMonitorPorts = monitor;
return JackDriver::Open(capturing, playing, inchannels, outchannels, monitor, capture_driver_name, playback_driver_name, capture_latency, playback_latency);
}

int JackAudioDriver::Attach()
{
JackPort* port;


+ 10
- 0
common/JackAudioDriver.h View File

@@ -74,6 +74,16 @@ class SERVER_EXPORT JackAudioDriver : public JackDriver
jack_nframes_t capture_latency,
jack_nframes_t playback_latency);
virtual int Open(bool capturing,
bool playing,
int inchannels,
int outchannels,
bool monitor,
const char* capture_driver_name,
const char* playback_driver_name,
jack_nframes_t capture_latency,
jack_nframes_t playback_latency);
virtual int Process();
virtual int ProcessNull();



+ 2
- 3
common/JackLoopbackDriver.cpp View File

@@ -19,7 +19,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/

#include "JackSystemDeps.h"
#include "JackGlobals.h"
#include "JackLoopbackDriver.h"
#include "JackDriverLoader.h"
#include "JackEngineControl.h"
@@ -94,9 +93,9 @@ extern "C"
break;
}
}
Jack::JackDriverClientInterface* driver = new Jack::JackLoopbackDriver(engine, table);
if (driver->Open(Jack::GetEngineControl()->fBufferSize, Jack::GetEngineControl()->fSampleRate, 1, 1, channels, channels, false, "loopback", "loopback", 0, 0) == 0) {
if (driver->Open(1, 1, channels, channels, false, "loopback", "loopback", 0, 0) == 0) {
return driver;
} else {
delete driver;


Loading…
Cancel
Save