mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-21 05:29:11 +00:00
Code Issues Activity

(svn r8860) -Cleanup: some style changes, proper #endif comments, variable initialisation, WINCE ifdef and a vsprintf to vsnprintf change.

Browse Source
This commit is contained in:
Darkvater
2007-02-23 12:56:10 +00:00
parent 6d199fcdb7
commit 1bbbbeeef1
15 changed files with 29 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/music/bemidi.h
View File

@@ -7,4 +7,4 @@
extern const HalMusicDriver _bemidi_music_driver;
#endif
#endif /* MUSIC_BEMIDI_H */

3
src/music/dmusic.cpp
View File

@@ -1,9 +1,8 @@
/* $Id$ */
#include "../stdafx.h"
#ifdef WIN32_ENABLE_DIRECTMUSIC_SUPPORT
#include "../stdafx.h"
#include "../debug.h"
#include "../win32.h"
#include "dmusic.h"

2
src/music/extmidi.h
View File

@@ -7,4 +7,4 @@
extern const HalMusicDriver _extmidi_music_driver;
#endif
#endif /* MUSIC_EXTERNAL_H */

1
src/music/null_m.cpp
View File

@@ -1,7 +1,6 @@
/* $Id$ */
#include "../stdafx.h"
#include "../openttd.h"
#include "null_m.h"
static const char* NullMidiStart(const char* const* parm) { return NULL; }

2
src/music/os2_m.h
View File

@@ -7,4 +7,4 @@
extern const HalMusicDriver _os2_music_driver;
#endif
#endif /* MUSIC_OS2_H */

2
src/music/qtmidi.h
View File

@@ -7,4 +7,4 @@
extern const HalMusicDriver _qtime_music_driver;
#endif /* !MUSIC_MACOSX_QUICKTIME_H */
#endif /* MUSIC_MACOSX_QUICKTIME_H */

20
src/music/win32_m.cpp
View File

@@ -1,7 +1,6 @@
/* $Id$ */
#include "../stdafx.h"
#include "../openttd.h"
#include "win32_m.h"
#include <windows.h>
#include <mmsystem.h>
@@ -50,7 +49,7 @@ static MCIERROR CDECL MidiSendCommand(const char* cmd, ...)
char buf[512];
va_start(va, cmd);
vsprintf(buf, cmd, va);
vsnprintf(buf, lengthof(buf), cmd, va);
va_end(va);
return mciSendStringA(buf, NULL, 0, 0);
}
@@ -58,12 +57,9 @@ static MCIERROR CDECL MidiSendCommand(const char* cmd, ...)
static bool MidiIntPlaySong(const char *filename)
{
MidiSendCommand("close all");
if (MidiSendCommand("open \"%s\" type sequencer alias song", filename) != 0)
return false;
if (MidiSendCommand("open \"%s\" type sequencer alias song", filename) != 0) return false;
if (MidiSendCommand("play song from 0") != 0)
return false;
return true;
return MidiSendCommand("play song from 0") == 0;
}
static void MidiIntStopSong(void)
@@ -104,9 +100,7 @@ static DWORD WINAPI MidiThread(LPVOID arg)
s[0] = '\0';
// Delay somewhat in case we don't manage to play.
if (!_midi.playing) {
Sleep(5000);
}
if (!_midi.playing) Sleep(5000);
}
if (_midi.stop_song && _midi.playing) {
@@ -115,8 +109,7 @@ static DWORD WINAPI MidiThread(LPVOID arg)
MidiIntStopSong();
}
if (_midi.playing && !MidiIntIsSongPlaying())
_midi.playing = false;
if (_midi.playing && !MidiIntIsSongPlaying()) _midi.playing = false;
WaitForMultipleObjects(1, &_midi.wait_obj, FALSE, 1000);
} while (!_midi.terminate);
@@ -148,8 +141,7 @@ static const char *Win32MidiStart(const char * const *parm)
}
}
if (CreateThread(NULL, 8192, MidiThread, 0, 0, &threadId) == NULL)
return "Failed to create thread";
if (CreateThread(NULL, 8192, MidiThread, 0, 0, &threadId) == NULL) return "Failed to create thread";
return NULL;
}