|
|
@@ -46,8 +46,7 @@ PortAudioDevices::PortAudioDevices() |
|
|
|
|
|
|
|
PortAudioDevices::~PortAudioDevices() |
|
|
|
{ |
|
|
|
// Desactivate for now: crash the server.. |
|
|
|
//Pa_Terminate(); |
|
|
|
Pa_Terminate(); |
|
|
|
|
|
|
|
delete[] fDeviceInfo; |
|
|
|
delete[] fHostName; |
|
|
@@ -99,19 +98,19 @@ string PortAudioDevices::GetFullName(std::string hostname, std::string devicenam |
|
|
|
} |
|
|
|
|
|
|
|
PaDeviceInfo* PortAudioDevices::GetDeviceFromFullName (string fullname, PaDeviceIndex& id, bool isInput) |
|
|
|
{
|
|
|
|
{ |
|
|
|
PaDeviceInfo* ret = NULL; |
|
|
|
//no driver to find |
|
|
|
if (fullname.size() == 0) {
|
|
|
|
if (fullname.size() == 0) { |
|
|
|
return NULL; |
|
|
|
} |
|
|
|
//first get host and device names from fullname |
|
|
|
string::size_type separator = fullname.find("::", 0);
|
|
|
|
string::size_type separator = fullname.find("::", 0); |
|
|
|
|
|
|
|
if (separator == string::npos) {
|
|
|
|
if (separator == string::npos) { |
|
|
|
return NULL; |
|
|
|
}
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
char* hostname = (char*)malloc(separator + 9); |
|
|
|
fill_n (hostname, separator + 9, 0); |
|
|
|
fullname.copy (hostname, separator); |
|
|
|