pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed static misnomers

Browse source
This commit is contained in:
Nathan Heisey 2011-08-22 21:07:16 +00:00
parent 4799ac2b6e
commit b6c26ffe71
5 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/video/bwindow/SDL_bframebuffer.cc
View file

@ -59,8 +59,8 @@ int BE_CreateWindowFramebuffer(_THIS, SDL_Window * window,
/* format */
display_mode bmode;
bscreen.GetMode(&bmode);
int32 bpp = ColorSpaceToBitsPerPixel(bmode.space);
*format = BPPToSDLPxFormat(bpp);
int32 bpp = BE_ColorSpaceToBitsPerPixel(bmode.space);
*format = BE_BPPToSDLPxFormat(bpp);
/* Create the new bitmap object */
BBitmap *bitmap = bwin->GetBitmap();

15
src/video/bwindow/SDL_bmodes.cc
View file

@ -131,7 +131,7 @@ void _SpoutModeData(display_mode *bmode) {
static inline int32 ColorSpaceToBitsPerPixel(uint32 colorspace)
int32 BE_ColorSpaceToBitsPerPixel(uint32 colorspace)
{
int bitsperpixel;
@ -162,7 +162,7 @@ static inline int32 ColorSpaceToBitsPerPixel(uint32 colorspace)
return(bitsperpixel);
}
static inline int32 BPPToSDLPxFormat(int32 bpp) {
int32 BE_BPPToSDLPxFormat(int32 bpp) {
/* Translation taken from SDL_windowsmodes.c */
switch (bpp) {
case 32:
@ -186,7 +186,7 @@ static inline int32 BPPToSDLPxFormat(int32 bpp) {
}
}
static inline void _BDisplayModeToSdlDisplayMode(display_mode *bmode,
static void _BDisplayModeToSdlDisplayMode(display_mode *bmode,
SDL_DisplayMode *mode) {
mode->w = bmode->virtual_width;
mode->h = bmode->virtual_height;
@ -205,12 +205,12 @@ static inline void _BDisplayModeToSdlDisplayMode(display_mode *bmode,
#endif
/* Set the format */
int32 bpp = ColorSpaceToBitsPerPixel(bmode->space);
mode->format = BPPToSDLPxFormat(bpp);
int32 bpp = BE_ColorSpaceToBitsPerPixel(bmode->space);
mode->format = BE_BPPToSDLPxFormat(bpp);
}
/* Later, there may be more than one monitor available */
void _AddDisplay(BScreen *screen) {
static void _AddDisplay(BScreen *screen) {
SDL_VideoDisplay display;
SDL_DisplayMode *mode = (SDL_DisplayMode*)SDL_calloc(1,
sizeof(SDL_DisplayMode));
@ -307,7 +307,8 @@ int BE_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMode *mode){
SDL_SetError("Bad video mode\n");
return -1;
}
free(bmode_list);
free(bmode_list);
#if SDL_VIDEO_OPENGL
/* FIXME: Is there some way to reboot the OpenGL context? This doesn't

4
src/video/bwindow/SDL_bmodes.h
View file

@ -28,8 +28,8 @@ extern "C" {
#include "../SDL_sysvideo.h"
extern int32 ColorSpaceToBitsPerPixel(uint32 colorspace);
extern int32 BPPToSDLPxFormat(int32 bpp);
extern int32 BE_ColorSpaceToBitsPerPixel(uint32 colorspace);
extern int32 BE_BPPToSDLPxFormat(int32 bpp);
extern int BE_InitModes(_THIS);
extern int BE_QuitModes(_THIS);

4
src/video/bwindow/SDL_bvideo.cc
View file

@ -122,7 +122,7 @@ VideoBootStrap BWINDOW_bootstrap = {
BE_Available, BE_CreateDevice
};
static void BE_DeleteDevice(SDL_VideoDevice * device)
void BE_DeleteDevice(SDL_VideoDevice * device)
{
SDL_free(device->driverdata);
SDL_free(device);
@ -152,7 +152,7 @@ int BE_VideoInit(_THIS)
return (0);
}
static int BE_Available(void)
int BE_Available(void)
{
return (1);
}

2
src/video/bwindow/SDL_bwindow.cc
View file

@ -37,7 +37,7 @@ static inline SDL_BApp *_GetBeApp() {
return ((SDL_BApp*)be_app);
}
int _InitWindow(_THIS, SDL_Window *window) {
static int _InitWindow(_THIS, SDL_Window *window) {
uint32 flags = 0;
BRect bounds(
window->x,