summaryrefslogtreecommitdiff
path: root/src/music
diff options
context:
space:
mode:
Diffstat (limited to 'src/music')
-rw-r--r--src/music/bemidi.cpp2
-rw-r--r--src/music/qtmidi.cpp16
-rw-r--r--src/music/win32_m.cpp2
3 files changed, 10 insertions, 10 deletions
diff --git a/src/music/bemidi.cpp b/src/music/bemidi.cpp
index 41bd4ee4f..cb32fb4a0 100644
--- a/src/music/bemidi.cpp
+++ b/src/music/bemidi.cpp
@@ -6,7 +6,7 @@
#include "../openttd.h"
#include "bemidi.h"
-// BeOS System Includes
+/* BeOS System Includes */
#include <MidiSynthFile.h>
static BMidiSynthFile midiSynthFile;
diff --git a/src/music/qtmidi.cpp b/src/music/qtmidi.cpp
index 2e4892285..074963992 100644
--- a/src/music/qtmidi.cpp
+++ b/src/music/qtmidi.cpp
@@ -46,14 +46,14 @@
#include <unistd.h>
#include <fcntl.h>
-// we need to include debug.h after CoreServices because defining DEBUG will break CoreServices in OSX 10.2
+/* we need to include debug.h after CoreServices because defining DEBUG will break CoreServices in OSX 10.2 */
#include "../debug.h"
static FMusicDriver_QtMidi iFMusicDriver_QtMidi;
enum {
- midiType = 'Midi' /**< OSType code for MIDI songs. */
+ midiType = 'Midi' ///< OSType code for MIDI songs.
};
@@ -172,15 +172,15 @@ static void InitQuickTimeIfNeeded()
/** Possible states of the QuickTime music driver. */
enum {
- QT_STATE_IDLE, /**< No file loaded. */
- QT_STATE_PLAY, /**< File loaded, playing. */
- QT_STATE_STOP, /**< File loaded, stopped. */
+ QT_STATE_IDLE, ///< No file loaded.
+ QT_STATE_PLAY, ///< File loaded, playing.
+ QT_STATE_STOP, ///< File loaded, stopped.
};
-static Movie _quicktime_movie; /**< Current QuickTime @c Movie. */
-static byte _quicktime_volume = 127; /**< Current volume. */
-static int _quicktime_state = QT_STATE_IDLE; /**< Current player state. */
+static Movie _quicktime_movie; ///< Current QuickTime @c Movie.
+static byte _quicktime_volume = 127; ///< Current volume.
+static int _quicktime_state = QT_STATE_IDLE; ///< Current player state.
/**
diff --git a/src/music/win32_m.cpp b/src/music/win32_m.cpp
index 4b2bb03fd..abcbffd27 100644
--- a/src/music/win32_m.cpp
+++ b/src/music/win32_m.cpp
@@ -109,7 +109,7 @@ static DWORD WINAPI MidiThread(LPVOID arg)
_midi.playing = MidiIntPlaySong(s);
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) WaitForMultipleObjects(1, &_midi.wait_obj, FALSE, 5000);
}