diff options
author | Cameron Cawley | 2019-07-26 20:05:24 +0100 |
---|---|---|
committer | Filippos Karapetis | 2019-07-27 07:23:09 +0300 |
commit | 8e8594aa0ed7803b66acc500dbf114dc88747879 (patch) | |
tree | 287fd8740480746a7c6931d0b520ce6275dabf77 | |
parent | ecd89808c49941323cca84724c1a26dfe26ce10f (diff) | |
download | scummvm-rg350-8e8594aa0ed7803b66acc500dbf114dc88747879.tar.gz scummvm-rg350-8e8594aa0ed7803b66acc500dbf114dc88747879.tar.bz2 scummvm-rg350-8e8594aa0ed7803b66acc500dbf114dc88747879.zip |
SYMBIAN: Remove dead code
-rw-r--r-- | backends/graphics/symbiansdl/symbiansdl-graphics.cpp | 22 | ||||
-rw-r--r-- | backends/platform/symbian/UIQ2/Vibration.sis | bin | 2175 -> 0 bytes | |||
-rw-r--r-- | backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg | 57 | ||||
-rw-r--r-- | backends/platform/symbian/src/SymbianOS.h | 22 |
4 files changed, 0 insertions, 101 deletions
diff --git a/backends/graphics/symbiansdl/symbiansdl-graphics.cpp b/backends/graphics/symbiansdl/symbiansdl-graphics.cpp index 227674f811..6458fcf62a 100644 --- a/backends/graphics/symbiansdl/symbiansdl-graphics.cpp +++ b/backends/graphics/symbiansdl/symbiansdl-graphics.cpp @@ -31,33 +31,11 @@ SymbianSdlGraphicsManager::SymbianSdlGraphicsManager(SdlEventSource *sdlEventSou : SurfaceSdlGraphicsManager(sdlEventSource, window) { } -int SymbianSdlGraphicsManager::getDefaultGraphicsMode() const { - return GFX_NORMAL; -} - -static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { - {"1x", "Fullscreen", GFX_NORMAL}, - {0, 0, 0} -}; - -const OSystem::GraphicsMode *SymbianSdlGraphicsManager::getSupportedGraphicsModes() const { - return s_supportedGraphicsModes; -} - -// make sure we always go to normal, even if the string might be set wrong! -bool SymbianSdlGraphicsManager::setGraphicsMode(int /*name*/) { - // let parent OSystem_SDL handle it - return SurfaceSdlGraphicsManager::setGraphicsMode(getDefaultGraphicsMode()); -} - bool SymbianSdlGraphicsManager::hasFeature(OSystem::Feature f) const { switch (f) { case OSystem::kFeatureFullscreenMode: case OSystem::kFeatureAspectRatioCorrection: case OSystem::kFeatureCursorPalette: -#ifdef USE_VIBRA_SE_PXXX - case OSystem::kFeatureVibration: -#endif return true; default: return false; diff --git a/backends/platform/symbian/UIQ2/Vibration.sis b/backends/platform/symbian/UIQ2/Vibration.sis Binary files differdeleted file mode 100644 index 7cd9d33f15..0000000000 --- a/backends/platform/symbian/UIQ2/Vibration.sis +++ /dev/null diff --git a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg deleted file mode 100644 index 7d1e2bc249..0000000000 --- a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg +++ /dev/null @@ -1,57 +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. -; -; - -;;; -;;; ScummVM .PKG file for .SIS gegeration -;;; - -; Languages -;&EN - -; UID is the app's UID -#{"ScummVM SE"},(0x101f9b57),0,130,0 - -; Platform type -(0x101F617B), 2, 0, 0, {"UIQ20ProductID"} - -; Application, AIF & Resource file -"\epoc32\release\armi\urel\ScummVM.app"-"!:\system\apps\ScummVM\ScummVM.app" -"\epoc32\data\z\system\apps\ScummVM\ScummVM.aif"-"!:\system\apps\ScummVM\ScummVM.aif" -"\epoc32\data\z\system\apps\ScummVM\ScummVM.rsc"-"!:\system\apps\ScummVM\ScummVM.rsc" - -; Config/log files: 'empty' will automagically be removed on uninstall -""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL -""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL -""-"!:\system\apps\ScummVM\scummvm.stderr.txt",FILENULL -""-"!:\system\apps\ScummVM\sdl.ini",FILENULL - -; Common datafiles needed for some games -"..\kyra.dat"-"!:\system\apps\scummvm\kyra.dat" -"..\sky.cpt"-"!:\system\apps\scummvm\sky.cpt" - -; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini. -; It will remove the config file, std***.txt files & dirs on uninstall. - -; add extra Vibration lib for P800, will be ignored during all other installs -IF MachineUID = 0x101F408B -@"Vibration.sis", (0x101F94A3) -ENDIF diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h index fea1ebc0b2..479f7fe9e0 100644 --- a/backends/platform/symbian/src/SymbianOS.h +++ b/backends/platform/symbian/src/SymbianOS.h @@ -50,28 +50,6 @@ public: void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0); - // Vibration support -#ifdef USE_VIBRA_SE_PXXX - /** - * Intialize the vibration api used if present and supported - */ - void initializeVibration(); - - /** - * Turn vibration on, repeat no time - * @param vibraLength number of repetitions - */ - void vibrationOn(int vibraLength); - - /** - * Turns the vibration off - */ - void vibrationOff(); - -protected: - SonyEricsson::CVibration* _vibrationApi; -#endif // USE_VIBRA_SE_PXXX - protected: /** * Used to intialized special game mappings |