From 160e544a794dfc35e37d3790d606b76c0acb8b0e Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Mon, 11 Apr 2005 19:47:17 +0000
Subject: Improving sound engine (now it loads samples through resource
 manager) and support music fading (still somthing to fix)

---
 src/main.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 8a32f043..b6a3b4fa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -291,11 +291,10 @@ void init_engine()
 
     // initialize sound-engine and start playing intro-theme /-kth5
     try {
-         if (config.getValue("sound", 0) == 1) {
-             SDL_InitSubSystem(SDL_INIT_AUDIO);
-             sound.init(32, 20);
+        if (config.getValue("sound", 0) == 1) {
+            sound.init();
          }
-         sound.setVolume(64);
+         //sound.setVolume(64);
     }
     catch (const char *err) {
         state = ERROR;
@@ -351,7 +350,7 @@ int main(int argc, char *argv[])
         switch (state) {
             case LOGIN:
                 logger.log("State: LOGIN");
-                sound.startBgm("data/music/Ivano(de)Jeanette.ogg");
+                sound.playMusic("data/music/Ivano(de)Jeanette.ogg");
                 /*bgm = resman->getMusic("music/Ivano(de)Jeanette.ogg");
                 bgm->play(-1);*/
                 login();
@@ -365,7 +364,7 @@ int main(int argc, char *argv[])
                 charSelect();
                 break;
             case GAME:
-                sound.stopBgm();
+                sound.fadeOutMusic(3000);
                 //bgm->stop();
                 logger.log("State: GAME");
                 try {
-- 
cgit v1.2.3-70-g09d2