summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/sdlmain.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/sdl/sdlmain.cpp')
-rw-r--r--src/osd/sdl/sdlmain.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
index a465e64655a..5112b3a3628 100644
--- a/src/osd/sdl/sdlmain.cpp
+++ b/src/osd/sdl/sdlmain.cpp
@@ -85,10 +85,10 @@ const options_entry sdl_options::s_option_entries[] =
{ SDLOPTION_INIPATH, INI_PATH, OPTION_STRING, "path to ini files" },
// performance options
- { NULL, NULL, OPTION_HEADER, "SDL PERFORMANCE OPTIONS" },
+ { nullptr, nullptr, OPTION_HEADER, "SDL PERFORMANCE OPTIONS" },
{ SDLOPTION_SDLVIDEOFPS, "0", OPTION_BOOLEAN, "show sdl video performance" },
// video options
- { NULL, NULL, OPTION_HEADER, "SDL VIDEO OPTIONS" },
+ { nullptr, nullptr, OPTION_HEADER, "SDL VIDEO OPTIONS" },
// OS X can be trusted to have working hardware OpenGL, so default to it on for the best user experience
{ SDLOPTION_CENTERH, "1", OPTION_BOOLEAN, "center horizontally within the view area" },
{ SDLOPTION_CENTERV, "1", OPTION_BOOLEAN, "center vertically within the view area" },
@@ -96,17 +96,17 @@ const options_entry sdl_options::s_option_entries[] =
// full screen options
#ifdef SDLMAME_X11
- { NULL, NULL, OPTION_HEADER, "SDL FULL SCREEN OPTIONS" },
+ { nullptr, nullptr, OPTION_HEADER, "SDL FULL SCREEN OPTIONS" },
{ SDLOPTION_USEALLHEADS, "0", OPTION_BOOLEAN, "split full screen image across monitors" },
#endif
// keyboard mapping
- { NULL, NULL, OPTION_HEADER, "SDL KEYBOARD MAPPING" },
+ { nullptr, nullptr, OPTION_HEADER, "SDL KEYBOARD MAPPING" },
{ SDLOPTION_KEYMAP, "0", OPTION_BOOLEAN, "enable keymap" },
{ SDLOPTION_KEYMAP_FILE, "keymap.dat", OPTION_STRING, "keymap filename" },
// joystick mapping
- { NULL, NULL, OPTION_HEADER, "SDL JOYSTICK MAPPING" },
+ { nullptr, nullptr, OPTION_HEADER, "SDL JOYSTICK MAPPING" },
{ SDLOPTION_JOYINDEX "1", OSDOPTVAL_AUTO, OPTION_STRING, "name of joystick mapped to joystick #1" },
{ SDLOPTION_JOYINDEX "2", OSDOPTVAL_AUTO, OPTION_STRING, "name of joystick mapped to joystick #2" },
{ SDLOPTION_JOYINDEX "3", OSDOPTVAL_AUTO, OPTION_STRING, "name of joystick mapped to joystick #3" },
@@ -119,7 +119,7 @@ const options_entry sdl_options::s_option_entries[] =
#if (USE_XINPUT)
// lightgun mapping
- { NULL, NULL, OPTION_HEADER, "SDL LIGHTGUN MAPPING" },
+ { nullptr, nullptr, OPTION_HEADER, "SDL LIGHTGUN MAPPING" },
{ SDLOPTION_LIGHTGUNINDEX "1", OSDOPTVAL_AUTO, OPTION_STRING, "name of lightgun mapped to lightgun #1" },
{ SDLOPTION_LIGHTGUNINDEX "2", OSDOPTVAL_AUTO, OPTION_STRING, "name of lightgun mapped to lightgun #2" },
{ SDLOPTION_LIGHTGUNINDEX "3", OSDOPTVAL_AUTO, OPTION_STRING, "name of lightgun mapped to lightgun #3" },
@@ -130,7 +130,7 @@ const options_entry sdl_options::s_option_entries[] =
{ SDLOPTION_LIGHTGUNINDEX "8", OSDOPTVAL_AUTO, OPTION_STRING, "name of lightgun mapped to lightgun #8" },
#endif
- { NULL, NULL, OPTION_HEADER, "SDL MOUSE MAPPING" },
+ { nullptr, nullptr, OPTION_HEADER, "SDL MOUSE MAPPING" },
{ SDLOPTION_MOUSEINDEX "1", OSDOPTVAL_AUTO, OPTION_STRING, "name of mouse mapped to mouse #1" },
{ SDLOPTION_MOUSEINDEX "2", OSDOPTVAL_AUTO, OPTION_STRING, "name of mouse mapped to mouse #2" },
{ SDLOPTION_MOUSEINDEX "3", OSDOPTVAL_AUTO, OPTION_STRING, "name of mouse mapped to mouse #3" },
@@ -140,7 +140,7 @@ const options_entry sdl_options::s_option_entries[] =
{ SDLOPTION_MOUSEINDEX "7", OSDOPTVAL_AUTO, OPTION_STRING, "name of mouse mapped to mouse #7" },
{ SDLOPTION_MOUSEINDEX "8", OSDOPTVAL_AUTO, OPTION_STRING, "name of mouse mapped to mouse #8" },
- { NULL, NULL, OPTION_HEADER, "SDL KEYBOARD MAPPING" },
+ { nullptr, nullptr, OPTION_HEADER, "SDL KEYBOARD MAPPING" },
{ SDLOPTION_KEYBINDEX "1", OSDOPTVAL_AUTO, OPTION_STRING, "name of keyboard mapped to keyboard #1" },
{ SDLOPTION_KEYBINDEX "2", OSDOPTVAL_AUTO, OPTION_STRING, "name of keyboard mapped to keyboard #2" },
{ SDLOPTION_KEYBINDEX "3", OSDOPTVAL_AUTO, OPTION_STRING, "name of keyboard mapped to keyboard #3" },
@@ -151,7 +151,7 @@ const options_entry sdl_options::s_option_entries[] =
{ SDLOPTION_KEYBINDEX "8", OSDOPTVAL_AUTO, OPTION_STRING, "name of keyboard mapped to keyboard #8" },
// SDL low level driver options
- { NULL, NULL, OPTION_HEADER, "SDL LOWLEVEL DRIVER OPTIONS" },
+ { nullptr, nullptr, OPTION_HEADER, "SDL LOWLEVEL DRIVER OPTIONS" },
{ SDLOPTION_VIDEODRIVER ";vd", OSDOPTVAL_AUTO, OPTION_STRING, "sdl video driver to use ('x11', 'directfb', ... or 'auto' for SDL default" },
{ SDLOPTION_RENDERDRIVER ";rd", OSDOPTVAL_AUTO, OPTION_STRING, "sdl render driver to use ('software', 'opengl', 'directfb' ... or 'auto' for SDL default" },
{ SDLOPTION_AUDIODRIVER ";ad", OSDOPTVAL_AUTO, OPTION_STRING, "sdl audio driver to use ('alsa', 'arts', ... or 'auto' for SDL default" },
@@ -160,7 +160,7 @@ const options_entry sdl_options::s_option_entries[] =
#endif
// End of list
- { NULL }
+ { nullptr }
};
//============================================================
@@ -193,8 +193,8 @@ int main(int argc, char *argv[])
int res = 0;
// disable I/O buffering
- setvbuf(stdout, (char *) NULL, _IONBF, 0);
- setvbuf(stderr, (char *) NULL, _IONBF, 0);
+ setvbuf(stdout, (char *) nullptr, _IONBF, 0);
+ setvbuf(stderr, (char *) nullptr, _IONBF, 0);
// Initialize crash diagnostics
diagnostics_module::get_instance()->init_crash_diagnostics();
@@ -390,10 +390,10 @@ static void osd_sdl_info(void)
void sdl_osd_interface::video_register()
{
- video_options_add("soft", NULL);
- video_options_add("opengl", NULL);
- video_options_add("bgfx", NULL);
- //video_options_add("auto", NULL); // making d3d video default one
+ video_options_add("soft", nullptr);
+ video_options_add("opengl", nullptr);
+ video_options_add("bgfx", nullptr);
+ //video_options_add("auto", nullptr); // making d3d video default one
}
//============================================================
@@ -422,21 +422,21 @@ void sdl_osd_interface::init(running_machine &machine)
// Some driver options - must be before audio init!
stemp = options().audio_driver();
- if (stemp != NULL && strcmp(stemp, OSDOPTVAL_AUTO) != 0)
+ if (stemp != nullptr && strcmp(stemp, OSDOPTVAL_AUTO) != 0)
{
osd_printf_verbose("Setting SDL audiodriver '%s' ...\n", stemp);
osd_setenv(SDLENV_AUDIODRIVER, stemp, 1);
}
stemp = options().video_driver();
- if (stemp != NULL && strcmp(stemp, OSDOPTVAL_AUTO) != 0)
+ if (stemp != nullptr && strcmp(stemp, OSDOPTVAL_AUTO) != 0)
{
osd_printf_verbose("Setting SDL videodriver '%s' ...\n", stemp);
osd_setenv(SDLENV_VIDEODRIVER, stemp, 1);
}
stemp = options().render_driver();
- if (stemp != NULL)
+ if (stemp != nullptr)
{
if (strcmp(stemp, OSDOPTVAL_AUTO) != 0)
{
@@ -462,7 +462,7 @@ void sdl_osd_interface::init(running_machine &machine)
/* FIXME: move lib loading code from drawogl.c here */
stemp = options().gl_lib();
- if (stemp != NULL && strcmp(stemp, OSDOPTVAL_AUTO) != 0)
+ if (stemp != nullptr && strcmp(stemp, OSDOPTVAL_AUTO) != 0)
{
osd_setenv("SDL_VIDEO_GL_DRIVER", stemp, 1);
osd_printf_verbose("Setting SDL_VIDEO_GL_DRIVER = '%s' ...\n", stemp);