[Scummvm-git-logs] scummvm master -> 574db58b270f8a22cde48a89a5b858b64d7b3cf1

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
574db58b27 ANDROIDSDL: Remove unused graphics manager


Commit: 574db58b270f8a22cde48a89a5b858b64d7b3cf1
    https://github.com/scummvm/scummvm/commit/574db58b270f8a22cde48a89a5b858b64d7b3cf1
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-11-24T22:55:34+02:00

Commit Message:
ANDROIDSDL: Remove unused graphics manager

Changed paths:
  R backends/graphics/androidsdl/androidsdl-graphics.cpp
  R backends/graphics/androidsdl/androidsdl-graphics.h
    backends/module.mk
    backends/platform/androidsdl/androidsdl-sdl.cpp


diff --git a/backends/graphics/androidsdl/androidsdl-graphics.cpp b/backends/graphics/androidsdl/androidsdl-graphics.cpp
deleted file mode 100644
index 23a1a86..0000000
--- a/backends/graphics/androidsdl/androidsdl-graphics.cpp
+++ /dev/null
@@ -1,42 +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.
- *
- */
-
-#include "common/scummsys.h"
-
-#if defined(ANDROIDSDL)
-
-#include "backends/graphics/androidsdl/androidsdl-graphics.h"
-#include "backends/events/androidsdl/androidsdl-events.h"
-#include "common/mutex.h"
-#include "common/textconsole.h"
-#include "graphics/font.h"
-#include "graphics/fontman.h"
-#include "graphics/scaler.h"
-#include "graphics/scaler/aspect.h"
-#include "graphics/scaler/downscaler.h"
-#include "graphics/surface.h"
-
-AndroidSdlGraphicsManager::AndroidSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window)
- : SurfaceSdlGraphicsManager(sdlEventSource, window) {
-}
-
-#endif
diff --git a/backends/graphics/androidsdl/androidsdl-graphics.h b/backends/graphics/androidsdl/androidsdl-graphics.h
deleted file mode 100644
index b7ca7c1..0000000
--- a/backends/graphics/androidsdl/androidsdl-graphics.h
+++ /dev/null
@@ -1,34 +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.
- *
- */
-
-#ifndef BACKENDS_GRAPHICS_SDL_ANDROIDSDL_H
-#define BACKENDS_GRAPHICS_SDL_ANDROIDSDL_H
-
-#include "backends/graphics/surfacesdl/surfacesdl-graphics.h"
-
-class AndroidSdlGraphicsManager : public SurfaceSdlGraphicsManager {
-public:
-	AndroidSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
-
-};
-
-#endif
diff --git a/backends/module.mk b/backends/module.mk
index 394ccb8..9424e0a 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -223,8 +223,7 @@ endif
 
 ifeq ($(BACKEND),androidsdl)
 MODULE_OBJS += \
-	events/androidsdl/androidsdl-events.o \
-	graphics/androidsdl/androidsdl-graphics.o
+	events/androidsdl/androidsdl-events.o
 endif
 
 ifdef AMIGAOS
diff --git a/backends/platform/androidsdl/androidsdl-sdl.cpp b/backends/platform/androidsdl/androidsdl-sdl.cpp
index 93da9d4..91c0cd4 100644
--- a/backends/platform/androidsdl/androidsdl-sdl.cpp
+++ b/backends/platform/androidsdl/androidsdl-sdl.cpp
@@ -26,7 +26,6 @@
 
 #include "backends/platform/androidsdl/androidsdl-sdl.h"
 #include "backends/events/androidsdl/androidsdl-events.h"
-#include "backends/graphics/androidsdl/androidsdl-graphics.h"
 #include <SDL_android.h>
 #include <SDL_screenkeyboard.h>
 
@@ -36,9 +35,6 @@ void OSystem_ANDROIDSDL::initBackend() {
 	if (_eventSource == 0)
 		_eventSource = new AndroidSdlEventSource();
 
-	if (_graphicsManager == 0)
-		_graphicsManager = new AndroidSdlGraphicsManager(_eventSource, _window);
-
 	if (!ConfMan.hasKey("browser_lastpath") || (ConfMan.hasKey("browser_lastpath") && (ConfMan.get("browser_lastpath") == "/storage")))
 		ConfMan.set("browser_lastpath", getenv("SDCARD"));