QTfrontend/SDLs.cpp
changeset 2027 7c051453a487
parent 2026 21c986c528ba
child 2050 8149802b4f14
--- a/QTfrontend/SDLs.cpp	Sun May 03 21:38:56 2009 +0000
+++ b/QTfrontend/SDLs.cpp	Sun May 03 21:39:45 2009 +0000
@@ -26,10 +26,10 @@
 	music = NULL;
 
 	SDL_Init(SDL_INIT_VIDEO);
-//	SDL_Init(SDL_INIT_AUDIO);
-//	Mix_OpenAudio(22050, 0x8010, 2, 512);
-	
-//	Mix_VolumeMusic(33);
+	SDL_Init(SDL_INIT_AUDIO);
+	Mix_OpenAudio(22050, 0x8010, 2, 512);
+  
+	Mix_VolumeMusic(33);
 }
 
 SDLInteraction::~SDLInteraction()
@@ -59,15 +59,13 @@
 }
 void SDLInteraction::StartMusic()
 {
-/*
 	if (!music)
 		music = Mix_LoadMUS(QString(datadir->absolutePath() + "/Music/main theme.ogg").toLocal8Bit().constData());
 
 	Mix_FadeInMusic(music, -1, 3000);
-*/
 }
 
 void SDLInteraction::StopMusic()
 {
-//	Mix_FadeOutMusic(2000);
+	Mix_FadeOutMusic(2000);
 }