aboutsummaryrefslogtreecommitdiff
path: root/utils/adlmidi-2
diff options
context:
space:
mode:
authorVitaly Novichkov <Wohlstand@users.noreply.github.com>2020-09-21 00:43:58 +0300
committerGitHub <noreply@github.com>2020-09-21 00:43:58 +0300
commit9b51dd7d667e97338a92711543fc3e942faae52f (patch)
tree63539cbf427912686565dab81b3aa820346967b5 /utils/adlmidi-2
parente082315b04cbc75b4cfce744e9274bb8c5cedd38 (diff)
downloadlibADLMIDI-9b51dd7d667e97338a92711543fc3e942faae52f.tar.gz
libADLMIDI-9b51dd7d667e97338a92711543fc3e942faae52f.tar.bz2
libADLMIDI-9b51dd7d667e97338a92711543fc3e942faae52f.zip
Added WinMM driver for windows (#236)
* ADLMIDI2: Fixed an MSVC build However, it may work glitchy! * Experimental WinMM MIDI driver TODO: Make a control panel to configure the driver * WinMM-DRV: A workaround for older MinGW * WinMM-DRV: WIP control panel appled / tool * WinMM-DRV: Better test a driver's work * WinMM-DRV: More progress on a control panel * WinMM-DRV: And more progress on this control panel It's almost completed, I need to make the working setup through a registry. * WinMM-DRV: Driver is almost ready However, control panel can't ping a driver to reload settings yet * WinMM-DRV: Fix the missing volume model setup * WinMM-DRV: Setup reload on the fly now work! * WinMM-DRV: Stabilize the thing * WinMM-DRV: Stabilizing * WinMM-DRV: Avoid all "setup" in names to avoid a stupid PCA thing: https://stackoverflow.com/questions/17660404/how-to-programmatically-disable-program-compatibility-assistant-in-windows-7-and * A small warning fix at the WOPL module * WinMM-DRV: Fixed some warnings * WinMM-DRV: Avoid PCA dialog on the installer * WiNMM-DRV: Make the linking of pthread being optional Required to use MinGW-w64 toolchain with the "win32" threading mode * WinMM-DRV: Receive the MODM_RESET to reset the MIDI state * WinMM-DRV: Attempt to fix a sound distorsion on song song * WinMM-Drv: Fixed a build on some older MinGW toolchains * WinMM-Drv: Fixed default settings not being loaded
Diffstat (limited to 'utils/adlmidi-2')
-rw-r--r--utils/adlmidi-2/midiplay.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/utils/adlmidi-2/midiplay.cc b/utils/adlmidi-2/midiplay.cc
index 8a39f2f..b8f9551 100644
--- a/utils/adlmidi-2/midiplay.cc
+++ b/utils/adlmidi-2/midiplay.cc
@@ -1154,7 +1154,7 @@ static void SendStereoAudio(unsigned long count, short* samples)
//static unsigned counter = 0; if(++counter < 8000) return;
-#if defined(__WIN32__) && 0
+#if defined(_WIN32) && 0
// Cheat on dosbox recording: easier on the cpu load.
{count*=2;
std::vector<short> AudioBuffer(count);
@@ -1185,7 +1185,7 @@ static void SendStereoAudio(unsigned long count, short* samples)
reverb_data.chan[w].Process(count);
// Convert to signed 16-bit int format and put to playback queue
-#ifdef __WIN32__
+#ifdef _WIN32
std::vector<short> AudioBuffer(count*2);
const size_t pos = 0;
#else
@@ -1299,7 +1299,7 @@ static void SendStereoAudio(unsigned long count, short* samples)
}
}
#endif
-#ifndef __WIN32__
+#ifndef _WIN32
AudioBuffer_lock.Unlock();
#else
if(!WritePCMfile)
@@ -1491,7 +1491,7 @@ bool AdlInstrumentTester::HandleInputChar(char ch)
DoNoteOff();
break;
case 3:
-#if !((!defined(__WIN32__) || defined(__CYGWIN__)) && !defined(__DJGPP__))
+#if !((!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__))
case 27:
#endif
return false;