Browse Source

Correct jack_initialize in JackNetIOAdapter

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2620 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 17 years ago
parent
commit
acc2734c24
2 changed files with 9 additions and 1 deletions
  1. +2
    -0
      common/JackCallbackNetIOAdapter.cpp
  2. +7
    -1
      common/JackNetIOAdapter.cpp

+ 2
- 0
common/JackCallbackNetIOAdapter.cpp View File

@@ -94,6 +94,8 @@ JackCallbackNetIOAdapter::JackCallbackNetIOAdapter(jack_client_t* jack_client,
{
int i;
printf("input , %ld %ld\n", input, output);
fCaptureRingBuffer = new JackResampler*[fCaptureChannels];
fPlaybackRingBuffer = new JackResampler*[fPlaybackChannels];


+ 7
- 1
common/JackNetIOAdapter.cpp View File

@@ -119,6 +119,9 @@ extern "C"
#include "JackPortAudioIOAdapter.h"
#endif

#define max(x,y) (((x)>(y)) ? (x) : (y))
#define min(x,y) (((x)<(y)) ? (x) : (y))

EXPORT int jack_initialize(jack_client_t* jack_client, const char* load_init)
{
if (adapter) {
@@ -142,7 +145,10 @@ extern "C"
}
if (ports)
free(ports);

input = max(2, input);
output = max(2, output);
#ifdef __linux__
adapter = new Jack::JackCallbackNetIOAdapter(jack_client,
new Jack::JackAlsaIOAdapter(input, output, jack_get_buffer_size(jack_client), jack_get_sample_rate(jack_client)), input, output);


Loading…
Cancel
Save