new win32 deps script; using pkgconfig for openal

[chaz/yoink] / src / Moof / Video.hh

diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh
index d20ce4e5ff58c1d2d0af7dcd0611edd6844195ba..8d8e6f3e16a6b4685746e43a64b17e2eae51d0da 100644 (file)
--- a/src/Moof/Video.hh
+++ b/src/Moof/Video.hh
@@ -18,11 +18,11 @@
 #include <SDL/SDL.h>
 
 #include <Moof/Backend.hh>
 #include <SDL/SDL.h>
 
 #include <Moof/Backend.hh>

-#include <Moof/Dispatch.hh>

 
 
 namespace Mf {
 
 
 
 namespace Mf {
 

+

 class Settings;
 
 class Video;
 class Settings;
 
 class Video;


@@ -78,7 +78,7 @@ public:
        ~Video();
 
        void setVideoMode(const int mode[3]);
        ~Video();
 
        void setVideoMode(const int mode[3]);

-       Attributes getAttributes() const;
+       Attributes attributes() const;

 
        void resize(int width, int height);
        bool iconify();
 
        void resize(int width, int height);
        bool iconify();


@@ -109,15 +109,13 @@ public:
        int getWidth() const;
        int getHeight() const;
 
        int getWidth() const;
        int getHeight() const;
 

+       void makeCurrent() const;
+

        static Video* current()
        {
                return gCurrentVideo;
        }
 
        static Video* current()
        {
                return gCurrentVideo;
        }
 

-       void makeCurrent() const;
-
-       void setDispatch(Dispatch& dispatch);
-

 private:
 
        void init();
 private:
 
        void init();


@@ -132,7 +130,6 @@ private:
        SDL_Surface*            mContext;
        unsigned                        mFlags;
        Attributes                      mAttribs;
        SDL_Surface*            mContext;
        unsigned                        mFlags;
        Attributes                      mAttribs;

-       Dispatch&                       mDispatch;

 
        static Video*           gCurrentVideo;
 };
 
        static Video*           gCurrentVideo;
 };