Browse Source

Compile again on Windows.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4564 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.8
sletz 13 years ago
parent
commit
a2bb02b099
2 changed files with 4 additions and 3 deletions
  1. +2
    -2
      windows/portaudio/JackPortAudioDevices.cpp
  2. +2
    -1
      windows/portaudio/JackPortAudioDriver.cpp

+ 2
- 2
windows/portaudio/JackPortAudioDevices.cpp View File

@@ -278,8 +278,8 @@ bool PortAudioDevices::IsDuplex (PaDeviceIndex id)
//else is another complementary device ? (search in devices with the same name)
for (PaDeviceIndex i = 0; i < fNumDevice; i++) {
if ((i != id) && (GetDeviceName (i) == GetDeviceName (id))) {
if ((fDeviceInfo[i]->maxInputChannels && fDeviceInfo[id]->maxOutputChannels) {
|| (fDeviceInfo[i]->maxOutputChannels && fDeviceInfo[id]->maxInputChannels))
if ((fDeviceInfo[i]->maxInputChannels && fDeviceInfo[id]->maxOutputChannels)
|| (fDeviceInfo[i]->maxOutputChannels && fDeviceInfo[id]->maxInputChannels)) {
return true;
}
}


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

@@ -21,6 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "driver_interface.h"
#include "JackPortAudioDriver.h"
#include "JackEngineControl.h"
#include "JackGraphManager.h"
#include "JackError.h"
#include "JackTime.h"
#include "JackCompilerDeps.h"
@@ -133,7 +134,7 @@ void JackPortAudioDriver::UpdateLatencies()
for (int i = 0; i < fPlaybackChannels; i++) {
output_range.max = output_range.min = (info->outputLatency * fEngineControl->fSampleRate) + fPlaybackLatency;
if (fEngineControl->fSyncMode) {
output_range.max = output_range.min += fEngineControl->fBufferSizey;
output_range.max = output_range.min += fEngineControl->fBufferSize;
} else {
output_range.max = output_range.min += fEngineControl->fBufferSize * 2;
}


Loading…
Cancel
Save