summaryrefslogtreecommitdiff
path: root/src/music
diff options
context:
space:
mode:
Diffstat (limited to 'src/music')
-rw-r--r--src/music/dmusic.cpp10
-rw-r--r--src/music/extmidi.cpp4
-rw-r--r--src/music/win32_m.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp
index cefb96a55..0c2291a33 100644
--- a/src/music/dmusic.cpp
+++ b/src/music/dmusic.cpp
@@ -21,13 +21,13 @@
static FMusicDriver_DMusic iFMusicDriver_DMusic;
/** the performance object controls manipulation of the segments */
-static IDirectMusicPerformance* performance = NULL;
+static IDirectMusicPerformance *performance = NULL;
/** the loader object can load many types of DMusic related files */
-static IDirectMusicLoader* loader = NULL;
+static IDirectMusicLoader *loader = NULL;
/** the segment object is where the MIDI data is stored for playback */
-static IDirectMusicSegment* segment = NULL;
+static IDirectMusicSegment *segment = NULL;
static bool seeking = false;
@@ -43,7 +43,7 @@ static const char ole_files[] =
#undef M
struct ProcPtrs {
- unsigned long (WINAPI * CoCreateInstance)(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID* ppv);
+ unsigned long (WINAPI * CoCreateInstance)(REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID *ppv);
HRESULT (WINAPI * CoInitialize)(LPVOID pvReserved);
void (WINAPI * CoUninitialize)();
};
@@ -140,7 +140,7 @@ void MusicDriver_DMusic::Stop()
}
-void MusicDriver_DMusic::PlaySong(const char* filename)
+void MusicDriver_DMusic::PlaySong(const char *filename)
{
/* set up the loader object info */
DMUS_OBJECTDESC obj_desc;
diff --git a/src/music/extmidi.cpp b/src/music/extmidi.cpp
index 6179501a6..0e0a427d5 100644
--- a/src/music/extmidi.cpp
+++ b/src/music/extmidi.cpp
@@ -23,7 +23,7 @@
static FMusicDriver_ExtMidi iFMusicDriver_ExtMidi;
-const char* MusicDriver_ExtMidi::Start(const char* const * parm)
+const char *MusicDriver_ExtMidi::Start(const char * const * parm)
{
const char *command = GetDriverParam(parm, "cmd");
if (StrEmpty(command)) command = EXTERNAL_PLAYER;
@@ -41,7 +41,7 @@ void MusicDriver_ExtMidi::Stop()
this->DoStop();
}
-void MusicDriver_ExtMidi::PlaySong(const char* filename)
+void MusicDriver_ExtMidi::PlaySong(const char *filename)
{
strecpy(this->song, filename, lastof(this->song));
this->DoStop();
diff --git a/src/music/win32_m.cpp b/src/music/win32_m.cpp
index c9fc6ece0..4b2bb03fd 100644
--- a/src/music/win32_m.cpp
+++ b/src/music/win32_m.cpp
@@ -49,7 +49,7 @@ void MusicDriver_Win32::SetVolume(byte vol)
SetEvent(_midi.wait_obj);
}
-static MCIERROR CDECL MidiSendCommand(const TCHAR* cmd, ...)
+static MCIERROR CDECL MidiSendCommand(const TCHAR *cmd, ...)
{
va_list va;
TCHAR buf[512];