Browse Source

Cleanup now unused code in JackMidiDriver.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4261 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 14 years ago
parent
commit
083de8e163
3 changed files with 3 additions and 21 deletions
  1. +2
    -16
      common/JackMidiDriver.cpp
  2. +0
    -2
      common/JackMidiDriver.h
  3. +1
    -3
      windows/portaudio/JackPortAudioDriver.cpp

+ 2
- 16
common/JackMidiDriver.cpp View File

@@ -34,19 +34,10 @@ JackMidiDriver::JackMidiDriver(const char* name, const char* alias, JackLockedEn
: JackDriver(name, alias, engine, table),
fCaptureChannels(0),
fPlaybackChannels(0)
{
for (int i = 0; i < DRIVER_PORT_NUM; i++) {
fRingBuffer[i] = NULL;
}
}
{}

JackMidiDriver::~JackMidiDriver()
{
for (int i = 0; i < fCaptureChannels; i++) {
if (fRingBuffer[i])
jack_ringbuffer_free(fRingBuffer[i]);
}
}
{}

int JackMidiDriver::Open(bool capturing,
bool playing,
@@ -60,11 +51,6 @@ int JackMidiDriver::Open(bool capturing,
{
fCaptureChannels = inchannels;
fPlaybackChannels = outchannels;

for (int i = 0; i < fCaptureChannels; i++) {
fRingBuffer[i] = jack_ringbuffer_create(sizeof(jack_default_audio_sample_t) * BUFFER_SIZE_MAX);
}

return JackDriver::Open(capturing, playing, inchannels, outchannels, monitor, capture_driver_name, playback_driver_name, capture_latency, playback_latency);
}



+ 0
- 2
common/JackMidiDriver.h View File

@@ -40,8 +40,6 @@ class SERVER_EXPORT JackMidiDriver : public JackDriver
int fCaptureChannels;
int fPlaybackChannels;

jack_ringbuffer_t* fRingBuffer[DRIVER_PORT_NUM];

jack_port_id_t fCapturePortList[DRIVER_PORT_NUM];
jack_port_id_t fPlaybackPortList[DRIVER_PORT_NUM];



+ 1
- 3
windows/portaudio/JackPortAudioDriver.cpp View File

@@ -82,7 +82,7 @@ namespace Jack
: 0;
outputParameters.hostApiSpecificStreamInfo = NULL;

PaError err = Pa_OpenStream(&fStream,
return Pa_OpenStream(&fStream,
(fInputDevice == paNoDevice) ? 0 : &inputParameters,
(fOutputDevice == paNoDevice) ? 0 : &outputParameters,
fEngineControl->fSampleRate,
@@ -90,8 +90,6 @@ namespace Jack
paNoFlag, // Clipping is on...
Render,
this);

return err;
}

int JackPortAudioDriver::Open(jack_nframes_t buffer_size,


Loading…
Cancel
Save