diff options
| author | Max Horn | 2010-06-15 12:21:08 +0000 |
|---|---|---|
| committer | Max Horn | 2010-06-15 12:21:08 +0000 |
| commit | 703f0ca29c8f1915b5fae13decb6ccde110adada (patch) | |
| tree | 29d5522af7f94821deead51092fc5ce91018ae96 /backends/platform/psp | |
| parent | 96f1e293009a7fe1291ed0f7c1255f9010b75098 (diff) | |
| download | scummvm-rg350-703f0ca29c8f1915b5fae13decb6ccde110adada.tar.gz scummvm-rg350-703f0ca29c8f1915b5fae13decb6ccde110adada.tar.bz2 scummvm-rg350-703f0ca29c8f1915b5fae13decb6ccde110adada.zip | |
SYSTEM: Unify OSystem::getSupportedFormats() signature
svn-id: r49838
Diffstat (limited to 'backends/platform/psp')
| -rw-r--r-- | backends/platform/psp/display_manager.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/psp/display_manager.h | 12 | ||||
| -rw-r--r-- | backends/platform/psp/osys_psp.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/psp/osys_psp.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/backends/platform/psp/display_manager.cpp b/backends/platform/psp/display_manager.cpp index 15e0188ebf..a9f33f6091 100644 --- a/backends/platform/psp/display_manager.cpp +++ b/backends/platform/psp/display_manager.cpp @@ -379,7 +379,7 @@ inline bool DisplayManager::isTimeToUpdate() { return true; } -Common::List<Graphics::PixelFormat> DisplayManager::getSupportedPixelFormats() { +Common::List<Graphics::PixelFormat> DisplayManager::getSupportedPixelFormats() const { Common::List<Graphics::PixelFormat> list; // In order of preference diff --git a/backends/platform/psp/display_manager.h b/backends/platform/psp/display_manager.h index bceb85703d..dbbdf2022c 100644 --- a/backends/platform/psp/display_manager.h +++ b/backends/platform/psp/display_manager.h @@ -83,12 +83,12 @@ public: void setSizeAndPixelFormat(uint width, uint height, const Graphics::PixelFormat *format); // Getters - float getScaleX() { return _displayParams.scaleX; } - float getScaleY() { return _displayParams.scaleY; } - uint32 getOutputWidth() { return _displayParams.screenOutput.width; } - uint32 getOutputHeight() { return _displayParams.screenOutput.height; } - uint32 getOutputBitsPerPixel() { return _displayParams.outputBitsPerPixel; } - Common::List<Graphics::PixelFormat> getSupportedPixelFormats(); + float getScaleX() const { return _displayParams.scaleX; } + float getScaleY() const { return _displayParams.scaleY; } + uint32 getOutputWidth() const { return _displayParams.screenOutput.width; } + uint32 getOutputHeight() const { return _displayParams.screenOutput.height; } + uint32 getOutputBitsPerPixel() const { return _displayParams.outputBitsPerPixel; } + Common::List<Graphics::PixelFormat> getSupportedPixelFormats() const; private: struct GlobalDisplayParams { diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index b0fb971230..580e4f1cfd 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -148,7 +148,7 @@ Graphics::PixelFormat OSystem_PSP::getScreenFormat() const { return _screen.getScummvmPixelFormat(); } -Common::List<Graphics::PixelFormat> OSystem_PSP::getSupportedFormats() { +Common::List<Graphics::PixelFormat> OSystem_PSP::getSupportedFormats() const { return _displayManager.getSupportedPixelFormats(); } diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index d8ec8fe824..56a64ccb80 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -87,7 +87,7 @@ public: int getGraphicsMode() const; #ifdef USE_RGB_COLOR virtual Graphics::PixelFormat getScreenFormat() const; - virtual Common::List<Graphics::PixelFormat> getSupportedFormats(); + virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const; #endif // Screen size |