diff options
-rw-r--r-- | backends/base-backend.cpp | 14 | ||||
-rw-r--r-- | backends/base-backend.h | 3 | ||||
-rw-r--r-- | backends/graphics/graphics.h | 3 | ||||
-rw-r--r-- | backends/modular-backend.cpp | 12 | ||||
-rw-r--r-- | backends/modular-backend.h | 3 | ||||
-rw-r--r-- | common/system.h | 39 |
6 files changed, 0 insertions, 74 deletions
diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp index dfb9e284ce..3e95c3e26a 100644 --- a/backends/base-backend.cpp +++ b/backends/base-backend.cpp @@ -39,20 +39,6 @@ void BaseBackend::displayMessageOnOSD(const char *msg) { dialog.runModal(); } -void BaseBackend::copyRectToOSD(const void *buf, int pitch, int x, int y, int w, int h) { - warning("BaseBackend::copyRectToOSD not implemented"); //TODO -} - -void BaseBackend::clearOSD() { - warning("BaseBackend::clearOSD not implemented"); //TODO - //what should I do? Remove all TimedMessageDialogs? -} - -Graphics::PixelFormat BaseBackend::getOSDFormat() { - warning("BaseBackend::getOSDFormat not implemented"); - return Graphics::PixelFormat(); -} - void BaseBackend::initBackend() { // Init Event manager #ifndef DISABLE_DEFAULT_EVENT_MANAGER diff --git a/backends/base-backend.h b/backends/base-backend.h index 2394edaf38..598f682b32 100644 --- a/backends/base-backend.h +++ b/backends/base-backend.h @@ -33,9 +33,6 @@ public: virtual void initBackend(); virtual void displayMessageOnOSD(const char *msg); - virtual void copyRectToOSD(const void *buf, int pitch, int x, int y, int w, int h); - virtual void clearOSD(); - virtual Graphics::PixelFormat getOSDFormat(); virtual void fillScreen(uint32 col); }; diff --git a/backends/graphics/graphics.h b/backends/graphics/graphics.h index 271a482032..db8b6a920b 100644 --- a/backends/graphics/graphics.h +++ b/backends/graphics/graphics.h @@ -84,9 +84,6 @@ public: virtual void setCursorPalette(const byte *colors, uint start, uint num) = 0; virtual void displayMessageOnOSD(const char *msg) {} - virtual void copyRectToOSD(const void *buf, int pitch, int x, int y, int w, int h) {} - virtual void clearOSD() {} - virtual Graphics::PixelFormat getOSDFormat() { return Graphics::PixelFormat(); } virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) {} diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp index 13db277a75..1fef5c5a48 100644 --- a/backends/modular-backend.cpp +++ b/backends/modular-backend.cpp @@ -241,18 +241,6 @@ void ModularBackend::displayMessageOnOSD(const char *msg) { _graphicsManager->displayMessageOnOSD(msg); } -void ModularBackend::copyRectToOSD(const void *buf, int pitch, int x, int y, int w, int h) { - _graphicsManager->copyRectToOSD(buf, pitch, x, y, w, h); -} - -void ModularBackend::clearOSD() { - _graphicsManager->clearOSD(); -} - -Graphics::PixelFormat ModularBackend::getOSDFormat() { - return _graphicsManager->getOSDFormat(); -} - void ModularBackend::displayActivityIconOnOSD(const Graphics::Surface *icon) { _graphicsManager->displayActivityIconOnOSD(icon); } diff --git a/backends/modular-backend.h b/backends/modular-backend.h index 886f91c320..23f0e2d547 100644 --- a/backends/modular-backend.h +++ b/backends/modular-backend.h @@ -127,9 +127,6 @@ public: virtual void quit(); virtual void displayMessageOnOSD(const char *msg); - virtual void copyRectToOSD(const void *buf, int pitch, int x, int y, int w, int h); - virtual void clearOSD(); - virtual Graphics::PixelFormat getOSDFormat(); virtual void displayActivityIconOnOSD(const Graphics::Surface *icon); //@} diff --git a/common/system.h b/common/system.h index b07a5ffd1e..cbaa30c19d 100644 --- a/common/system.h +++ b/common/system.h @@ -1121,45 +1121,6 @@ public: virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) = 0; /** - * Blit a bitmap to the 'on screen display'. - * - * If the current pixel format has one byte per pixel, the graphics data - * uses 8 bits per pixel, using the palette specified via setPalette. - * If more than one byte per pixel is in use, the graphics data uses the - * pixel format returned by getScreenFormat. - * - * @param buf the buffer containing the graphics data source - * @param pitch the pitch of the buffer (number of bytes in a scanline) - * @param x the x coordinate of the destination rectangle - * @param y the y coordinate of the destination rectangle - * @param w the width of the destination rectangle - * @param h the height of the destination rectangle - * - * @note The specified destination rectangle must be completly contained - * in the visible screen space, and must be non-empty. If not, a - * backend may or may not perform clipping, trigger an assert or - * silently corrupt memory. - * - * @see updateScreen - * @see getScreenFormat - * @see copyRectToScreen - */ - - virtual void copyRectToOSD(const void *buf, int pitch, int x, int y, int w, int h) = 0; - - /** - * Clears 'on screen display' from everything drawn on it. - */ - - virtual void clearOSD() = 0; - - /** - * Returns 'on screen display' pixel format. - */ - - virtual Graphics::PixelFormat getOSDFormat() = 0; - - /** * Return the SaveFileManager, used to store and load savestates * and other modifiable persistent game data. For more information, * refer to the SaveFileManager documentation. |