source/frontend/frontend.cpp

@@ -54,10 +54,6 @@
 #include "locale\textdbase.h"
 #endif
 
-#ifndef	__SOUND_SOUND_H__
-#include "sound\sound.h"
-#endif
-
 #ifndef __DATA_STRUCTS_HEADER__
 #include "Dstructs.h"
 #endif
@@ -147,9 +143,6 @@ void CFrontEndScene::init()
 	m_font=new ("frontendfont") FontBank();
 	m_font->initialise(&standardFont);
 	m_font->setJustification(FontBank::JUST_CENTRE);
-
-	CSoundMediator::setSong(CSoundMediator::SONG_TITLE);
-	CSoundMediator::playSong();
 }
 
 
@@ -168,8 +161,6 @@ void CFrontEndScene::shutdown()
 	{
 		s_modeCodes[i]->shutdown();
 	}
-
-	CSoundMediator::dumpSong();
 }
 
 

source/frontend/maintitl.cpp

@@ -58,6 +58,10 @@
 #include "system\vid.h"
 #endif
 
+#ifndef	__SOUND_SOUND_H__
+#include "sound\sound.h"
+#endif
+
 
 /*	Std Lib
 	------- */
@@ -170,6 +174,9 @@ void CFrontEndMainTitles::select()
 	ASSERT(s_image);
 	SetScreenImage(s_image);
 
+	CSoundMediator::setSong(CSoundMediator::SONG_TITLE);
+	CSoundMediator::playSong();
+	
 	CFader::setFadingIn();
 }
 
@@ -181,6 +188,8 @@ void CFrontEndMainTitles::select()
   ---------------------------------------------------------------------- */
 void CFrontEndMainTitles::unselect()
 {
+	CSoundMediator::dumpSong();
+
 	ClearScreenImage();
 	MemFree(s_image);	s_image=NULL;
 }

source/frontend/maintitl.h

@@ -80,7 +80,7 @@ private:
 
 	enum
 	{
-		DEMO_TIMEOUT_IN_SECONDS=30,
+		DEMO_TIMEOUT_IN_SECONDS=45,
 	};
 	
 	POLY_FT4	*prepareSeaPortionFT4(struct sFrameHdr *_fh,int _x,int _y,int _w,int _h,int _rgb);

source/frontend/options.cpp

@@ -62,6 +62,10 @@
 #include "system\vid.h"
 #endif
 
+#ifndef	__SOUND_SOUND_H__
+#include "sound\sound.h"
+#endif
+
 
 /*	Std Lib
 	------- */
@@ -327,6 +331,9 @@ void CFrontEndOptions::select()
 	m_exitFlag=false;
 	m_closingDown=false;
 
+	CSoundMediator::setSong(CSoundMediator::SONG_OPTIONS);
+	CSoundMediator::playSong();
+	
 	CFader::setFadingIn();
 }
 
@@ -338,6 +345,8 @@ void CFrontEndOptions::select()
   ---------------------------------------------------------------------- */
 void CFrontEndOptions::unselect()
 {
+	CSoundMediator::dumpSong();
+
 	m_modeMenus[m_mode]->unselect();
 }