fixed layer bugs; generalized octree

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

diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh
index 4be691dcf62ec0af20c06abf9bab6cdd58ff4ee0..5f56f9e1d33e103ac0bf912b7f6584d0e45b516d 100644 (file)
--- a/src/Moof/Video.hh
+++ b/src/Moof/Video.hh
@@ -35,6 +35,8 @@
 
 #include <SDL/SDL.h>
 
+#include <Moof/Exception.hh>
+
 
 namespace Mf {
 
@@ -88,8 +90,7 @@ private:
 
 public:
 
-       inline static VideoP alloc(const std::string& caption,
-                       const std::string& icon)
+       static VideoP alloc(const std::string& caption, const std::string& icon)
        {
                return VideoP(new Video(caption, icon));
        }
@@ -127,11 +128,19 @@ public:
        void makeActive();
        void swap();
 
+       int getWidth() const;
+       int getHeight() const;
+
 
-       struct Exception : public std::runtime_error
+       struct Exception : public Mf::Exception
        {
-               explicit Exception(const std::string& what_arg) :
-                       std::runtime_error(what_arg) {}
+               explicit Exception(unsigned error) :
+                       Mf::Exception(error) {}
+
+               void raise()
+               {
+                       throw *this;
+               }
        };
 };