ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaned up a few places that still used SDL types and replaced them with BSPF types

This commit is contained in:
Philip James 2017-05-14 18:47:49 -07:00 committed by sa666666
parent 074f4ec2e0
commit f9368c681a
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/FrameBufferSDL2.cxx
View File

@ -190,7 +190,7 @@ bool FrameBufferSDL2::setVideoMode(const string& title, const VideoMode& mode)
setWindowIcon();
}
Uint32 renderFlags = SDL_RENDERER_ACCELERATED;
uInt32 renderFlags = SDL_RENDERER_ACCELERATED;
if(myOSystem.settings().getBool("vsync")) // V'synced blits option
renderFlags |= SDL_RENDERER_PRESENTVSYNC;
const string& video = myOSystem.settings().getString("video"); // Render hint

4
src/common/FrameBufferSDL2.hxx
View File

@ -70,7 +70,7 @@ class FrameBufferSDL2 : public FrameBuffer
@param g The green component of the color
@param b The blue component of the color
*/
inline void getRGB(Uint32 pixel, Uint8* r, Uint8* g, Uint8* b) const override
inline void getRGB(uInt32 pixel, uInt8* r, uInt8* g, uInt8* b) const override
{ SDL_GetRGB(pixel, myPixelFormat, r, g, b); }
/**
@ -80,7 +80,7 @@ class FrameBufferSDL2 : public FrameBuffer
@param g The green component of the color.
@param b The blue component of the color.
*/
inline Uint32 mapRGB(Uint8 r, Uint8 g, Uint8 b) const override
inline uInt32 mapRGB(uInt8 r, uInt8 g, uInt8 b) const override
{ return SDL_MapRGB(myPixelFormat, r, g, b); }
/**

12
src/emucore/FrameBuffer.cxx
View File

@ -132,9 +132,9 @@ bool FrameBuffer::initialize()
for(int i = 0, j = 256; i < kNumColors-256; ++i, ++j)
{
Uint8 r = (ourGUIColors[palID][i] >> 16) & 0xff;
Uint8 g = (ourGUIColors[palID][i] >> 8) & 0xff;
Uint8 b = ourGUIColors[palID][i] & 0xff;
uInt8 r = (ourGUIColors[palID][i] >> 16) & 0xff;
uInt8 g = (ourGUIColors[palID][i] >> 8) & 0xff;
uInt8 b = ourGUIColors[palID][i] & 0xff;
myPalette[j] = mapRGB(r, g, b);
}
@ -495,9 +495,9 @@ void FrameBuffer::setPalette(const uInt32* raw_palette)
// Set palette for normal fill
for(int i = 0; i < 256; ++i)
{
Uint8 r = (raw_palette[i] >> 16) & 0xff;
Uint8 g = (raw_palette[i] >> 8) & 0xff;
Uint8 b = raw_palette[i] & 0xff;
uInt8 r = (raw_palette[i] >> 16) & 0xff;
uInt8 g = (raw_palette[i] >> 8) & 0xff;
uInt8 b = raw_palette[i] & 0xff;
myPalette[i] = mapRGB(r, g, b);
}

6
src/emucore/FrameBuffer.hxx
View File

@ -315,7 +315,7 @@ class FrameBuffer
@param g The green component of the color
@param b The blue component of the color
*/
virtual void getRGB(Uint32 pixel, Uint8* r, Uint8* g, Uint8* b) const = 0;
virtual void getRGB(uInt32 pixel, uInt8* r, uInt8* g, uInt8* b) const = 0;
/**
This method is called to map a given R/G/B triple to the screen palette.
@ -324,7 +324,7 @@ class FrameBuffer
@param g The green component of the color.
@param b The blue component of the color.
*/
virtual Uint32 mapRGB(Uint8 r, Uint8 g, Uint8 b) const = 0;
virtual uInt32 mapRGB(uInt8 r, uInt8 g, uInt8 b) const = 0;
/**
This method is called to get the specified ARGB data from the viewable
@ -399,7 +399,7 @@ class FrameBuffer
OSystem& myOSystem;
// Color palette for TIA and UI modes
Uint32 myPalette[256+kNumColors];
uInt32 myPalette[256+kNumColors];
private:
/**