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

diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh
index a76dca2..d640ad2 100644
--- a/src/Moof/Video.hh
+++ b/src/Moof/Video.hh
@@ -35,42 +35,69 @@
 
 #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
-		long	colorBuffer[4];	// rgba
-		long	frameBuffer;
-		bool	doubleBuffer;
-		long	depthBuffer;
-		long	stencilBuffer;
-		long	accumBuffer[4];	// rgba
-		bool	stereo;
-		long	multisampleBuffers;
-		long	multisampleSamples;
-		bool	swapControl;
-		bool	hardwareonly;
+		long		colorBuffer[4];	// rgba
+		long		frameBuffer;
+		bool		doubleBuffer;
+		long		depthBuffer;
+		long		stencilBuffer;
+		long		accumBuffer[4];	// rgba
+		bool		stereo;
+		long		multisampleBuffers;
+		long		multisampleSamples;
+		bool		swapControl;
+		bool		hardwareonly;
 
 		// Window attributes
-		long	mode[3];		// width, height, bpp
-		bool	fullscreen;
-		bool	resizable;
-		bool	cursorVisible;
-		bool	cursorGrab;
+		std::string	caption;
+		std::string	icon;
+		long		mode[3];		// width, height, bpp
+		bool		fullscreen;
+		bool		resizable;
+		bool		cursorVisible;
+		bool		cursorGrab;
 
 		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();
-	Video(const Attributes& attribs);
-	Video(const Attributes& attribs, const std::string& caption);
-	Video(const std::string& caption);
+	explicit Video(const Attributes& attribs);
+	explicit Video(const std::string& caption, const std::string& icon);
 	~Video();
 
 	void setVideoMode(const long mode[3]);
@@ -102,24 +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) {}
-	};
+		explicit Exception(unsigned error) :
+			Mf::Exception(error) {}
 
-private:
-	void init(const Attributes& attribs, const std::string& caption);
-	void recreateContext();
-	void setOpenGLAttributes();
-
-	SDL_Surface* context_;
-	unsigned flags_;
-	Attributes attribs_;
+		void raise()
+		{
+			throw *this;
+		}
+	};
 };
 
-typedef boost::shared_ptr<Video> VideoPtr;
-
 
 } // namespace Mf