diff --git a/windows/portaudio/JackPortAudioDevices.cpp b/windows/portaudio/JackPortAudioDevices.cpp index eab9676a..aec83beb 100644 --- a/windows/portaudio/JackPortAudioDevices.cpp +++ b/windows/portaudio/JackPortAudioDevices.cpp @@ -168,7 +168,7 @@ void PortAudioDevices::PrintSupportedStandardSampleRates(const PaStreamParameter int PortAudioDevices::GetInputDeviceFromName(const char* devicename, PaDeviceIndex& id, int& max_input) { - string fullname = string (devicename); + string fullname = string(devicename); PaDeviceInfo* device = GetDeviceFromFullName (fullname, id, true); if (device) { max_input = device->maxInputChannels; @@ -187,7 +187,7 @@ int PortAudioDevices::GetInputDeviceFromName(const char* devicename, PaDeviceInd int PortAudioDevices::GetOutputDeviceFromName(const char* devicename, PaDeviceIndex& id, int& max_output) { - string fullname = string (devicename); + string fullname = string(devicename); PaDeviceInfo* device = GetDeviceFromFullName (fullname, id, false); if (device) { max_output = device->maxOutputChannels; diff --git a/windows/portaudio/JackPortAudioDriver.cpp b/windows/portaudio/JackPortAudioDriver.cpp index d9841773..a1742966 100644 --- a/windows/portaudio/JackPortAudioDriver.cpp +++ b/windows/portaudio/JackPortAudioDriver.cpp @@ -248,6 +248,7 @@ int JackPortAudioDriver::Close() return res; } +/* int JackPortAudioDriver::Attach() { if (JackAudioDriver::Attach() == 0) { @@ -255,13 +256,13 @@ int JackPortAudioDriver::Attach() char alias[REAL_JACK_PORT_NAME_SIZE]; for (int i = 0; i < fCaptureChannels; i++) { - snprintf(alias, sizeof(alias), "%s:out%d", fPaDevices->GetDeviceName(fInputDevice), i + 1); + snprintf(alias, sizeof(alias), "%s:out%d", fPaDevices->GetDeviceName(fInputDevice).c_str(), i + 1); JackPort* port = fGraphManager->GetPort(fCapturePortList[i]); port->SetAlias(alias); } for (int i = 0; i < fPlaybackChannels; i++) { - snprintf(alias, sizeof(alias), "%s:in%d", fPaDevices->GetDeviceName(fOutputDevice), i + 1); + snprintf(alias, sizeof(alias), "%s:in%d", fPaDevices->GetDeviceName(fOutputDevice).c_str(), i + 1); JackPort* port = fGraphManager->GetPort(fPlaybackPortList[i]); port->SetAlias(alias); } @@ -270,6 +271,7 @@ int JackPortAudioDriver::Attach() return -1; } } +*/ int JackPortAudioDriver::Start() { diff --git a/windows/portaudio/JackPortAudioDriver.h b/windows/portaudio/JackPortAudioDriver.h index 82168790..a3599d01 100644 --- a/windows/portaudio/JackPortAudioDriver.h +++ b/windows/portaudio/JackPortAudioDriver.h @@ -80,7 +80,7 @@ class JackPortAudioDriver : public JackMMCSS, public JackAudioDriver int Close(); - int Attach(); + //int Attach(); int Start(); int Stop();