From 1b816ea00f6a748710761bf0145aab84416bf14e Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Wed, 9 Jun 2010 16:06:17 +0000 Subject: - added "VideoPreview" option (on/off) - removed some test comments git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2468 b956fd51-792f-4845-bead-9b4dfca2ff2c --- VideoPreview/src/base/UIni.pas | 12 ++++++++++++ VideoPreview/src/screens/UScreenSing.pas | 11 ----------- VideoPreview/src/screens/UScreenSong.pas | 3 +++ 3 files changed, 15 insertions(+), 11 deletions(-) (limited to 'VideoPreview') diff --git a/VideoPreview/src/base/UIni.pas b/VideoPreview/src/base/UIni.pas index a4c85a3b..41742843 100644 --- a/VideoPreview/src/base/UIni.pas +++ b/VideoPreview/src/base/UIni.pas @@ -121,6 +121,7 @@ type Spectrum: integer; Spectrograph: integer; MovieSize: integer; + VideoPreview: integer; // Sound MicBoost: integer; @@ -214,6 +215,7 @@ const ISpectrum: array[0..1] of UTF8String = ('Off', 'On'); 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'); IClickAssist: array[0..1] of UTF8String = ('Off', 'On'); IBeatClick: array[0..1] of UTF8String = ('Off', 'On'); @@ -295,6 +297,7 @@ var ISpectrumTranslated: array[0..1] of UTF8String = ('Off', 'On'); 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'); IClickAssistTranslated: array[0..1] of UTF8String = ('Off', 'On'); IBeatClickTranslated: array[0..1] of UTF8String = ('Off', 'On'); @@ -415,6 +418,9 @@ begin IMovieSizeTranslated[1] := ULanguage.Language.Translate('OPTION_VALUE_FULL_VID'); IMovieSizeTranslated[2] := ULanguage.Language.Translate('OPTION_VALUE_FULL_VID_BG'); + IVideoPreviewTranslated[0] := ULanguage.Language.Translate('OPTION_VALUE_OFF'); + IVideoPreviewTranslated[1] := ULanguage.Language.Translate('OPTION_VALUE_ON'); + IClickAssistTranslated[0] := ULanguage.Language.Translate('OPTION_VALUE_OFF'); IClickAssistTranslated[1] := ULanguage.Language.Translate('OPTION_VALUE_ON'); @@ -930,6 +936,9 @@ begin // MovieSize MovieSize := GetArrayIndex(IMovieSize, IniFile.ReadString('Graphics', 'MovieSize', IMovieSize[2])); + // VideoPreview + VideoPreview := GetArrayIndex(IVideoPreview, IniFile.ReadString('Graphics', 'VideoPreview', IVideoPreview[1])); + // ClickAssist ClickAssist := GetArrayIndex(IClickAssist, IniFile.ReadString('Sound', 'ClickAssist', 'Off')); @@ -1077,6 +1086,9 @@ begin // Movie Size IniFile.WriteString('Graphics', 'MovieSize', IMovieSize[MovieSize]); + // VideoPreview + IniFile.WriteString('Graphics', 'VideoPreview', IVideoPreview[VideoPreview]); + // ClickAssist IniFile.WriteString('Sound', 'ClickAssist', IClickAssist[ClickAssist]); diff --git a/VideoPreview/src/screens/UScreenSing.pas b/VideoPreview/src/screens/UScreenSing.pas index 835cb2df..dc43881a 100644 --- a/VideoPreview/src/screens/UScreenSing.pas +++ b/VideoPreview/src/screens/UScreenSing.pas @@ -847,19 +847,8 @@ begin fCurrentVideo.GetFrame(VideoFrameTime); end; - //***** for testing: - {fCurrentVideo.SetScreenPosition(10, 10, 1); - fCurrentVideo.Width := 200; - fCurrentVideo.Height := 200; - fCurrentVideo.ReflectionSpacing := 10; - fCurrentVideo.Alpha := 1; - fCurrentVideo.AspectCorrection := acoLetterBox;} - //***** end testing - fCurrentVideo.SetScreen(ScreenAct); fCurrentVideo.Draw; - - //fCurrentVideo.DrawReflection; //just for testing, should be deleted! end; // draw static menu (FG) diff --git a/VideoPreview/src/screens/UScreenSong.pas b/VideoPreview/src/screens/UScreenSong.pas index d7f309c7..1171eaa9 100644 --- a/VideoPreview/src/screens/UScreenSong.pas +++ b/VideoPreview/src/screens/UScreenSong.pas @@ -1837,6 +1837,9 @@ var Song: TSong; begin + if (Ini.VideoPreview=0) then + Exit; + if Assigned(fCurrentVideo) then begin fCurrentVideo.Stop(); -- cgit v1.2.3