Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 08:41:31 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

SDL cleanup (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2016-04-20 10:21:27 +02:00
parent 9b646b992a
commit a314888cf6
5 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/osd/modules/input/input_sdlcommon.h
View File

@ -113,7 +113,6 @@ public:
class sdl_window_info;
// REVIEW: Do we need to handle SDLMAME_EVENTS_IN_WORKER_THREAD eventually?
class sdl_event_manager : public event_manager_t<sdl_event_subscriber>
{
private:

15
src/osd/sdl/osdsdl.h
View File

@ -7,21 +7,6 @@
#include "modules/osdmodule.h"
#include "modules/font/font_module.h"
//============================================================
// System dependent defines
//============================================================
#if defined(SDLMAME_WIN32)
#define SDLMAME_EVENTS_IN_WORKER_THREAD (0)
#define SDLMAME_INIT_IN_WORKER_THREAD (0)
#define SDL13_COMBINE_RESIZE (0) //(1) no longer needed
#else
#define SDLMAME_EVENTS_IN_WORKER_THREAD (0)
#define SDLMAME_INIT_IN_WORKER_THREAD (0)
#define SDL13_COMBINE_RESIZE (0)
#endif
//============================================================
// Defines
//============================================================

16
src/osd/sdl/sdlmain.cpp
View File

@ -274,10 +274,7 @@ void sdl_osd_interface::osd_exit()
{
osd_common_t::osd_exit();
if (!SDLMAME_INIT_IN_WORKER_THREAD)
{
SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER );
}
SDL_QuitSubSystem(SDL_INIT_VIDEO);
}
//============================================================
@ -491,14 +488,11 @@ void sdl_osd_interface::init(running_machine &machine)
/* Initialize SDL */
if (!SDLMAME_INIT_IN_WORKER_THREAD)
{
if (SDL_InitSubSystem(SDL_INIT_VIDEO)) {
osd_printf_error("Could not initialize SDL %s\n", SDL_GetError());
exit(-1);
}
osd_sdl_info();
if (SDL_InitSubSystem(SDL_INIT_VIDEO)) {
osd_printf_error("Could not initialize SDL %s\n", SDL_GetError());
exit(-1);
}
osd_sdl_info();
defines_verbose();

15
src/osd/sdl/window.cpp
View File

@ -181,15 +181,6 @@ static inline void execute_async_wait(osd_work_callback callback, const worker_p
static OSDWORK_CALLBACK(sdlwindow_thread_id)
{
window_threadid = SDL_ThreadID();
if (SDLMAME_INIT_IN_WORKER_THREAD)
{
if (SDL_InitSubSystem(SDL_INIT_VIDEO))
{
osd_printf_error("Could not initialize SDL: %s.\n", SDL_GetError());
exit(-1);
}
}
return nullptr;
}
@ -310,9 +301,6 @@ void sdl_osd_interface::build_slider_list()
static OSDWORK_CALLBACK( sdlwindow_exit_wt )
{
if (SDLMAME_INIT_IN_WORKER_THREAD)
SDL_Quit();
if (param)
osd_free(param);
return nullptr;
@ -1357,9 +1345,6 @@ sdl_window_info::sdl_window_info(running_machine &a_machine, int index, osd_moni
const osd_window_config *config)
: osd_window(), m_next(NULL),
// Following three are used by input code to defer resizes
m_resize_width(0),
m_resize_height(0),
m_last_resize(0),
m_minimum_dim(0,0),
m_windowed_dim(0,0),
m_rendered_event(0, 1), m_target(0),

5
src/osd/sdl/window.h
View File

@ -70,11 +70,6 @@ public:
// Pointer to next window
sdl_window_info * m_next;
// These are used in combine resizing events ... #if SDL13_COMBINE_RESIZE
int m_resize_width;
int m_resize_height;
osd_ticks_t m_last_resize;
private:
// window handle and info
char m_title[256];