Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Blood: Add option to select MIDI MME device #842

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Blood: Add option to select MIDI MME device #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
549fad8
Audiolib: Move minmm and midi headers to include dir
tmyqlfpir Sep 8, 2024
c6ec695
Blood: Add option to select MIDI MME device
tmyqlfpir Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 source/audiolib/src/driver_winmm.h → source/audiolib/include/driver_winmm.h
View file
Open in desktop
File renamed without changes.
0 source/audiolib/src/midi.h → source/audiolib/include/midi.h
View file
Open in desktop
File renamed without changes.
36 changes: 36 additions & 0 deletions source/blood/src/menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "screen.h"
#include "sound.h"
#include "view.h"
#ifdef _WIN32 // required for MME midi device selection
#include "driver_winmm.h"
#include "midi.h"
#endif

void SaveGame(CGameMenuItemZEditBitmap *, CGameMenuEvent *);

Expand Down Expand Up @@ -622,6 +626,9 @@ void UpdateMusicVolume(CGameMenuItemSlider *pItem);
void UpdateSoundRate(CGameMenuItemZCycle *pItem);
void UpdateNumVoices(CGameMenuItemSlider *pItem);
void UpdateMusicDevice(CGameMenuItemZCycle *pItem);
#ifdef _WIN32
void UpdateMidiDevice(CGameMenuItemSlider *pItem);
#endif
void SetSound(CGameMenuItemChain *pItem);
void PreDrawSound(CGameMenuItem *pItem);
const char *pzSoundRateStrings[] = {
Expand Down Expand Up @@ -669,6 +676,9 @@ CGameMenuItemSlider itemOptionsSoundNumVoices("VOICES:", 3, 66, 120, 180, NumVoi
CGameMenuItemZBool itemOptionsSoundCDToggle("REDBOOK AUDIO:", 3, 66, 130, 180, false, UpdateCDToggle, NULL, NULL);
CGameMenuItemZCycle itemOptionsSoundMusicDevice("MIDI DRIVER:", 3, 66, 140, 180, 0, UpdateMusicDevice, pzMusicDeviceStrings, ARRAY_SIZE(pzMusicDeviceStrings), 0);
CGameMenuItemChain itemOptionsSoundSF2Bank("SF2 BANK", 3, 66, 150, 180, 0, &menuOptionsSoundSF2, 0, NULL, 0);
#ifdef _WIN32
CGameMenuItemSlider itemOptionsSoundMIDIDevice("MIDI DEVICE:", 3, 66, 150, 180, 0, 0, 255, 1, UpdateMidiDevice, -1, -1, kMenuSliderValue);
#endif
CGameMenuItemChain itemOptionsSoundApplyChanges("APPLY CHANGES", 3, 66, 160, 180, 0, NULL, 0, SetSound, 0);


Expand Down Expand Up @@ -1388,6 +1398,10 @@ void SetupOptionsMenu(void)
menuOptionsSound.Add(&itemOptionsSoundCDToggle, false);
menuOptionsSound.Add(&itemOptionsSoundMusicDevice, false);
menuOptionsSound.Add(&itemOptionsSoundSF2Bank, false);
#ifdef _WIN32
if (WinMMDrv_MIDI_GetNumDevices() > 0) // do not add this item if only 1 midi device is detected
menuOptionsSound.Add(&itemOptionsSoundMIDIDevice, false);
#endif

menuOptionsSound.Add(&itemOptionsSoundApplyChanges, false);
menuOptionsSound.Add(&itemBloodQAV, false);
Expand Down Expand Up @@ -2187,15 +2201,33 @@ void UpdateMusicDevice(CGameMenuItemZCycle *pItem)
UNREFERENCED_PARAMETER(pItem);
itemOptionsSoundSF2Bank.bEnable = 0;
itemOptionsSoundSF2Bank.bNoDraw = 1;
#ifdef _WIN32
itemOptionsSoundMIDIDevice.bEnable = 0;
itemOptionsSoundMIDIDevice.bNoDraw = 1;
#endif
switch (nMusicDeviceValues[itemOptionsSoundMusicDevice.m_nFocus])
{
case ASS_SF2:
itemOptionsSoundSF2Bank.bEnable = 1;
itemOptionsSoundSF2Bank.bNoDraw = 0;
break;
#ifdef _WIN32
case ASS_WinMM:
itemOptionsSoundMIDIDevice.bEnable = 1;
itemOptionsSoundMIDIDevice.bNoDraw = 0;
break;
#endif
}
}

#ifdef _WIN32
void UpdateMidiDevice(CGameMenuItemSlider *pItem)
{
WinMM_DeviceID = (unsigned int)pItem->nValue-1;
MIDI_Restart();
}
#endif

void SetSound(CGameMenuItemChain *pItem)
{
UNREFERENCED_PARAMETER(pItem);
Expand Down Expand Up @@ -2244,6 +2276,10 @@ void SetupOptionsSound(CGameMenuItemChain *pItem)
break;
}
}
#ifdef _WIN32
itemOptionsSoundMIDIDevice.nValue = int(WinMM_DeviceID+1);
itemOptionsSoundMIDIDevice.nRangeHigh = WinMMDrv_MIDI_GetNumDevices();
#endif

UpdateMusicDevice(NULL);
}
Expand Down