dispatcher alias methods

[chaz/yoink] / src / YoinkApp.cc

diff --git a/src/YoinkApp.cc b/src/YoinkApp.cc
index 7ec807bdb22de89f4c3a7d461e12b38063afec8d..86816e5295a61d78e6dbb0ae02df255d06b6acc1 100644 (file)
--- a/src/YoinkApp.cc
+++ b/src/YoinkApp.cc
@@ -109,7 +109,7 @@ YoinkApp::YoinkApp(int argc, char* argv[]) :
        music("NightFusion"),
        punchSound("RobotPunch")
 {
        music("NightFusion"),
        punchSound("RobotPunch")
 {

-       Mf::Dispatcher::getInstance().addHandler("video.context_recreated",
+       Mf::dispatcher::addHandler("video.context_recreated",

                        boost::bind(&YoinkApp::contextRecreated, this, _1), this);
        setupGL();
 
                        boost::bind(&YoinkApp::contextRecreated, this, _1), this);
        setupGL();
 


@@ -144,7 +144,7 @@ YoinkApp::~YoinkApp()
        delete font;
        delete testScene;
 
        delete font;
        delete testScene;
 

-       Mf::Dispatcher::getInstance().removeHandler(this);
+       Mf::dispatcher::removeHandler(this);

 }
 
 
 }
 
 


@@ -419,7 +419,7 @@ void YoinkApp::handleEvent(const Mf::Event& event)
                        }
                        else if (event.key.keysym.sym == SDLK_t)
                        {
                        }
                        else if (event.key.keysym.sym == SDLK_t)
                        {

-                               Mf::Dispatcher::getInstance().dispatch("video.context_recreated");
+                               Mf::dispatcher::dispatch("video.context_recreated");

                                break;
                        }
                        else if (event.key.keysym.sym == SDLK_p)
                                break;
                        }
                        else if (event.key.keysym.sym == SDLK_p)