thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL: Remove unnecessary overrides of setFeatureState() and getFeatureState()

Browse source
This commit is contained in:
Cameron Cawley 2020-03-11 20:20:33 +00:00 • committed by Eugene Sandulenko
parent 205175c4e5
commit a5b6a577de
9 changed files with 0 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

27
backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
View file

@ -464,33 +464,6 @@ bool DINGUXSdlGraphicsManager::hasFeature(OSystem::Feature f) const {
(f == OSystem::kFeatureCursorPalette);
}
void DINGUXSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
switch (f) {
case OSystem::kFeatureAspectRatioCorrection:
setAspectRatioCorrection(enable);
break;
case OSystem::kFeatureCursorPalette:
_cursorPaletteDisabled = !enable;
blitCursor();
break;
default:
break;
}
}
bool DINGUXSdlGraphicsManager::getFeatureState(OSystem::Feature f) const {
assert(_transactionMode == kTransactionNone);
switch (f) {
case OSystem::kFeatureAspectRatioCorrection:
return _videoMode.aspectRatioCorrection;
case OSystem::kFeatureCursorPalette:
return !_cursorPaletteDisabled;
default:
return false;
}
}
void DINGUXSdlGraphicsManager::warpMouse(int x, int y) {
if (_cursorX != x || _cursorY != y) {
if (_videoMode.mode == GFX_HALF && !_overlayVisible) {

2
backends/graphics/dinguxsdl/dinguxsdl-graphics.h
View file

@ -37,8 +37,6 @@ public:
DINGUXSdlGraphicsManager(SdlEventSource *boss, SdlWindow *window);
bool hasFeature(OSystem::Feature f) const override;
void setFeatureState(OSystem::Feature f, bool enable) override;
bool getFeatureState(OSystem::Feature f) const override;
int getDefaultGraphicsMode() const override;
void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL) override;

27
backends/graphics/gph/gph-graphics.cpp
View file

@ -464,33 +464,6 @@ bool GPHGraphicsManager::hasFeature(OSystem::Feature f) const {
(f == OSystem::kFeatureCursorPalette);
}
void GPHGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
switch (f) {
case OSystem::kFeatureAspectRatioCorrection:
setAspectRatioCorrection(enable);
break;
case OSystem::kFeatureCursorPalette:
_cursorPaletteDisabled = !enable;
blitCursor();
break;
default:
break;
}
}
bool GPHGraphicsManager::getFeatureState(OSystem::Feature f) const {
assert(_transactionMode == kTransactionNone);
switch (f) {
case OSystem::kFeatureAspectRatioCorrection:
return _videoMode.aspectRatioCorrection;
case OSystem::kFeatureCursorPalette:
return !_cursorPaletteDisabled;
default:
return false;
}
}
void GPHGraphicsManager::warpMouse(int x, int y) {
if (_cursorX != x || _cursorY != y) {
if (_videoMode.mode == GFX_HALF && !_overlayVisible) {

2
backends/graphics/gph/gph-graphics.h
View file

@ -36,8 +36,6 @@ public:
GPHGraphicsManager(SdlEventSource *boss, SdlWindow *window);
bool hasFeature(OSystem::Feature f) const override;
void setFeatureState(OSystem::Feature f, bool enable) override;
bool getFeatureState(OSystem::Feature f) const;
int getDefaultGraphicsMode() const override;
void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL) override;

19
backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
View file

@ -38,23 +38,4 @@ bool SamsungTVSdlGraphicsManager::hasFeature(OSystem::Feature f) const {
(f == OSystem::kFeatureCursorPalette);
}
void SamsungTVSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
switch (f) {
case OSystem::kFeatureAspectRatioCorrection:
SurfaceSdlGraphicsManager::setFeatureState(f, enable);
break;
default:
break;
}
}
bool SamsungTVSdlGraphicsManager::getFeatureState(OSystem::Feature f) const {
switch (f) {
case OSystem::kFeatureAspectRatioCorrection:
return SurfaceSdlGraphicsManager::getFeatureState(f);
default:
return false;
}
}
#endif

2
backends/graphics/samsungtvsdl/samsungtvsdl-graphics.h
View file

@ -32,8 +32,6 @@ public:
SamsungTVSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window);
bool hasFeature(OSystem::Feature f) const override;
void setFeatureState(OSystem::Feature f, bool enable) override;
bool getFeatureState(OSystem::Feature f) const override;
};
#endif

5
backends/platform/androidsdl/androidsdl-sdl.cpp
View file

@ -110,8 +110,6 @@ void OSystem_ANDROIDSDL::setFeatureState(Feature f, bool enable) {
ConfMan.setBool("swap_menu_and_back_buttons", enable);
swapMenuAndBackButtons(enable);
break;
case kFeatureFullscreenMode:
break;
default:
OSystem_POSIX::setFeatureState(f, enable);
break;
@ -129,9 +127,6 @@ bool OSystem_ANDROIDSDL::getFeatureState(Feature f) {
case kFeatureSwapMenuAndBackButtons:
return ConfMan.getBool("swap_menu_and_back_buttons");
break;
case kFeatureFullscreenMode:
return true;
break;
default:
return OSystem_POSIX::getFeatureState(f);
break;

5
backends/platform/sdl/psp2/psp2.cpp
View file

@ -161,8 +161,6 @@ void OSystem_PSP2::setFeatureState(Feature f, bool enable) {
case kFeatureTouchpadMode:
ConfMan.setBool("touchpad_mouse_mode", enable);
break;
case kFeatureFullscreenMode:
break;
default:
OSystem_SDL::setFeatureState(f, enable);
break;
@ -174,9 +172,6 @@ bool OSystem_PSP2::getFeatureState(Feature f) {
case kFeatureTouchpadMode:
return ConfMan.getBool("touchpad_mouse_mode");
break;
case kFeatureFullscreenMode:
return true;
break;
default:
return OSystem_SDL::getFeatureState(f);
break;

5
backends/platform/sdl/switch/switch.cpp
View file

@ -126,8 +126,6 @@ void OSystem_Switch::setFeatureState(Feature f, bool enable) {
case kFeatureTouchpadMode:
ConfMan.setBool("touchpad_mouse_mode", enable);
break;
case kFeatureFullscreenMode:
break;
default:
OSystem_SDL::setFeatureState(f, enable);
break;
@ -139,9 +137,6 @@ bool OSystem_Switch::getFeatureState(Feature f) {
case kFeatureTouchpadMode:
return ConfMan.getBool("touchpad_mouse_mode");
break;
case kFeatureFullscreenMode:
return true;
break;
default:
return OSystem_SDL::getFeatureState(f);
break;