Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-06-03 06:29:38 +00:00
Code Issues Projects Releases Wiki Activity

SDL: Completely collapse fullscreen/window drivers

Browse Source
This commit is contained in:
Dave Vasilevsky 2013-04-24 01:56:16 -04:00
parent 9e807c884c
commit e9c913c4ae
1 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
BasiliskII/src/SDL/video_sdl.cpp
View File

@ -628,16 +628,6 @@ static void update_display_window_vosf(driver_base *drv);
#endif
static void update_display_static(driver_base *drv);
class driver_window : public driver_base {
public:
driver_window(SDL_monitor_desc &monitor);
};
class driver_fullscreen : public driver_base {
public:
driver_fullscreen(SDL_monitor_desc &monitor);
};
static driver_base *drv = NULL; // Pointer to currently used driver object
#ifdef ENABLE_VOSF
@ -793,17 +783,6 @@ void driver_base::restore_mouse_accel(void)
{
}
/*
* Windowed display driver
*/
// Open display
driver_window::driver_window(SDL_monitor_desc &m)
: driver_base(m)
{
}
// Toggle mouse grab
void driver_base::toggle_mouse_grab(void)
{
@ -839,17 +818,6 @@ void driver_base::ungrab_mouse(void)
}
}
/*
* Full-screen display driver
*/
// Open display
driver_fullscreen::driver_fullscreen(SDL_monitor_desc &m)
: driver_base(m)
{
}
/*
* Initialization
*/
@ -944,14 +912,7 @@ bool SDL_monitor_desc::video_open(void)
#endif
// Create display driver object of requested type
switch (display_type) {
case DISPLAY_WINDOW:
drv = new(std::nothrow) driver_window(*this);
break;
case DISPLAY_SCREEN:
drv = new(std::nothrow) driver_fullscreen(*this);
break;
}
drv = new(std::nothrow) driver_base(*this);
if (drv == NULL)
return false;
drv->init();