library class revamped as manager, goodbye tilemap

[chaz/yoink] / src / Moof / Video.hh

diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh
index 91eecb71d092537be39e12015e9fedfa0d13be97..0cc1a4e66687c8c33ea7c7a8d7ea89e983142c20 100644 (file)
--- 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=8 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_
@@ -35,6 +18,8 @@
 
 #include <SDL/SDL.h>
 
+#include <Moof/Core.hh>
+
 
 namespace Mf {
 
@@ -60,7 +45,7 @@ public:
                long            multisampleBuffers;
                long            multisampleSamples;
                bool            swapControl;
-               bool            hardwareonly;
+               bool            hardwareOnly;
 
                // Window attributes
                std::string     caption;
@@ -72,10 +57,16 @@ public:
                bool            cursorGrab;
 
                Attributes();
+
+       private:
+
+               Backend         mBackend;
+
        };
 
 
-       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));
        }
@@ -119,7 +110,7 @@ public:
 
 private:
 
-       void init(const Attributes& attribs);
+       void init();
 
        void recreateContext();
        void setOpenGLAttributes();
@@ -134,9 +125,10 @@ private:
 };
 
 
+extern Video* video;
+
+
 } // namespace Mf
 
 #endif // _MOOF_VIDEO_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-