X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FVideo.hh;h=736832f09d0277edb4da88e1a393e327dd934d63;hb=bffc879fc8ee8167bb123310d39fad4e2f426ffd;hp=4be691dcf62ec0af20c06abf9bab6cdd58ff4ee0;hpb=fdfba4553433b9b2804c2772c7645211b828c2ea;p=chaz%2Fyoink

diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh
index 4be691d..736832f 100644
--- a/src/Moof/Video.hh
+++ b/src/Moof/Video.hh
@@ -35,6 +35,8 @@
 
 #include <SDL/SDL.h>
 
+#include <Moof/Exception.hh>
+
 
 namespace Mf {
 
@@ -43,8 +45,10 @@ class Video;
 typedef boost::shared_ptr<Video> VideoP;
 
 
-struct Video
+class Video
 {
+public:
+
 	struct Attributes
 	{
 		// OpenGL attributes
@@ -73,23 +77,7 @@ struct Video
 	};
 
 
-private:
-
-	void init(const Attributes& attribs);
-
-	void recreateContext();
-	void setOpenGLAttributes();
-
-	void setIcon();
-
-	SDL_Surface* context_;
-	unsigned flags_;
-	Attributes attribs_;
-
-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,12 +115,35 @@ 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;
+		}
 	};
+
+private:
+
+	void init(const Attributes& attribs);
+
+	void recreateContext();
+	void setOpenGLAttributes();
+
+	void setIcon();
+
+	// TODO this implementation should be hidden
+
+	SDL_Surface*	mContext;
+	unsigned		mFlags;
+	Attributes		mAttribs;
 };