resource loading bugs and new sound class

[chaz/yoink] / src / GameLayer.cc

diff --git a/src/GameLayer.cc b/src/GameLayer.cc
index 2518bdf7971c339739c018f7e8e87835cc6747b6..8299d638211f57db283bd2e74ae7413af070fff1 100644 (file)
--- a/src/GameLayer.cc
+++ b/src/GameLayer.cc
@@ -9,6 +9,8 @@
 *
 **************************************************************************/
 
+#include "config.h"
+
 #include <stdexcept>
 
 #include <moof/log.hh>
@@ -19,10 +21,6 @@
 
 #include "GameLayer.hh"
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 
 void GameLayer::loadSceneLoader()
 {
@@ -82,15 +80,10 @@ void GameLayer::advanceScene(moof::settings& settings)
 GameLayer::GameLayer()
 {
        moof::log_info("about to load sound resource...");
-       music_ = moof::resource::load("sounds/NightFusionIntro.ogg");
-       if (music_)
-       {
-               music_->loop(true);
-               music_->enqueue("NightFusionLoop");
-       }
-       else moof::log_error("music not loaded");
-
-       //music_->position(moof::vector3(10.0, 5.0, 0.0));
+       music_.sample("NightFusionIntro.ogg");
+       music_.loop(true);
+       music_.enqueue("NightFusionLoop.ogg");
+       music_.position(moof::vector3(10.0, 5.0, 0.0));
 
        mThinkTimer.init(boost::bind(&GameLayer::thinkTimer, this),
                        0.1, moof::timer::repeat);
@@ -106,7 +99,7 @@ void GameLayer::did_add_to_view()
 {
        bool isMute = false;
        settings().get("nomusic", isMute);
-       if (!isMute) music_->play();
+       if (!isMute) music_.stream();
 
        loadSceneLoader();
        advanceScene(settings());               // load the first scene
@@ -220,12 +213,12 @@ bool GameLayer::handle_event(const moof::event& event)
                        {
                                state_.heroine->animation.startSequence("Flattened");
                                moof::log_info("thump!");
-                               //mPunchSound.play();
+                               punch_sound_.play();
                                return true;
                        }
                        else if (event.key.keysym.sym == SDLK_m)
                        {
-                               music_->toggle();
+                               music_.toggle();
                                return true;
                        }
                        else if (event.key.keysym.sym == SDLK_PAGEUP)