[Scummvm-cvs-logs] SF.net SVN: scummvm:[45878] scummvm/trunk/backends/platform/samsungtv

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Fri Nov 13 01:37:53 CET 2009


Revision: 45878
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45878&view=rev
Author:   aquadran
Date:     2009-11-13 00:37:53 +0000 (Fri, 13 Nov 2009)

Log Message:
-----------
rename sdl.*->samsungtv.*

Added Paths:
-----------
    scummvm/trunk/backends/platform/samsungtv/samsungtv.cpp
    scummvm/trunk/backends/platform/samsungtv/samsungtv.h

Removed Paths:
-------------
    scummvm/trunk/backends/platform/samsungtv/sdl.cpp
    scummvm/trunk/backends/platform/samsungtv/sdl.h

Copied: scummvm/trunk/backends/platform/samsungtv/samsungtv.cpp (from rev 45877, scummvm/trunk/backends/platform/samsungtv/sdl.cpp)
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/samsungtv.cpp	                        (rev 0)
+++ scummvm/trunk/backends/platform/samsungtv/samsungtv.cpp	2009-11-13 00:37:53 UTC (rev 45878)
@@ -0,0 +1,70 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/sdl/sdl.cpp $
+ * $Id: sdl.cpp 44793 2009-10-08 19:41:38Z fingolfin $
+ *
+ */
+
+#include "backends/platform/samsungtv/sdl.h"
+#include "backends/fs/posix/posix-fs-factory.h"
+
+#if defined(SAMSUNGTV)
+
+OSystem_SDL_SamsungTV::OSystem_SDL_SamsungTV() : OSystem_SDL(),
+	_prehwscreen(0) {
+}
+
+bool OSystem_SDL_SamsungTV::hasFeature(Feature f) {
+	return
+		(f == kFeatureAutoComputeDirtyRects) ||
+		(f == kFeatureCursorHasPalette);
+}
+
+void OSystem_SDL_SamsungTV::setFeatureState(Feature f, bool enable) {
+	switch (f) {
+	case kFeatureAspectRatioCorrection:
+		setAspectRatioCorrection(enable);
+		break;
+	case kFeatureAutoComputeDirtyRects:
+		if (enable)
+			_modeFlags |= DF_WANT_RECT_OPTIM;
+		else
+			_modeFlags &= ~DF_WANT_RECT_OPTIM;
+		break;
+	default:
+		break;
+	}
+}
+
+bool OSystem_SDL_SamsungTV::getFeatureState(Feature f) {
+	assert (_transactionMode == kTransactionNone);
+
+	switch (f) {
+	case kFeatureAspectRatioCorrection:
+		return _videoMode.aspectRatioCorrection;
+	case kFeatureAutoComputeDirtyRects:
+		return _modeFlags & DF_WANT_RECT_OPTIM;
+	default:
+		return false;
+	}
+}
+
+#endif

Copied: scummvm/trunk/backends/platform/samsungtv/samsungtv.h (from rev 45877, scummvm/trunk/backends/platform/samsungtv/sdl.h)
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/samsungtv.h	                        (rev 0)
+++ scummvm/trunk/backends/platform/samsungtv/samsungtv.h	2009-11-13 00:37:53 UTC (rev 45878)
@@ -0,0 +1,84 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/sdl/sdl.h $
+ * $Id: sdl.h 44793 2009-10-08 19:41:38Z fingolfin $
+ *
+ */
+
+#ifndef SDL_SAMSUNGTV_COMMON_H
+#define SDL_SAMSUNGTV_COMMON_H
+
+#include <SDL.h>
+
+#include "backends/base-backend.h"
+#include "backends/platform/sdl/sdl.h"
+
+#if defined(SAMSUNGTV)
+
+namespace Audio {
+	class MixerImpl;
+}
+
+class OSystem_SDL_SamsungTV : public OSystem_SDL {
+public:
+	OSystem_SDL_SamsungTV();
+
+	// Highest supported
+	virtual Common::List<Graphics::PixelFormat> getSupportedFormats();
+
+	// Warp the mouse cursor. Where set_mouse_pos() only informs the
+	// backend of the mouse cursor's current position, this function
+	// actually moves the cursor to the specified position.
+	virtual void warpMouse(int x, int y);
+
+	// Set the bitmap that's used when drawing the cursor.
+	virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format); // overloaded by CE backend (FIXME)
+
+	// Get the next event.
+	// Returns true if an event was retrieved.
+	virtual bool pollEvent(Common::Event &event);
+
+	virtual bool hasFeature(Feature f);
+	virtual void setFeatureState(Feature f, bool enable);
+	virtual bool getFeatureState(Feature f);
+
+protected:
+
+	SDL_Surface *_prehwscreen;
+
+	virtual void drawMouse(); // overloaded by CE backend
+	virtual void blitCursor(); // overloaded by CE backend (FIXME)
+
+	virtual void internUpdateScreen(); // overloaded by CE backend
+
+	virtual bool loadGFXMode(); // overloaded by CE backend
+	virtual void unloadGFXMode(); // overloaded by CE backend
+	virtual bool hotswapGFXMode(); // overloaded by CE backend
+
+	void handleKbdMouse();
+	void generateMouseMoveEvent(int x, int y);
+
+	virtual bool remapKey(SDL_Event &ev, Common::Event &event);
+};
+
+#endif
+
+#endif

Deleted: scummvm/trunk/backends/platform/samsungtv/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/sdl.cpp	2009-11-13 00:31:36 UTC (rev 45877)
+++ scummvm/trunk/backends/platform/samsungtv/sdl.cpp	2009-11-13 00:37:53 UTC (rev 45878)
@@ -1,70 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/sdl/sdl.cpp $
- * $Id: sdl.cpp 44793 2009-10-08 19:41:38Z fingolfin $
- *
- */
-
-#include "backends/platform/samsungtv/sdl.h"
-#include "backends/fs/posix/posix-fs-factory.h"
-
-#if defined(SAMSUNGTV)
-
-OSystem_SDL_SamsungTV::OSystem_SDL_SamsungTV() : OSystem_SDL(),
-	_prehwscreen(0) {
-}
-
-bool OSystem_SDL_SamsungTV::hasFeature(Feature f) {
-	return
-		(f == kFeatureAutoComputeDirtyRects) ||
-		(f == kFeatureCursorHasPalette);
-}
-
-void OSystem_SDL_SamsungTV::setFeatureState(Feature f, bool enable) {
-	switch (f) {
-	case kFeatureAspectRatioCorrection:
-		setAspectRatioCorrection(enable);
-		break;
-	case kFeatureAutoComputeDirtyRects:
-		if (enable)
-			_modeFlags |= DF_WANT_RECT_OPTIM;
-		else
-			_modeFlags &= ~DF_WANT_RECT_OPTIM;
-		break;
-	default:
-		break;
-	}
-}
-
-bool OSystem_SDL_SamsungTV::getFeatureState(Feature f) {
-	assert (_transactionMode == kTransactionNone);
-
-	switch (f) {
-	case kFeatureAspectRatioCorrection:
-		return _videoMode.aspectRatioCorrection;
-	case kFeatureAutoComputeDirtyRects:
-		return _modeFlags & DF_WANT_RECT_OPTIM;
-	default:
-		return false;
-	}
-}
-
-#endif

Deleted: scummvm/trunk/backends/platform/samsungtv/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/sdl.h	2009-11-13 00:31:36 UTC (rev 45877)
+++ scummvm/trunk/backends/platform/samsungtv/sdl.h	2009-11-13 00:37:53 UTC (rev 45878)
@@ -1,84 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/backends/platform/sdl/sdl.h $
- * $Id: sdl.h 44793 2009-10-08 19:41:38Z fingolfin $
- *
- */
-
-#ifndef SDL_SAMSUNGTV_COMMON_H
-#define SDL_SAMSUNGTV_COMMON_H
-
-#include <SDL.h>
-
-#include "backends/base-backend.h"
-#include "backends/platform/sdl/sdl.h"
-
-#if defined(SAMSUNGTV)
-
-namespace Audio {
-	class MixerImpl;
-}
-
-class OSystem_SDL_SamsungTV : public OSystem_SDL {
-public:
-	OSystem_SDL_SamsungTV();
-
-	// Highest supported
-	virtual Common::List<Graphics::PixelFormat> getSupportedFormats();
-
-	// Warp the mouse cursor. Where set_mouse_pos() only informs the
-	// backend of the mouse cursor's current position, this function
-	// actually moves the cursor to the specified position.
-	virtual void warpMouse(int x, int y);
-
-	// Set the bitmap that's used when drawing the cursor.
-	virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format); // overloaded by CE backend (FIXME)
-
-	// Get the next event.
-	// Returns true if an event was retrieved.
-	virtual bool pollEvent(Common::Event &event);
-
-	virtual bool hasFeature(Feature f);
-	virtual void setFeatureState(Feature f, bool enable);
-	virtual bool getFeatureState(Feature f);
-
-protected:
-
-	SDL_Surface *_prehwscreen;
-
-	virtual void drawMouse(); // overloaded by CE backend
-	virtual void blitCursor(); // overloaded by CE backend (FIXME)
-
-	virtual void internUpdateScreen(); // overloaded by CE backend
-
-	virtual bool loadGFXMode(); // overloaded by CE backend
-	virtual void unloadGFXMode(); // overloaded by CE backend
-	virtual bool hotswapGFXMode(); // overloaded by CE backend
-
-	void handleKbdMouse();
-	void generateMouseMoveEvent(int x, int y);
-
-	virtual bool remapKey(SDL_Event &ev, Common::Event &event);
-};
-
-#endif
-
-#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list