zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 23:33:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- simplified IgnoreMIDIVolume.

Browse source 
The XP related check had already been deactivated but not removed.
This commit is contained in:
Christoph Oelckers 2018-01-14 10:47:46 +01:00
parent f28914d1b6
commit 13c4e58c3d
1 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/sound/mididevices/music_win_mididevice.cpp
View file

@ -649,18 +649,11 @@ void CALLBACK WinMIDIDevice::CallbackFunc(HMIDIOUT hOut, UINT uMsg, DWORD_PTR dw
// are done by sending MIDI channel volume messages to the stream, not // are done by sending MIDI channel volume messages to the stream, not
// through midiOutSetVolume().) // through midiOutSetVolume().)
// //
// This is using VC++'s __uuidof extension instead of the the CLSID_ and
// IID_ definitions because I couldn't figure out why it wasn't finding them
// when linking, and __uuidof circumvents that problem. I'd also be
// surprised if w32api includes any WASAPI stuff any time soon, so it's no
// big loss making this VC++-specific for the time being
//
//========================================================================== //==========================================================================
static bool IgnoreMIDIVolume(UINT id) static bool IgnoreMIDIVolume(UINT id)
{ {
MIDIOUTCAPS caps; MIDIOUTCAPS caps;
bool mustcheck = false;
if (MMSYSERR_NOERROR == midiOutGetDevCaps(id, &caps, sizeof(caps))) if (MMSYSERR_NOERROR == midiOutGetDevCaps(id, &caps, sizeof(caps)))
{ {
@ -668,7 +661,7 @@ static bool IgnoreMIDIVolume(UINT id)
{ {
// We cannot determine what this is so we have to assume the worst, as the default // We cannot determine what this is so we have to assume the worst, as the default
// devive's volume control is irreparably broken. // devive's volume control is irreparably broken.
mustcheck = true; return true;
} }
// The Microsoft GS Wavetable Synth advertises itself as MIDIDEV_SWSYNTH with a VOLUME control. // The Microsoft GS Wavetable Synth advertises itself as MIDIDEV_SWSYNTH with a VOLUME control.
// If the one we're using doesn't match that, we don't need to bother checking the name. // If the one we're using doesn't match that, we don't need to bother checking the name.
@ -676,28 +669,8 @@ static bool IgnoreMIDIVolume(UINT id)
{ {
if (strncmp(caps.szPname, "Microsoft GS", 12) == 0) if (strncmp(caps.szPname, "Microsoft GS", 12) == 0)
{ {
mustcheck = true;
}
}
if (mustcheck)
{
#ifndef __GNUC__
IMMDeviceEnumerator *enumerator;
// Now try to create an IMMDeviceEnumerator interface. If it succeeds,
// we know we're using the new audio stack introduced with Vista and
// should ignore this MIDI device's volume control.
if (SUCCEEDED(CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_ALL,
__uuidof(IMMDeviceEnumerator), (void**)&enumerator))
&& enumerator != nullptr)
{
enumerator->Release();
return true; return true;
} }
#else
// assume the worst and consider volume control broken.
return true;
#endif
} }
} }
return false; return false;