SDL: added --subtitles argument (mostly for avi capturing, I guess)
This commit is contained in:
parent
c7a24fe74f
commit
7fcd1f8683
|
@ -1,3 +1,4 @@
|
|||
15-max-2009 - shinydoofy - sdl - added --subtitles
|
||||
10-may-2009 - shinydoofy - sdl - fixed Four Score movie playback
|
||||
02-may-2009 - adelikat - win32 - stop movie at frame x feature - fixed off by 1 error
|
||||
23-apr-2009 - shinydoofy - sdl - added --ripsubs for converting fm2 movie subtitles to an srt file
|
||||
|
|
|
@ -194,6 +194,7 @@ InitConfig()
|
|||
|
||||
// video playback
|
||||
config->addOption("playmov", "SDL.Movie", "");
|
||||
config->addOption("subtitles", "SDL.SubtitleDisplay", 1);
|
||||
|
||||
#ifdef _S9XLUA_H
|
||||
// load lua script
|
||||
|
|
|
@ -114,6 +114,7 @@ char *DriverUsage="\
|
|||
--pauseframe x Pauses movie playback at frame x.\n\
|
||||
--fcmconvert f Converts fcm movie file f to fm2.\n\
|
||||
--ripsubs f Converts movie's subtitles to srt\n\
|
||||
--subtitles {0,1} Enables subtitle display\n\
|
||||
--no-config {0,1} Don't change the config file";
|
||||
|
||||
/* Moved network options out while netplay is broken.
|
||||
|
@ -668,6 +669,9 @@ SDL_GL_LoadLibrary(0);
|
|||
g_config->getOption("SDL.InputDisplay", &id);
|
||||
extern int input_display;
|
||||
input_display = id;
|
||||
g_config->getOption("SDL.SubtitleDisplay", &id); // not exactly an id as an true/false switch; still better than creating another int for that
|
||||
extern int movieSubtitles;
|
||||
movieSubtitles = id;
|
||||
}
|
||||
|
||||
// load the hotkeys from the config life
|
||||
|
|
Loading…
Reference in New Issue