X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FVideo.hh;h=d640ad2386ce7a4fefa4bdda725fb35485302297;hb=542e50a284c7f5b144a5c97c17f6d89b2af0175c;hp=bb1fdd48db9b168a086be687c6cc2f51fe55a284;hpb=16d1a05b0777e97a45c48e2874aa4e5cc791282e;p=chaz%2Fyoink

diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh
index bb1fdd4..d640ad2 100644
--- a/src/Moof/Video.hh
+++ b/src/Moof/Video.hh
@@ -35,13 +35,18 @@
 
 #include <SDL/SDL.h>
 
+#include <Moof/Exception.hh>
+
 
 namespace Mf {
 
 
-class Video
+class Video;
+typedef boost::shared_ptr<Video> VideoP;
+
+
+struct Video
 {
-public:
 	struct Attributes
 	{
 		// OpenGL attributes
@@ -69,6 +74,27 @@ public:
 		Attributes();
 	};
 
+
+private:
+
+	void init(const Attributes& attribs);
+
+	void recreateContext();
+	void setOpenGLAttributes();
+
+	void setIcon();
+
+	SDL_Surface* context_;
+	unsigned flags_;
+	Attributes attribs_;
+
+public:
+
+	static VideoP alloc(const std::string& caption, const std::string& icon)
+	{
+		return VideoP(new Video(caption, icon));
+	}
+
 	Video();
 	explicit Video(const Attributes& attribs);
 	explicit Video(const std::string& caption, const std::string& icon);
@@ -103,27 +129,18 @@ public:
 	void swap();
 
 
-	struct Exception : public std::runtime_error
+	struct Exception : public Mf::Exception
 	{
-		explicit Exception(const std::string& what_arg) :
-			std::runtime_error(what_arg) {}
-	};
-
-private:
-	void init(const Attributes& attribs);
-
-	void recreateContext();
-	void setOpenGLAttributes();
+		explicit Exception(unsigned error) :
+			Mf::Exception(error) {}
 
-	void setIcon();
-
-	SDL_Surface* context_;
-	unsigned flags_;
-	Attributes attribs_;
+		void raise()
+		{
+			throw *this;
+		}
+	};
 };
 
-typedef boost::shared_ptr<Video> VideoPtr;
-
 
 } // namespace Mf