mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r2960) - Fix: [ 1227779 ] Fix win32 midi volume level control which didn't work (glx)

release/0.4.5
Darkvater 2005-09-17 13:15:16 +00:00
parent c930f8f8c0
commit 72ef17dace
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
music/win32_m.c
View File

@ -12,6 +12,7 @@ static struct {
bool playing; bool playing;
int new_vol; int new_vol;
HANDLE wait_obj; HANDLE wait_obj;
uint devid;
char start_song[260]; char start_song[260];
} _midi; } _midi;
@ -72,7 +73,7 @@ static void MidiIntStopSong(void)
static void MidiIntSetVolume(int vol) static void MidiIntSetVolume(int vol)
{ {
uint v = (vol * 65535 / 127); uint v = (vol * 65535 / 127);
midiOutSetVolume((HMIDIOUT)-1, v + (v << 16)); midiOutSetVolume((HMIDIOUT)_midi.devid, v + (v << 16));
} }
static bool MidiIntIsSongPlaying(void) static bool MidiIntIsSongPlaying(void)
@ -125,7 +126,9 @@ static DWORD WINAPI MidiThread(LPVOID arg)
static const char *Win32MidiStart(const char * const *parm) static const char *Win32MidiStart(const char * const *parm)
{ {
MIDIOUTCAPS midicaps;
DWORD threadId; DWORD threadId;
uint dev, nbdev;
char buf[16]; char buf[16];
mciSendStringA("capability sequencer has audio", buf, lengthof(buf), 0); mciSendStringA("capability sequencer has audio", buf, lengthof(buf), 0);
@ -134,6 +137,15 @@ static const char *Win32MidiStart(const char * const *parm)
memset(&_midi, 0, sizeof(_midi)); memset(&_midi, 0, sizeof(_midi));
_midi.new_vol = -1; _midi.new_vol = -1;
/* Get midi device */
_midi.devid = MIDI_MAPPER;
for (dev = 0, nbdev = midiOutGetNumDevs(); dev < nbdev; dev++) {
if (midiOutGetDevCaps(dev, &midicaps, sizeof(midicaps)) == 0 && (midicaps.dwSupport & MIDICAPS_VOLUME)) {
_midi.devid = dev;
break;
}
}
if (CreateThread(NULL, 8192, MidiThread, 0, 0, &threadId) == NULL) if (CreateThread(NULL, 8192, MidiThread, 0, 0, &threadId) == NULL)
return "Failed to create thread"; return "Failed to create thread";