X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMoof%2FVideo.hh;h=91eecb71d092537be39e12015e9fedfa0d13be97;hb=4f62ce947db282f0bbf4d49b3aafb83d7cf51adc;hp=5f56f9e1d33e103ac0bf912b7f6584d0e45b516d;hpb=a4debfe4a5f5d339410788971b698ba00cb7f09c;p=chaz%2Fyoink

diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh
index 5f56f9e..91eecb7 100644
--- a/src/Moof/Video.hh
+++ b/src/Moof/Video.hh
@@ -35,8 +35,6 @@
 
 #include <SDL/SDL.h>
 
-#include <Moof/Exception.hh>
-
 
 namespace Mf {
 
@@ -45,8 +43,10 @@ class Video;
 typedef boost::shared_ptr<Video> VideoP;
 
 
-struct Video
+class Video
 {
+public:
+
 	struct Attributes
 	{
 		// OpenGL attributes
@@ -75,21 +75,6 @@ struct Video
 	};
 
 
-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));
@@ -97,7 +82,7 @@ public:
 
 	Video();
 	explicit Video(const Attributes& attribs);
-	explicit Video(const std::string& caption, const std::string& icon);
+	Video(const std::string& caption, const std::string& icon);
 	~Video();
 
 	void setVideoMode(const long mode[3]);
@@ -109,6 +94,8 @@ public:
 	void setCaption(const std::string& caption);
 	std::string getCaption() const;
 
+	const std::string& getIcon() const;
+
 	void setFull(bool full);
 	void toggleFull();
 	bool isFull() const;
@@ -125,23 +112,25 @@ public:
 	void toggleCursorGrab();
 	bool isCursorGrab() const;
 
-	void makeActive();
 	void swap();
 
 	int getWidth() const;
 	int getHeight() const;
 
+private:
 
-	struct Exception : public Mf::Exception
-	{
-		explicit Exception(unsigned error) :
-			Mf::Exception(error) {}
+	void init(const Attributes& attribs);
 
-		void raise()
-		{
-			throw *this;
-		}
-	};
+	void recreateContext();
+	void setOpenGLAttributes();
+
+	void setIcon();
+
+	// TODO this implementation should be hidden
+
+	SDL_Surface*	mContext;
+	unsigned		mFlags;
+	Attributes		mAttribs;
 };