smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Added PortAudio device channels names retrieving from the driver

Browse source
This commit is contained in:
Greg Zharun 2014-06-24 16:43:26 +03:00
parent 4a59a5806a
commit 301b9b13bf
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libs/backends/wavesaudio/wavesapi/devicemanager/WCMRPortAudioDeviceManager.cpp
View file

@ -409,9 +409,20 @@ void WCMRPortAudioDevice::updateDeviceInfo (bool callerIsWaiting/*=false*/)
m_InputChannels.clear(); m_InputChannels.clear();
for (int channel = 0; channel < maxInputChannels; channel++) for (int channel = 0; channel < maxInputChannels; channel++)
{ {
const char* channelName[32]; // 32 is max leth declared by PortAudio for this operation
std::stringstream chNameStream; std::stringstream chNameStream;
//A better implementation would be to retrieve the names from ASIO or CoreAudio interfaces
chNameStream << "Input " << (channel+1); PaError error = PaAsio_GetInputChannelName(m_DeviceID, channel, channelName);
if (error == paNoError)
{
chNameStream << *channelName;
}
else
{
chNameStream << "Input " << (channel+1);
}
m_InputChannels.push_back (chNameStream.str()); m_InputChannels.push_back (chNameStream.str());
} }
@ -420,9 +431,20 @@ void WCMRPortAudioDevice::updateDeviceInfo (bool callerIsWaiting/*=false*/)
m_OutputChannels.clear(); m_OutputChannels.clear();
for (int channel = 0; channel < maxOutputChannels; channel++) for (int channel = 0; channel < maxOutputChannels; channel++)
{ {
const char* channelName[32]; // 32 is max leth declared by PortAudio for this operation
std::stringstream chNameStream; std::stringstream chNameStream;
//A better implementation would be to retrieve the names from ASIO or CoreAudio interfaces
chNameStream << "Output " << (channel+1); PaError error = PaAsio_GetOutputChannelName(m_DeviceID, channel, channelName);
if (error == paNoError)
{
chNameStream << *channelName;
}
else
{
chNameStream << "Output " << (channel+1);
}
m_OutputChannels.push_back (chNameStream.str()); m_OutputChannels.push_back (chNameStream.str());
} }
} }