Browse Source

Compiles again on Windows.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4718 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.9.9.5
sletz 13 years ago
parent
commit
eb358fb768
2 changed files with 10 additions and 8 deletions
  1. +9
    -7
      windows/portaudio/JackPortAudioDriver.cpp
  2. +1
    -1
      windows/portaudio/JackPortAudioDriver.h

+ 9
- 7
windows/portaudio/JackPortAudioDriver.cpp View File

@@ -251,10 +251,10 @@ int JackPortAudioDriver::Close()
int JackPortAudioDriver::Attach() int JackPortAudioDriver::Attach()
{ {
if (JackAudioDriver::Attach() == 0) { if (JackAudioDriver::Attach() == 0) {
char* alias;
if (fPaDevices->GetHostFromDevice(fInputDevice) == "ASIO")
const char* alias;
if (fPaDevices->GetHostFromDevice(fInputDevice) == "ASIO") {
for (int i = 0; i < fCaptureChannels; i++) { for (int i = 0; i < fCaptureChannels; i++) {
PaError err = PaAsio_GetInputChannelName(fInputDevice, i, &alias); PaError err = PaAsio_GetInputChannelName(fInputDevice, i, &alias);
if (err == paNoError) { if (err == paNoError) {
@@ -263,8 +263,8 @@ int JackPortAudioDriver::Attach()
} }
} }
} }
if (fPaDevices->GetHostFromDevice(fOutputDevice) == "ASIO")
if (fPaDevices->GetHostFromDevice(fOutputDevice) == "ASIO") {
for (int i = 0; i < fPlaybackChannels; i++) { for (int i = 0; i < fPlaybackChannels; i++) {
PaError err = PaAsio_GetInputChannelName(fOutputDevice, i, &alias); PaError err = PaAsio_GetInputChannelName(fOutputDevice, i, &alias);
if (err == paNoError) { if (err == paNoError) {
@@ -273,7 +273,9 @@ int JackPortAudioDriver::Attach()
} }
} }
} }

return 0;

} else { } else {
return -1; return -1;
} }


+ 1
- 1
windows/portaudio/JackPortAudioDriver.h View File

@@ -79,7 +79,7 @@ class JackPortAudioDriver : public JackMMCSS, public JackAudioDriver
jack_nframes_t playback_latency); jack_nframes_t playback_latency);


int Close(); int Close();
int Attach(); int Attach();


int Start(); int Start();


Loading…
Cancel
Save