mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

ASIO channel name charset workaround.

Browse source
This commit is contained in:
jules 2013-01-17 15:47:56 +00:00
parent cd8adde4de
commit bcda6269d8
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/juce_audio_devices/native/juce_win32_ASIO.cpp
View file

@ -910,6 +910,16 @@ private:
bool volatile shouldUsePreferredSize;
//==============================================================================
static String convertASIOString (char* const text, int length)
{
if (CharPointer_UTF8::isValidString (text, length))
return String::fromUTF8 (text, length);
WCHAR wideVersion [64] = { 0 };
MultiByteToWideChar (CP_ACP, 0, text, length, wideVersion, numElementsInArray (wideVersion));
return wideVersion;
}
void removeCurrentDriver()
{
if (asioObject != nullptr)
@ -1152,7 +1162,7 @@ private:
channelInfo.isInput = 1;
asioObject->getChannelInfo (&channelInfo);
inputChannelNames.add (String (CharPointer_UTF8 (channelInfo.name)));
inputChannelNames.add (convertASIOString (channelInfo.name, sizeof (channelInfo.name)));
}
for (i = 0; i < totalNumOutputChans; ++i)
@ -1162,7 +1172,7 @@ private:
channelInfo.isInput = 0;
asioObject->getChannelInfo (&channelInfo);
outputChannelNames.add (String (CharPointer_UTF8 (channelInfo.name)));
outputChannelNames.add (convertASIOString (channelInfo.name, sizeof (channelInfo.name)));
outputFormat[i] = ASIOSampleFormat (channelInfo.type);
if (i < 2)