stop briefing when game starts

src/game/intro.cpp

@@ -436,7 +436,6 @@ global void ShowIntro(const Intro *intro)
     CLclose(file);
 
     CallbackMusicOff();
-    StopMusic();
 #ifdef WITH_SOUND
     PlaySectionMusic(PlaySectionBriefing);
 #endif
@@ -557,15 +556,7 @@ global void ShowIntro(const Intro *intro)
     SetVideoSync();
 
     CallbackMusicOn();
-    StopMusic();
-    // FIXME: should this be GameMusic?
-#ifdef WITH_SOUND
-    if (CDMode == CDModeOff || CDMode == CDModeStopped) {
-	PlayMusic(MenuMusic);
-    } else {
-	CDRomCheck(NULL);
-    }
-#endif
+    FreeOneChannel(soundfree);
 }
 
 /**

src/include/sound_server.h

@@ -307,6 +307,9 @@ extern SoundId RegisterTwoGroups(const SoundId first,const SoundId second);
     /// Modify the range of a given sound.
 extern void SetSoundRange(SoundId sound,unsigned char range);
 
+    /// Free a channel and unregister its source
+extern void FreeOneChannel(int channel);
+
     /// Initialize the sound card.
 extern int InitSound(void);
     /// Initialize the oss compatible sound card.

src/sound/sound_server.cpp

@@ -602,7 +602,7 @@ local Sample* ChooseSample(SoundRequest* sr)
 /*
 ** Free a channel and unregister its source
 */
-local void FreeOneChannel(int channel)
+global void FreeOneChannel(int channel)
 {
     Channels[channel].Command=ChannelFree;
     Channels[channel].Point=NextFreeChannel;