Added: Voicemeeter Potato support

Improved: Device strings like "Output A5" no longer accidentally match GUIDs. Now, only strings containing { will match GUIDs.
This commit is contained in:
jthedering committed 2019-06-05 21:15:06 +00:00
1 parent 5a795a2d26
commit 5b886a9e7a
7 files changed
+28 -11

No files matched your search

+9 -3
View File
@@ -92,7 +92,11 @@ VoicemeeterClient::VoicemeeterClient(const vector<wstring>& outputs)
if (index != wstring::npos)
{
wstring setupFilename = voicemeeterDirectory.substr(index + 1);
banana = (setupFilename == L"VoicemeeterProSetup.exe");
voicemeeterType = 1;
if (setupFilename == L"VoicemeeterProSetup.exe")
voicemeeterType = 2;// banana
else if (setupFilename == L"Voicemeeter8Setup.exe")
voicemeeterType = 3;// potato
voicemeeterDirectory = voicemeeterDirectory.substr(0, index);
@@ -137,11 +141,13 @@ void VoicemeeterClient::start()
{
long type;
if (vmr.VBVMR_GetVoicemeeterType(&type) == 0)
banana = (type == 2);
voicemeeterType = type;
}
unsigned outputCount;
if (banana)
if (voicemeeterType == 3)
outputCount = 5;
else if (voicemeeterType == 2)
outputCount = 3;
else
outputCount = 1;
+1 -1
View File
@@ -43,6 +43,6 @@ private:
std::vector<FilterEngine*> engines;
std::vector<int> idleSampleCounts;
bool loggedIn = false;
bool banana = false;
long voicemeeterType = 1;
std::vector<std::wstring> outputs;
};
+1 -1
View File
@@ -149,11 +149,11 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\..\Users\Jonas\Downloads\VoicemeeterRemoteAPI_Pack6\VoicemeeterRemote.h" />
<ClInclude Include="..\helpers\MemoryHelper.h" />
<ClInclude Include="..\stdafx.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="VoicemeeterClient.h" />
<ClInclude Include="VoicemeeterRemote.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\helpers\MemoryHelper.cpp" />
@@ -3,11 +3,11 @@
<ItemGroup>
<ClInclude Include="VoicemeeterClient.h" />
<ClInclude Include="..\stdafx.h" />
<ClInclude Include="..\..\..\..\..\Users\Jonas\Downloads\VoicemeeterRemoteAPI_Pack6\VoicemeeterRemote.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="..\helpers\MemoryHelper.h">
<Filter>helpers</Filter>
</ClInclude>
<ClInclude Include="VoicemeeterRemote.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="VoicemeeterClient.cpp" />