Browse Source

Correct jack_latent_client.cbp.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4724 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.9.5
sletz 13 years ago
parent
commit
ee1ebda8a7
3 changed files with 9 additions and 6 deletions
  1. +6
    -2
      windows/JackRouter/JackRouter.cpp
  2. +1
    -1
      windows/jack_latent_client.cbp
  3. +2
    -3
      windows/portaudio/JackPortAudioDriver.cpp

+ 6
- 2
windows/JackRouter/JackRouter.cpp View File

@@ -643,14 +643,17 @@ ASIOError JackRouter::createBuffers(ASIOBufferInfo *bufferInfos, long numChannel
for (i = 0; i < numChannels; i++, info++) {
if (info->isInput) {
if (info->channelNum < 0 || info->channelNum >= kNumInputs)
goto error;
fInMap[fActiveInputs] = info->channelNum;
if (!fFloatSample) {
fInputBuffers[fActiveInputs] = new long[fBufferSize * 2]; // double buffer
} else {
fInputBuffers[fActiveInputs] = new jack_default_audio_sample_t[fBufferSize * 2]; // double buffer
}
if (fInputBuffers[fActiveInputs]) {
info->buffers[0] = fInputBuffers[fActiveInputs];
info->buffers[1] = (fFloatSample) ? (void*)((float*)fInputBuffers[fActiveInputs] + fBufferSize) : (void*)((long*)fInputBuffers[fActiveInputs] + fBufferSize);
@@ -671,8 +674,9 @@ error:
disposeBuffers();
return ASE_InvalidParameter;
}
} else { // output
if (info->channelNum < 0 || info->channelNum >= kNumOutputs)
} else {
if (info->channelNum < 0 || info->channelNum >= kNumOutputs)
goto error;
fOutMap[fActiveOutputs] = info->channelNum;


+ 1
- 1
windows/jack_latent_client.cbp View File

@@ -37,7 +37,7 @@
<Add directory="..\common" />
</Compiler>
<Linker>
<Add directory="Debug\bin64" />
<Add directory="Debug64\bin" />
<Add library="libjack64" />
</Linker>
</Target>


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

@@ -90,6 +90,8 @@ PaError JackPortAudioDriver::OpenStream(jack_nframes_t buffer_size)
{
PaStreamParameters inputParameters;
PaStreamParameters outputParameters;
jack_log("JackPortAudioDriver::OpenStream buffer_size = %d", buffer_size);

// Update parameters
inputParameters.device = fInputDevice;
@@ -346,10 +348,8 @@ extern "C"
jack_driver_descriptor_add_parameter(desc, &filler, "inchannels", 'i', JackDriverParamUInt, &value, NULL, "Maximum number of input channels", NULL);
jack_driver_descriptor_add_parameter(desc, &filler, "outchannels", 'o', JackDriverParamUInt, &value, NULL, "Maximum number of output channels", NULL);

strcpy(value.str, "will take default PortAudio input device");
jack_driver_descriptor_add_parameter(desc, &filler, "capture", 'C', JackDriverParamString, &value, NULL, "Provide capture ports. Optionally set PortAudio device name", NULL);

strcpy(value.str, "will take default PortAudio output device");
jack_driver_descriptor_add_parameter(desc, &filler, "playback", 'P', JackDriverParamString, &value, NULL, "Provide playback ports. Optionally set PortAudio device name", NULL);

value.i = 0;
@@ -364,7 +364,6 @@ extern "C"
value.ui = 512U;
jack_driver_descriptor_add_parameter(desc, &filler, "period", 'p', JackDriverParamUInt, &value, NULL, "Frames per period", NULL);

strcpy(value.str, "will take default PortAudio device name");
jack_driver_descriptor_add_parameter(desc, &filler, "device", 'd', JackDriverParamString, &value, NULL, "PortAudio device name", NULL);

value.ui = 0;


Loading…
Cancel
Save