git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4716 0c269be4-1314-0410-8aa9-9f06e86f4224tags/1.9.9.5
@@ -168,7 +168,7 @@ void PortAudioDevices::PrintSupportedStandardSampleRates(const PaStreamParameter | |||||
int PortAudioDevices::GetInputDeviceFromName(const char* devicename, PaDeviceIndex& id, int& max_input) | 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); | PaDeviceInfo* device = GetDeviceFromFullName (fullname, id, true); | ||||
if (device) { | if (device) { | ||||
max_input = device->maxInputChannels; | 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) | 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); | PaDeviceInfo* device = GetDeviceFromFullName (fullname, id, false); | ||||
if (device) { | if (device) { | ||||
max_output = device->maxOutputChannels; | max_output = device->maxOutputChannels; | ||||
@@ -248,6 +248,7 @@ int JackPortAudioDriver::Close() | |||||
return res; | return res; | ||||
} | } | ||||
/* | |||||
int JackPortAudioDriver::Attach() | int JackPortAudioDriver::Attach() | ||||
{ | { | ||||
if (JackAudioDriver::Attach() == 0) { | if (JackAudioDriver::Attach() == 0) { | ||||
@@ -255,13 +256,13 @@ int JackPortAudioDriver::Attach() | |||||
char alias[REAL_JACK_PORT_NAME_SIZE]; | char alias[REAL_JACK_PORT_NAME_SIZE]; | ||||
for (int i = 0; i < fCaptureChannels; i++) { | 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]); | JackPort* port = fGraphManager->GetPort(fCapturePortList[i]); | ||||
port->SetAlias(alias); | port->SetAlias(alias); | ||||
} | } | ||||
for (int i = 0; i < fPlaybackChannels; i++) { | 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]); | JackPort* port = fGraphManager->GetPort(fPlaybackPortList[i]); | ||||
port->SetAlias(alias); | port->SetAlias(alias); | ||||
} | } | ||||
@@ -270,6 +271,7 @@ int JackPortAudioDriver::Attach() | |||||
return -1; | return -1; | ||||
} | } | ||||
} | } | ||||
*/ | |||||
int JackPortAudioDriver::Start() | int JackPortAudioDriver::Start() | ||||
{ | { | ||||
@@ -80,7 +80,7 @@ class JackPortAudioDriver : public JackMMCSS, public JackAudioDriver | |||||
int Close(); | int Close(); | ||||
int Attach(); | |||||
//int Attach(); | |||||
int Start(); | int Start(); | ||||
int Stop(); | int Stop(); | ||||