(svn r20105) -Revert (r20102) [FS#3938]: resetting DirectMusic completely, although working, causes a temporary freeze of OpenTTD. As MCI behaves better than DirectMusic that has become the default music driver; small delay between songs beats wrongly pitched/bad sounding songs

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 */

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(); }

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(); }