more featureful sound class

[chaz/yoink] / src / YoinkApp.hh

diff --git a/src/YoinkApp.hh b/src/YoinkApp.hh
index 65e730bccbeca19729edd2ae8a3330b5b1086280..ad8d694e62619aee1c947e50f901e864310db95d 100644 (file)
--- a/src/YoinkApp.hh
+++ b/src/YoinkApp.hh
@@ -69,8 +69,7 @@ private:
        void setupGL();
        void contextRecreated(const Mf::Notification* note);
 
-       Mf::Lerps musicFade;
-       Mf::SoundStream music;
+       Mf::Sound music;
 
        CharacterP heroine;
        Mf::Sound punchSound;
@@ -80,10 +79,7 @@ private:
        Mf::Lerps fadeIn;
 
        Mf::Camera camera;
-       Mf::Scene* testScene;
-
-       Mf::Scalar state;
-       Mf::Scalar prevstate;
+       Mf::SceneP testScene;
 
        Hud hud;
 };