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

[aquadran at users.sourceforge.net]

Revision: 45940
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45940&view=rev
Author:   aquadran
Date:     2009-11-16 21:27:09 +0000 (Mon, 16 Nov 2009)

Log Message:
-----------
samsungtv: no need workaround to subclasses, alternate sdl static library works fine

Modified Paths:
--------------
    scummvm/trunk/backends/platform/samsungtv/events.cpp
    scummvm/trunk/backends/platform/samsungtv/graphics.cpp
    scummvm/trunk/backends/platform/samsungtv/samsungtv.h

Modified: scummvm/trunk/backends/platform/samsungtv/events.cpp
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/events.cpp	2009-11-16 21:13:21 UTC (rev 45939)
+++ scummvm/trunk/backends/platform/samsungtv/events.cpp	2009-11-16 21:27:09 UTC (rev 45940)
@@ -29,104 +29,6 @@
 
 #if defined(SAMSUNGTV)
 
-void OSystem_SDL_SamsungTV::generateMouseMoveEvent(int x, int y) {
-	SDL_Event event;
-	memset(&event, 0, sizeof(event));
-	event.type = SDL_MOUSEMOTION;
-	event.motion.x = x;
-	event.motion.y = y;
-	SDL_PushEvent(&event);
-}
-
-void OSystem_SDL_SamsungTV::handleKbdMouse() {
-	uint32 curTime = getMillis();
-	if (curTime >= _km.last_time + _km.delay_time) {
-		_km.last_time = curTime;
-		if (_km.x_down_count == 1) {
-			_km.x_down_time = curTime;
-			_km.x_down_count = 2;
-		}
-		if (_km.y_down_count == 1) {
-			_km.y_down_time = curTime;
-			_km.y_down_count = 2;
-		}
-
-		if (_km.x_vel || _km.y_vel) {
-			if (_km.x_down_count) {
-				if (curTime > _km.x_down_time + _km.delay_time * 12) {
-					if (_km.x_vel > 0)
-						_km.x_vel++;
-					else
-						_km.x_vel--;
-				} else if (curTime > _km.x_down_time + _km.delay_time * 8) {
-					if (_km.x_vel > 0)
-						_km.x_vel = 5;
-					else
-						_km.x_vel = -5;
-				}
-			}
-			if (_km.y_down_count) {
-				if (curTime > _km.y_down_time + _km.delay_time * 12) {
-					if (_km.y_vel > 0)
-						_km.y_vel++;
-					else
-						_km.y_vel--;
-				} else if (curTime > _km.y_down_time + _km.delay_time * 8) {
-					if (_km.y_vel > 0)
-						_km.y_vel = 5;
-					else
-						_km.y_vel = -5;
-				}
-			}
-
-			_km.x += _km.x_vel;
-			_km.y += _km.y_vel;
-
-			if (_km.x < 0) {
-				_km.x = 0;
-				_km.x_vel = -1;
-				_km.x_down_count = 1;
-			} else if (_km.x > _km.x_max) {
-				_km.x = _km.x_max;
-				_km.x_vel = 1;
-				_km.x_down_count = 1;
-			}
-
-			if (_km.y < 0) {
-				_km.y = 0;
-				_km.y_vel = -1;
-				_km.y_down_count = 1;
-			} else if (_km.y > _km.y_max) {
-				_km.y = _km.y_max;
-				_km.y_vel = 1;
-				_km.y_down_count = 1;
-			}
-
-			generateMouseMoveEvent(_km.x, _km.y);
-		}
-	}
-}
-
-bool OSystem_SDL_SamsungTV::pollEvent(Common::Event &event) {
-	SDL_Event ev;
-
-	handleKbdMouse();
-
-	// If the screen mode changed, send an Common::EVENT_SCREEN_CHANGED
-	if (_modeChanged) {
-		_modeChanged = false;
-		event.type = Common::EVENT_SCREEN_CHANGED;
-		return true;
-	}
-
-	while (SDL_PollEvent(&ev)) {
-		preprocessEvents(&ev);
-		if (dispatchSDLEvent(ev, event))
-			return true;
-	}
-	return false;
-}
-
 bool OSystem_SDL_SamsungTV::remapKey(SDL_Event &ev, Common::Event &event) {
 	switch (ev.type) {
 		case SDL_KEYDOWN:{

Modified: scummvm/trunk/backends/platform/samsungtv/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/graphics.cpp	2009-11-16 21:13:21 UTC (rev 45939)
+++ scummvm/trunk/backends/platform/samsungtv/graphics.cpp	2009-11-16 21:27:09 UTC (rev 45940)
@@ -66,20 +66,4 @@
 	SDL_UpdateRect(_realhwscreen, 0, 0, 0, 0);
 }
 
-void OSystem_SDL_SamsungTV::warpMouse(int x, int y) {
-	int y1 = y;
-
-	if (_videoMode.aspectRatioCorrection && !_overlayVisible)
-		y1 = real2Aspect(y);
-
-	if (_mouseCurState.x != x || _mouseCurState.y != y) {
-		if (!_overlayVisible)
-			generateMouseMoveEvent(x * _videoMode.scaleFactor, y1 * _videoMode.scaleFactor);
-		else
-			generateMouseMoveEvent(x, y1);
-
-		setMousePos(x, y);
-	}
-}
-
 #endif

Modified: scummvm/trunk/backends/platform/samsungtv/samsungtv.h
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/samsungtv.h	2009-11-16 21:13:21 UTC (rev 45939)
+++ scummvm/trunk/backends/platform/samsungtv/samsungtv.h	2009-11-16 21:27:09 UTC (rev 45940)
@@ -41,10 +41,6 @@
 public:
 	OSystem_SDL_SamsungTV();
 
-	virtual void warpMouse(int x, int y);
-
-	virtual bool pollEvent(Common::Event &event);
-
 	virtual bool hasFeature(Feature f);
 	virtual void setFeatureState(Feature f, bool enable);
 	virtual bool getFeatureState(Feature f);
@@ -59,9 +55,6 @@
 	virtual void unloadGFXMode();
 	virtual bool hotswapGFXMode();
 
-	void handleKbdMouse();
-	void generateMouseMoveEvent(int x, int y);
-
 	virtual bool remapKey(SDL_Event &ev, Common::Event &event);
 };
 


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