gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-07 06:39:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r11029) -Fix [FS#1164]: win32 midi doesn't stop when closing openttd

Browse Source
This commit is contained in:
glx 2007-08-31 23:29:53 +00:00
parent 79fedd37be
commit 1f7f4f6f62
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/music/win32_m.cpp
View File

@ -11,6 +11,7 @@ static struct {
bool playing; bool playing;
int new_vol; int new_vol;
HANDLE wait_obj; HANDLE wait_obj;
HANDLE thread;
UINT_PTR devid; UINT_PTR devid;
char start_song[260]; char start_song[260];
} _midi; } _midi;
@ -84,8 +85,6 @@ static bool MidiIntIsSongPlaying()
static DWORD WINAPI MidiThread(LPVOID arg) static DWORD WINAPI MidiThread(LPVOID arg)
{ {
_midi.wait_obj = CreateEvent(NULL, FALSE, FALSE, NULL);
do { do {
char *s; char *s;
int vol; int vol;
@ -102,7 +101,7 @@ static DWORD WINAPI MidiThread(LPVOID arg)
s[0] = '\0'; s[0] = '\0';
// Delay somewhat in case we don't manage to play. // Delay somewhat in case we don't manage to play.
if (!_midi.playing) Sleep(5000); if (!_midi.playing) WaitForMultipleObjects(1, &_midi.wait_obj, FALSE, 5000);
} }
if (_midi.stop_song && _midi.playing) { if (_midi.stop_song && _midi.playing) {
@ -116,14 +115,13 @@ static DWORD WINAPI MidiThread(LPVOID arg)
WaitForMultipleObjects(1, &_midi.wait_obj, FALSE, 1000); WaitForMultipleObjects(1, &_midi.wait_obj, FALSE, 1000);
} while (!_midi.terminate); } while (!_midi.terminate);
DeleteObject(_midi.wait_obj); MidiIntStopSong();
return 0; return 0;
} }
const char *MusicDriver_Win32::Start(const char * const *parm) const char *MusicDriver_Win32::Start(const char * const *parm)
{ {
MIDIOUTCAPS midicaps; MIDIOUTCAPS midicaps;
DWORD threadId;
UINT nbdev; UINT nbdev;
UINT_PTR dev; UINT_PTR dev;
char buf[16]; char buf[16];
@ -143,7 +141,8 @@ const char *MusicDriver_Win32::Start(const char * const *parm)
} }
} }
if (CreateThread(NULL, 8192, MidiThread, 0, 0, &threadId) == NULL) return "Failed to create thread"; if (NULL == (_midi.wait_obj = CreateEvent(NULL, FALSE, FALSE, NULL))) return "Failed to create event";
if (NULL == (_midi.thread = CreateThread(NULL, 8192, MidiThread, 0, 0, NULL))) return "Failed to create thread";
return NULL; return NULL;
} }
@ -152,4 +151,7 @@ void MusicDriver_Win32::Stop()
{ {
_midi.terminate = true; _midi.terminate = true;
SetEvent(_midi.wait_obj); SetEvent(_midi.wait_obj);
WaitForMultipleObjects(1, &_midi.thread, true, INFINITE);
CloseHandle(_midi.wait_obj);
CloseHandle(_midi.thread);
} }