X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FVideo.hh;h=8d8e6f3e16a6b4685746e43a64b17e2eae51d0da;hp=0199bc51dc43e3a38508fae9da2d81149b4a7ac0;hb=321f005b45580b8c2c14ddc577fb6ca7780a68c5;hpb=987971a961454d97082c6448fdc0bbeb540281bb

diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh
index 0199bc5..8d8e6f3 100644
--- a/src/Moof/Video.hh
+++ b/src/Moof/Video.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_VIDEO_HH_
 #define _MOOF_VIDEO_HH_
@@ -32,15 +15,16 @@
 #include <string>
 
 #include <boost/shared_ptr.hpp>
-
 #include <SDL/SDL.h>
 
-#include <Moof/Core.hh>
+#include <Moof/Backend.hh>
 
 
 namespace Mf {
 
 
+class Settings;
+
 class Video;
 typedef boost::shared_ptr<Video> VideoP;
 
@@ -52,47 +36,49 @@ public:
 	struct Attributes
 	{
 		// OpenGL attributes
-		long		colorBuffer[4];	// rgba
-		long		frameBuffer;
+		int			colorBuffer[4];	// rgba
+		int			frameBuffer;
 		bool		doubleBuffer;
-		long		depthBuffer;
-		long		stencilBuffer;
-		long		accumBuffer[4];	// rgba
+		int			depthBuffer;
+		int			stencilBuffer;
+		int			accumBuffer[4];	// rgba
 		bool		stereo;
-		long		multisampleBuffers;
-		long		multisampleSamples;
+		int			multisampleBuffers;
+		int			multisampleSamples;
 		bool		swapControl;
-		bool		hardwareonly;
+		bool		hardwareOnly;
 
 		// Window attributes
 		std::string	caption;
 		std::string	icon;
-		long		mode[3];		// width, height, bpp
+		int			mode[3];		// width, height, bpp
 		bool		fullscreen;
 		bool		resizable;
 		bool		cursorVisible;
 		bool		cursorGrab;
 
 		Attributes();
+		Attributes(const Settings& settings);
 
 	private:
 
-		Backend		backend;
+		void init();
+
+		Backend		mBackend;
 	};
 
 
-	static VideoP alloc(const std::string& caption, const std::string& icon)
+	static VideoP alloc(const Attributes& attribs)
 	{
-		return VideoP(new Video(caption, icon));
+		return VideoP(new Video(attribs));
 	}
 
 	Video();
 	explicit Video(const Attributes& attribs);
-	Video(const std::string& caption, const std::string& icon);
 	~Video();
 
-	void setVideoMode(const long mode[3]);
-	Attributes getAttributes() const;
+	void setVideoMode(const int mode[3]);
+	Attributes attributes() const;
 
 	void resize(int width, int height);
 	bool iconify();
@@ -123,9 +109,16 @@ public:
 	int getWidth() const;
 	int getHeight() const;
 
+	void makeCurrent() const;
+
+	static Video* current()
+	{
+		return gCurrentVideo;
+	}
+
 private:
 
-	void init(const Attributes& attribs);
+	void init();
 
 	void recreateContext();
 	void setOpenGLAttributes();
@@ -134,18 +127,15 @@ private:
 
 	// TODO this implementation should be hidden
 
-	SDL_Surface*	mContext;
-	unsigned		mFlags;
-	Attributes		mAttribs;
-};
-
+	SDL_Surface*		mContext;
+	unsigned			mFlags;
+	Attributes			mAttribs;
 
-extern Video* video;
+	static Video*		gCurrentVideo;
+};
 
 
 } // namespace Mf
 
 #endif // _MOOF_VIDEO_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-