{ ".fade_delay", ARG_UNDEFINED, TYPE_INTEGER },
{ ".post_delay", ARG_UNDEFINED, TYPE_INTEGER },
{ ".auto_delay", ARG_UNDEFINED, TYPE_INTEGER },
+ { ".auto_delay_unit", ARG_UNDEFINED, TYPE_INTEGER },
{ ".align", ARG_UNDEFINED, TYPE_INTEGER },
{ ".valign", ARG_UNDEFINED, TYPE_INTEGER },
{ ".sort_priority", ARG_UNDEFINED, TYPE_INTEGER },
{ "[title_initial].fade_delay", "500" },
{ "[title_initial].post_delay", "250" },
{ "[title_initial].auto_delay", "-1" },
+ { "[title_initial].auto_delay_unit", "ms" },
{ "[title].fade_mode", "fade" },
{ "[title].fade_delay", "500" },
{ "[title].post_delay", "250" },
{ "[title].auto_delay", "-1" },
+ { "[title].auto_delay_unit", "ms" },
{ "[titlescreen_initial].sort_priority", "0" },
{ "[titlescreen_initial].fade_mode", ARG_DEFAULT },
{ "[titlescreen_initial].fade_delay", ARG_DEFAULT },
{ "[titlescreen_initial].post_delay", ARG_DEFAULT },
{ "[titlescreen_initial].auto_delay", ARG_DEFAULT },
+ { "[titlescreen_initial].auto_delay_unit", ARG_DEFAULT },
{ "[titlescreen].sort_priority", "0" },
{ "[titlescreen].fade_mode", ARG_DEFAULT },
{ "[titlescreen].fade_delay", ARG_DEFAULT },
{ "[titlescreen].post_delay", ARG_DEFAULT },
{ "[titlescreen].auto_delay", ARG_DEFAULT },
+ { "[titlescreen].auto_delay_unit", ARG_DEFAULT },
{ "titlescreen_initial_1.sort_priority", ARG_DEFAULT },
{ "titlescreen_initial_1.fade_mode", ARG_DEFAULT },
{ "titlescreen_initial_1.fade_delay", ARG_DEFAULT },
{ "titlescreen_initial_1.post_delay", ARG_DEFAULT },
{ "titlescreen_initial_1.auto_delay", ARG_DEFAULT },
+ { "titlescreen_initial_1.auto_delay_unit", ARG_DEFAULT },
{ "titlescreen_initial_2.sort_priority", ARG_DEFAULT },
{ "titlescreen_initial_2.fade_mode", ARG_DEFAULT },
{ "titlescreen_initial_2.fade_delay", ARG_DEFAULT },
{ "titlescreen_initial_2.post_delay", ARG_DEFAULT },
{ "titlescreen_initial_2.auto_delay", ARG_DEFAULT },
+ { "titlescreen_initial_2.auto_delay_unit", ARG_DEFAULT },
{ "titlescreen_initial_3.sort_priority", ARG_DEFAULT },
{ "titlescreen_initial_3.fade_mode", ARG_DEFAULT },
{ "titlescreen_initial_3.fade_delay", ARG_DEFAULT },
{ "titlescreen_initial_3.post_delay", ARG_DEFAULT },
{ "titlescreen_initial_3.auto_delay", ARG_DEFAULT },
+ { "titlescreen_initial_3.auto_delay_unit", ARG_DEFAULT },
{ "titlescreen_initial_4.sort_priority", ARG_DEFAULT },
{ "titlescreen_initial_4.fade_mode", ARG_DEFAULT },
{ "titlescreen_initial_4.fade_delay", ARG_DEFAULT },
{ "titlescreen_initial_4.post_delay", ARG_DEFAULT },
{ "titlescreen_initial_4.auto_delay", ARG_DEFAULT },
+ { "titlescreen_initial_4.auto_delay_unit", ARG_DEFAULT },
{ "titlescreen_initial_5.sort_priority", ARG_DEFAULT },
{ "titlescreen_initial_5.fade_mode", ARG_DEFAULT },
{ "titlescreen_initial_5.fade_delay", ARG_DEFAULT },
{ "titlescreen_initial_5.post_delay", ARG_DEFAULT },
{ "titlescreen_initial_5.auto_delay", ARG_DEFAULT },
+ { "titlescreen_initial_5.auto_delay_unit", ARG_DEFAULT },
{ "titlescreen_1.sort_priority", ARG_DEFAULT },
{ "titlescreen_1.fade_mode", ARG_DEFAULT },
{ "titlescreen_1.fade_delay", ARG_DEFAULT },
{ "titlescreen_1.post_delay", ARG_DEFAULT },
{ "titlescreen_1.auto_delay", ARG_DEFAULT },
+ { "titlescreen_1.auto_delay_unit", ARG_DEFAULT },
{ "titlescreen_2.sort_priority", ARG_DEFAULT },
{ "titlescreen_2.fade_mode", ARG_DEFAULT },
{ "titlescreen_2.fade_delay", ARG_DEFAULT },
{ "titlescreen_2.post_delay", ARG_DEFAULT },
{ "titlescreen_2.auto_delay", ARG_DEFAULT },
+ { "titlescreen_2.auto_delay_unit", ARG_DEFAULT },
{ "titlescreen_3.sort_priority", ARG_DEFAULT },
{ "titlescreen_3.fade_mode", ARG_DEFAULT },
{ "titlescreen_3.fade_delay", ARG_DEFAULT },
{ "titlescreen_3.post_delay", ARG_DEFAULT },
{ "titlescreen_3.auto_delay", ARG_DEFAULT },
+ { "titlescreen_3.auto_delay_unit", ARG_DEFAULT },
{ "titlescreen_4.sort_priority", ARG_DEFAULT },
{ "titlescreen_4.fade_mode", ARG_DEFAULT },
{ "titlescreen_4.fade_delay", ARG_DEFAULT },
{ "titlescreen_4.post_delay", ARG_DEFAULT },
{ "titlescreen_4.auto_delay", ARG_DEFAULT },
+ { "titlescreen_4.auto_delay_unit", ARG_DEFAULT },
{ "titlescreen_5.sort_priority", ARG_DEFAULT },
{ "titlescreen_5.fade_mode", ARG_DEFAULT },
{ "titlescreen_5.fade_delay", ARG_DEFAULT },
{ "titlescreen_5.post_delay", ARG_DEFAULT },
{ "titlescreen_5.auto_delay", ARG_DEFAULT },
+ { "titlescreen_5.auto_delay_unit", ARG_DEFAULT },
{ "[titlemessage_initial].x", "-1" },
{ "[titlemessage_initial].y", "-1" },
{ "[titlemessage_initial].fade_delay", ARG_DEFAULT },
{ "[titlemessage_initial].post_delay", ARG_DEFAULT },
{ "[titlemessage_initial].auto_delay", ARG_DEFAULT },
+ { "[titlemessage_initial].auto_delay_unit", ARG_DEFAULT },
{ "[titlemessage].x", "-1" },
{ "[titlemessage].y", "-1" },
{ "[titlemessage].width", "-1" },
{ "[titlemessage].fade_delay", ARG_DEFAULT },
{ "[titlemessage].post_delay", ARG_DEFAULT },
{ "[titlemessage].auto_delay", ARG_DEFAULT },
+ { "[titlemessage].auto_delay_unit", ARG_DEFAULT },
{ "titlemessage_initial_1.x", ARG_DEFAULT },
{ "titlemessage_initial_1.y", ARG_DEFAULT },
{ "titlemessage_initial_1.fade_delay", ARG_DEFAULT },
{ "titlemessage_initial_1.post_delay", ARG_DEFAULT },
{ "titlemessage_initial_1.auto_delay", ARG_DEFAULT },
+ { "titlemessage_initial_1.auto_delay_unit", ARG_DEFAULT },
{ "titlemessage_initial_2.x", ARG_DEFAULT },
{ "titlemessage_initial_2.y", ARG_DEFAULT },
{ "titlemessage_initial_2.width", ARG_DEFAULT },
{ "titlemessage_initial_2.fade_delay", ARG_DEFAULT },
{ "titlemessage_initial_2.post_delay", ARG_DEFAULT },
{ "titlemessage_initial_2.auto_delay", ARG_DEFAULT },
+ { "titlemessage_initial_2.auto_delay_unit", ARG_DEFAULT },
{ "titlemessage_initial_3.x", ARG_DEFAULT },
{ "titlemessage_initial_3.y", ARG_DEFAULT },
{ "titlemessage_initial_3.width", ARG_DEFAULT },
{ "titlemessage_initial_3.fade_delay", ARG_DEFAULT },
{ "titlemessage_initial_3.post_delay", ARG_DEFAULT },
{ "titlemessage_initial_3.auto_delay", ARG_DEFAULT },
+ { "titlemessage_initial_3.auto_delay_unit", ARG_DEFAULT },
{ "titlemessage_initial_4.x", ARG_DEFAULT },
{ "titlemessage_initial_4.y", ARG_DEFAULT },
{ "titlemessage_initial_4.width", ARG_DEFAULT },
{ "titlemessage_initial_4.fade_delay", ARG_DEFAULT },
{ "titlemessage_initial_4.post_delay", ARG_DEFAULT },
{ "titlemessage_initial_4.auto_delay", ARG_DEFAULT },
+ { "titlemessage_initial_4.auto_delay_unit", ARG_DEFAULT },
{ "titlemessage_initial_5.x", ARG_DEFAULT },
{ "titlemessage_initial_5.y", ARG_DEFAULT },
{ "titlemessage_initial_5.width", ARG_DEFAULT },
{ "titlemessage_initial_5.fade_delay", ARG_DEFAULT },
{ "titlemessage_initial_5.post_delay", ARG_DEFAULT },
{ "titlemessage_initial_5.auto_delay", ARG_DEFAULT },
+ { "titlemessage_initial_5.auto_delay_unit", ARG_DEFAULT },
{ "titlemessage_1.x", ARG_DEFAULT },
{ "titlemessage_1.y", ARG_DEFAULT },
{ "titlemessage_1.width", ARG_DEFAULT },
{ "titlemessage_1.fade_delay", ARG_DEFAULT },
{ "titlemessage_1.post_delay", ARG_DEFAULT },
{ "titlemessage_1.auto_delay", ARG_DEFAULT },
+ { "titlemessage_1.auto_delay_unit", ARG_DEFAULT },
{ "titlemessage_2.x", ARG_DEFAULT },
{ "titlemessage_2.y", ARG_DEFAULT },
{ "titlemessage_2.width", ARG_DEFAULT },
{ "titlemessage_2.fade_delay", ARG_DEFAULT },
{ "titlemessage_2.post_delay", ARG_DEFAULT },
{ "titlemessage_2.auto_delay", ARG_DEFAULT },
+ { "titlemessage_2.auto_delay_unit", ARG_DEFAULT },
{ "titlemessage_3.x", ARG_DEFAULT },
{ "titlemessage_3.y", ARG_DEFAULT },
{ "titlemessage_3.width", ARG_DEFAULT },
{ "titlemessage_3.fade_delay", ARG_DEFAULT },
{ "titlemessage_3.post_delay", ARG_DEFAULT },
{ "titlemessage_3.auto_delay", ARG_DEFAULT },
+ { "titlemessage_3.auto_delay_unit", ARG_DEFAULT },
{ "titlemessage_4.x", ARG_DEFAULT },
{ "titlemessage_4.y", ARG_DEFAULT },
{ "titlemessage_4.width", ARG_DEFAULT },
{ "titlemessage_4.fade_delay", ARG_DEFAULT },
{ "titlemessage_4.post_delay", ARG_DEFAULT },
{ "titlemessage_4.auto_delay", ARG_DEFAULT },
+ { "titlemessage_4.auto_delay_unit", ARG_DEFAULT },
{ "titlemessage_5.x", ARG_DEFAULT },
{ "titlemessage_5.y", ARG_DEFAULT },
{ "titlemessage_5.width", ARG_DEFAULT },
{ "titlemessage_5.fade_delay", ARG_DEFAULT },
{ "titlemessage_5.post_delay", ARG_DEFAULT },
{ "titlemessage_5.auto_delay", ARG_DEFAULT },
+ { "titlemessage_5.auto_delay_unit", ARG_DEFAULT },
{ "readme.x", "-1" },
{ "readme.y", "-1" },
{ "menu.enter_screen.TITLE.fade_delay", "500" },
{ "menu.enter_screen.TITLE.post_delay", "250" },
{ "menu.enter_screen.TITLE.auto_delay", "-1" },
+ { "menu.enter_screen.TITLE.auto_delay_unit", "-1" },
{ "menu.enter_screen.SCORES.fade_mode", ARG_DEFAULT },
{ "menu.enter_screen.SCORES.fade_delay", ARG_DEFAULT },
{ "menu.enter_screen.SCORES.post_delay", ARG_DEFAULT },
{ "menu.leave_screen.TITLE.fade_delay", "500" },
{ "menu.leave_screen.TITLE.post_delay", "250" },
{ "menu.leave_screen.TITLE.auto_delay", "-1" },
+ { "menu.leave_screen.TITLE.auto_delay_unit", "-1" },
{ "menu.leave_screen.SCORES.fade_mode", ARG_DEFAULT },
{ "menu.leave_screen.SCORES.fade_delay", ARG_DEFAULT },
{ "menu.leave_screen.SCORES.post_delay", ARG_DEFAULT },
{ "menu.next_screen.TITLE.fade_delay", "500" },
{ "menu.next_screen.TITLE.post_delay", "250" },
{ "menu.next_screen.TITLE.auto_delay", "-1" },
+ { "menu.next_screen.TITLE.auto_delay_unit", "-1" },
{ "menu.next_screen.INFO.fade_mode", ARG_DEFAULT },
{ "menu.next_screen.INFO.fade_delay", ARG_DEFAULT },
{ "menu.next_screen.INFO.post_delay", ARG_DEFAULT },
string_has_parameter(value, "curtain") ? FADE_MODE_CURTAIN :
FADE_MODE_DEFAULT);
}
+ else if (strEqual(suffix, ".auto_delay_unit"))
+ {
+ result = (string_has_parameter(value, "ms") ? AUTO_DELAY_UNIT_MS :
+ string_has_parameter(value, "frames") ? AUTO_DELAY_UNIT_FRAMES :
+ AUTO_DELAY_UNIT_DEFAULT);
+ }
else if (strPrefix(suffix, ".font")) // (may also be ".font_xyz")
{
result = gfx.get_font_from_token_function(value);
title_initial_first_default.post_delay;
titlescreen_initial_first_default.auto_delay =
title_initial_first_default.auto_delay;
+ titlescreen_initial_first_default.auto_delay_unit =
+ title_initial_first_default.auto_delay_unit;
titlescreen_first_default.fade_mode = title_first_default.fade_mode;
titlescreen_first_default.fade_delay = title_first_default.fade_delay;
titlescreen_first_default.post_delay = title_first_default.post_delay;
titlescreen_first_default.auto_delay = title_first_default.auto_delay;
+ titlescreen_first_default.auto_delay_unit =
+ title_first_default.auto_delay_unit;
titlemessage_initial_first_default.fade_mode =
title_initial_first_default.fade_mode;
titlemessage_initial_first_default.fade_delay =
title_initial_first_default.post_delay;
titlemessage_initial_first_default.auto_delay =
title_initial_first_default.auto_delay;
+ titlemessage_initial_first_default.auto_delay_unit =
+ title_initial_first_default.auto_delay_unit;
titlemessage_first_default.fade_mode = title_first_default.fade_mode;
titlemessage_first_default.fade_delay = title_first_default.fade_delay;
titlemessage_first_default.post_delay = title_first_default.post_delay;
titlemessage_first_default.auto_delay = title_first_default.auto_delay;
+ titlemessage_first_default.auto_delay_unit =
+ title_first_default.auto_delay_unit;
titlescreen_initial_default.fade_mode = title_initial_default.fade_mode;
titlescreen_initial_default.fade_delay = title_initial_default.fade_delay;
titlescreen_initial_default.post_delay = title_initial_default.post_delay;
titlescreen_initial_default.auto_delay = title_initial_default.auto_delay;
+ titlescreen_initial_default.auto_delay_unit =
+ title_initial_default.auto_delay_unit;
titlescreen_default.fade_mode = title_default.fade_mode;
titlescreen_default.fade_delay = title_default.fade_delay;
titlescreen_default.post_delay = title_default.post_delay;
titlescreen_default.auto_delay = title_default.auto_delay;
+ titlescreen_default.auto_delay_unit = title_default.auto_delay_unit;
titlemessage_initial_default.fade_mode = title_initial_default.fade_mode;
titlemessage_initial_default.fade_delay = title_initial_default.fade_delay;
titlemessage_initial_default.post_delay = title_initial_default.post_delay;
- titlemessage_initial_default.auto_delay = title_initial_default.auto_delay;
+ titlemessage_initial_default.auto_delay_unit =
+ title_initial_default.auto_delay_unit;
titlemessage_default.fade_mode = title_default.fade_mode;
titlemessage_default.fade_delay = title_default.fade_delay;
titlemessage_default.post_delay = title_default.post_delay;
titlemessage_default.auto_delay = title_default.auto_delay;
+ titlemessage_default.auto_delay_unit = title_default.auto_delay_unit;
// special case: initialize "ARG_DEFAULT" values in static default config
// (e.g., init "titlemessage_1.fade_mode" from "[titlemessage].fade_mode")
{ TYPE_INTEGER, &tfi.fade_delay, ".fade_delay" },
{ TYPE_INTEGER, &tfi.post_delay, ".post_delay" },
{ TYPE_INTEGER, &tfi.auto_delay, ".auto_delay" },
+ { TYPE_INTEGER, &tfi.auto_delay_unit, ".auto_delay_unit" },
{ -1, NULL, NULL }
};
{ TYPE_INTEGER, &tmi.fade_delay, ".fade_delay" },
{ TYPE_INTEGER, &tmi.post_delay, ".post_delay" },
{ TYPE_INTEGER, &tmi.auto_delay, ".auto_delay" },
+ { TYPE_INTEGER, &tmi.auto_delay_unit, ".auto_delay_unit" },
{ -1, NULL, NULL }
};