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

OSYSTEM: Remove the API allowing to draw to the OSD surface directly

Browse source
This commit is contained in:
Bastien Bouclet 2016-09-13 20:35:46 +02:00
parent 9cbaad6140
commit 0802bbd8ee
6 changed files with 0 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

14
backends/base-backend.cpp
View file

@ -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

3
backends/base-backend.h
View file

@ -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);
};

3
backends/graphics/graphics.h
View file

@ -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) {}

12
backends/modular-backend.cpp
View file

@ -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);
}

3
backends/modular-backend.h
View file

@ -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);
//@}

39
common/system.h
View file

@ -1120,45 +1120,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,