aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-06-09 17:24:23 +0000
committerbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-06-09 17:24:23 +0000
commite05f22457540a57341d50f713fb9ef1ea44b8efe (patch)
tree3f56e272c05078a7fff5d6c0b9b3866237daab6c
parentf0d4a99b65e3124a690763fc9875e73ae2226b2a (diff)
downloadusdx-e05f22457540a57341d50f713fb9ef1ea44b8efe.tar.gz
usdx-e05f22457540a57341d50f713fb9ef1ea44b8efe.tar.xz
usdx-e05f22457540a57341d50f713fb9ef1ea44b8efe.zip
- option disable video in singscreen with VideoEnabled=off
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2470 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--VideoPreview/src/base/UIni.pas12
-rw-r--r--VideoPreview/src/screens/UScreenSing.pas2
2 files changed, 13 insertions, 1 deletions
diff --git a/VideoPreview/src/base/UIni.pas b/VideoPreview/src/base/UIni.pas
index 41742843..dae72e47 100644
--- a/VideoPreview/src/base/UIni.pas
+++ b/VideoPreview/src/base/UIni.pas
@@ -122,6 +122,7 @@ type
Spectrograph: integer;
MovieSize: integer;
VideoPreview: integer;
+ VideoEnabled: integer;
// Sound
MicBoost: integer;
@@ -216,6 +217,7 @@ const
ISpectrograph: array[0..1] of UTF8String = ('Off', 'On');
IMovieSize: array[0..2] of UTF8String = ('Half', 'Full [Vid]', 'Full [BG+Vid]');
IVideoPreview: array[0..1] of UTF8String = ('Off', 'On');
+ IVideoEnabled: array[0..1] of UTF8String = ('Off', 'On');
IClickAssist: array[0..1] of UTF8String = ('Off', 'On');
IBeatClick: array[0..1] of UTF8String = ('Off', 'On');
@@ -298,6 +300,7 @@ var
ISpectrographTranslated: array[0..1] of UTF8String = ('Off', 'On');
IMovieSizeTranslated: array[0..2] of UTF8String = ('Half', 'Full [Vid]', 'Full [BG+Vid]');
IVideoPreviewTranslated: array[0..1] of UTF8String = ('Off', 'On');
+ IVideoEnabledTranslated: array[0..1] of UTF8String = ('Off', 'On');
IClickAssistTranslated: array[0..1] of UTF8String = ('Off', 'On');
IBeatClickTranslated: array[0..1] of UTF8String = ('Off', 'On');
@@ -421,6 +424,9 @@ begin
IVideoPreviewTranslated[0] := ULanguage.Language.Translate('OPTION_VALUE_OFF');
IVideoPreviewTranslated[1] := ULanguage.Language.Translate('OPTION_VALUE_ON');
+ IVideoEnabledTranslated[0] := ULanguage.Language.Translate('OPTION_VALUE_OFF');
+ IVideoEnabledTranslated[1] := ULanguage.Language.Translate('OPTION_VALUE_ON');
+
IClickAssistTranslated[0] := ULanguage.Language.Translate('OPTION_VALUE_OFF');
IClickAssistTranslated[1] := ULanguage.Language.Translate('OPTION_VALUE_ON');
@@ -939,6 +945,9 @@ begin
// VideoPreview
VideoPreview := GetArrayIndex(IVideoPreview, IniFile.ReadString('Graphics', 'VideoPreview', IVideoPreview[1]));
+ // VideoEnabled
+ VideoEnabled := GetArrayIndex(IVideoEnabled, IniFile.ReadString('Graphics', 'VideoEnabled', IVideoEnabled[1]));
+
// ClickAssist
ClickAssist := GetArrayIndex(IClickAssist, IniFile.ReadString('Sound', 'ClickAssist', 'Off'));
@@ -1089,6 +1098,9 @@ begin
// VideoPreview
IniFile.WriteString('Graphics', 'VideoPreview', IVideoPreview[VideoPreview]);
+ // VideoEnabled
+ IniFile.WriteString('Graphics', 'VideoEnabled', IVideoEnabled[VideoEnabled]);
+
// ClickAssist
IniFile.WriteString('Sound', 'ClickAssist', IClickAssist[ClickAssist]);
diff --git a/VideoPreview/src/screens/UScreenSing.pas b/VideoPreview/src/screens/UScreenSing.pas
index dc43881a..cc913181 100644
--- a/VideoPreview/src/screens/UScreenSing.pas
+++ b/VideoPreview/src/screens/UScreenSing.pas
@@ -498,7 +498,7 @@ begin
*}
fShowVisualization := false;
VideoFile := CurrentSong.Path.Append(CurrentSong.Video);
- if (CurrentSong.Video.IsSet) and VideoFile.IsFile then
+ if (Ini.VideoEnabled = 1) and CurrentSong.Video.IsSet() and VideoFile.IsFile then
begin
fVideoClip := VideoPlayback.Open(VideoFile);
fCurrentVideo := fVideoClip;