summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/music/dmusic.cpp4
-rw-r--r--src/music/dmusic.h2
-rw-r--r--src/music/win32_m.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/music/dmusic.cpp b/src/music/dmusic.cpp
index 21eb47b44..cb255e7c0 100644
--- a/src/music/dmusic.cpp
+++ b/src/music/dmusic.cpp
@@ -165,8 +165,8 @@ void MusicDriver_DMusic::PlaySong(const char *filename)
/* release the existing segment if we have any */
if (segment != NULL) {
- this->Stop();
- if (this->Start(NULL) != NULL) return;
+ segment->Release();
+ segment = NULL;
}
/* make a new segment */
diff --git a/src/music/dmusic.h b/src/music/dmusic.h
index 74368de23..ed2dcabf1 100644
--- a/src/music/dmusic.h
+++ b/src/music/dmusic.h
@@ -32,7 +32,7 @@ public:
class FMusicDriver_DMusic: public MusicDriverFactory<FMusicDriver_DMusic> {
public:
- static const int priority = 10;
+ static const int priority = 5;
/* virtual */ const char *GetName() { return "dmusic"; }
/* virtual */ const char *GetDescription() { return "DirectMusic MIDI Driver"; }
/* virtual */ Driver *CreateInstance() { return new MusicDriver_DMusic(); }
diff --git a/src/music/win32_m.h b/src/music/win32_m.h
index d596d3a9f..2e991bd9f 100644
--- a/src/music/win32_m.h
+++ b/src/music/win32_m.h
@@ -32,7 +32,7 @@ public:
class FMusicDriver_Win32: public MusicDriverFactory<FMusicDriver_Win32> {
public:
- static const int priority = 5;
+ static const int priority = 10;
/* virtual */ const char *GetName() { return "win32"; }
/* virtual */ const char *GetDescription() { return "Win32 Music Driver"; }
/* virtual */ Driver *CreateInstance() { return new MusicDriver_Win32(); }