Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-26 10:49:21 +00:00
Code Issues Projects Releases Wiki Activity

refactor init_sdl() into a function

Browse Source
This commit is contained in:
asvitkine 2011-12-28 23:33:04 +00:00
parent d58da945c6
commit c78c3046db
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
SheepShaver/src/Unix/main_unix.cpp
View File

@ -667,11 +667,16 @@ static bool install_signal_handlers(void)
return true;
}
int main(int argc, char **argv)
static bool init_sdl()
{
char str[256];
bool memory_mapped_from_zero, ram_rom_areas_contiguous;
const char *vmdir = NULL;
int sdl_flags = 0;
#ifdef USE_SDL_VIDEO
sdl_flags |= SDL_INIT_VIDEO;
#endif
#ifdef USE_SDL_AUDIO
sdl_flags |= SDL_INIT_AUDIO;
#endif
assert(sdl_flags != 0);
#ifdef USE_SDL_VIDEO
// Don't let SDL block the screensaver
@ -681,6 +686,26 @@ int main(int argc, char **argv)
setenv("SDL_HAS3BUTTONMOUSE", "1", TRUE);
#endif
if (SDL_Init(sdl_flags) == -1) {
char str[256];
sprintf(str, "Could not initialize SDL: %s.\n", SDL_GetError());
ErrorAlert(str);
return false;
}
atexit(SDL_Quit);
// Don't let SDL catch SIGINT and SIGTERM signals
signal(SIGINT, SIG_DFL);
signal(SIGTERM, SIG_DFL);
return true;
}
int main(int argc, char **argv)
{
char str[256];
bool memory_mapped_from_zero, ram_rom_areas_contiguous;
const char *vmdir = NULL;
// Initialize variables
RAMBase = 0;
tzset();
@ -771,25 +796,8 @@ int main(int argc, char **argv)
#ifdef USE_SDL
// Initialize SDL system
int sdl_flags = 0;
#ifdef USE_SDL_VIDEO
sdl_flags |= SDL_INIT_VIDEO;
#endif
#ifdef USE_SDL_AUDIO
sdl_flags |= SDL_INIT_AUDIO;
#endif
assert(sdl_flags != 0);
if (SDL_Init(sdl_flags) == -1) {
char str[256];
sprintf(str, "Could not initialize SDL: %s.\n", SDL_GetError());
ErrorAlert(str);
if (!init_sdl())
goto quit;
}
atexit(SDL_Quit);
// Don't let SDL catch SIGINT and SIGTERM signals
signal(SIGINT, SIG_DFL);
signal(SIGTERM, SIG_DFL);
#endif
#ifndef USE_SDL_VIDEO