diff --git a/src/cvars.cpp b/src/cvars.cpp index 39660dbba..0f1b04344 100644 --- a/src/cvars.cpp +++ b/src/cvars.cpp @@ -991,8 +991,8 @@ consvar_t cv_lossless_recorder = Player("lossless_recorder", "GIF").values(lossl consvar_t cv_movie_resolution = Player("movie_resolution", "Medium").values(movie_resolution_cons_t); static CV_PossibleValue_t movie_limit_cons_t[] = {{1, "MIN"}, {INT32_MAX, "MAX"}, {0, "Unlimited"}, {0, NULL}}; - consvar_t cv_movie_duration = Player("movie_duration", "Unlimited").floating_point().values(movie_limit_cons_t); - consvar_t cv_movie_size = Player("movie_size", "25.0").floating_point().values(movie_limit_cons_t); + consvar_t cv_movie_duration = Player("movie_duration", "Unlimited").floating_point().values(movie_limit_cons_t).step_amount(FRACUNIT); + consvar_t cv_movie_size = Player("movie_size", "25.0").floating_point().values(movie_limit_cons_t).step_amount(FRACUNIT); consvar_t cv_movie_fps = Player("movie_fps", "60").values(CV_Natural); consvar_t cv_movie_showfps = Player("movie_showfps", "Yes").yes_no(); diff --git a/src/menus/options-data-screenshots.c b/src/menus/options-data-screenshots.c index 3dcd92afe..ec84cebac 100644 --- a/src/menus/options-data-screenshots.c +++ b/src/menus/options-data-screenshots.c @@ -10,17 +10,35 @@ menuitem_t OPTIONS_DataScreenshot[] = { #ifdef SRB2_CONFIG_ENABLE_WEBM_MOVIES - {IT_HEADER, "MOVIE RECORDING (F9)", NULL, + {IT_HEADER, "Movie Recording (F9)", NULL, + NULL, {NULL}, 0, 0}, + + {IT_STRING | IT_CVAR, "Max. Duration (s)", "Automatically stop recording after this much time.", + NULL, {.cvar = &cv_movie_duration}, 0, 0}, + + {IT_STRING | IT_CVAR, "Max. File Size (MB)", "Automatically stop recording when the video file reaches this size.", + NULL, {.cvar = &cv_movie_size}, 0, 0}, + + {IT_SPACE | IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0}, {IT_STRING | IT_CVAR, "Real-Time Data", "If enabled, shows fps, duration and filesize of recording in real-time.", NULL, {.cvar = &cv_movie_showfps}, 0, 0}, -#endif - {IT_SPACE | IT_NOTHING, NULL, NULL, + {IT_SPACE | IT_NOTHING, NULL, NULL, NULL, {NULL}, 0, 0}, - {IT_HEADER, "LOSSLESS RECORDING (F10)", NULL, + {IT_STRING | IT_CVAR, "Resolution", "Video resolution", + NULL, {.cvar = &cv_movie_resolution}, 0, 0}, + + {IT_STRING | IT_CVAR, "Max. FPS", "Video framerate", + NULL, {.cvar = &cv_movie_fps}, 0, 0}, + + {IT_STRING | IT_CVAR, "Record Audio", "Record audio.", + NULL, {.cvar = &cv_movie_sound}, 0, 0}, +#endif + + {IT_HEADER, "Lossless Recording (F10)", NULL, NULL, {NULL}, 0, 0}, {IT_STRING | IT_CVAR, "Recording Format", "What file format will lossless recordings use?",