From 554b2db6053b7a67947adc93c28aa41f68a393f1 Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 19 Feb 2010 21:15:27 +0000
Subject: added option for showing video in preview only

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2110 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Classes/UIni.pas                   | 2 +-
 Game/Code/Classes/UThemes.pas                | 4 ++--
 Game/Code/Screens/UScreenOptionsGraphics.pas | 2 +-
 Game/Code/Screens/UScreenSong.pas            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Game/Code')

diff --git a/Game/Code/Classes/UIni.pas b/Game/Code/Classes/UIni.pas
index 8e452dd5..9007744c 100644
--- a/Game/Code/Classes/UIni.pas
+++ b/Game/Code/Classes/UIni.pas
@@ -131,7 +131,7 @@ const
 
   ISpectrum:      array[0..1] of string = ('Off', 'On');
   ISpectrograph:  array[0..1] of string = ('Off', 'On');
-  IMovieSize:     array[0..2] of string = ('Half', 'Full', 'Off');
+  IMovieSize:     array[0..3] of string = ('Half', 'Full', 'Preview only', 'Off');
   IMoviePreview:  array[0..1] of string = ('Off', 'On');
   IAspectCorrect:    array[0..2] of String  = ('Stretch', 'Crop', 'LetterBox');
 
diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas
index c83e70c5..0b1eb484 100644
--- a/Game/Code/Classes/UThemes.pas
+++ b/Game/Code/Classes/UThemes.pas
@@ -464,7 +464,7 @@ type
     SelectDepth:            TThemeSelect;
     SelectOscilloscope:     TThemeSelect;
     SelectLineBonus:        TThemeSelect;
-    SelectMovieSize:        TThemeSelect;
+    SelectSlideMovieSize:   TThemeSelectSlide;
     SelectMoviePreview:     TThemeSelect;
     ButtonExit:             TThemeButton;
   end;
@@ -1348,7 +1348,7 @@ begin
       ThemeLoadSelect(OptionsGraphics.SelectDepth, 'OptionsGraphicsSelectDepth');
       ThemeLoadSelect(OptionsGraphics.SelectOscilloscope, 'OptionsGraphicsSelectOscilloscope');
       ThemeLoadSelect(OptionsGraphics.SelectLineBonus, 'OptionsGraphicsSelectLineBonus');
-      ThemeLoadSelect(OptionsGraphics.SelectMovieSize, 'OptionsGraphicsSelectMovieSize');
+      ThemeLoadSelectSlide(OptionsGraphics.SelectSlideMovieSize, 'OptionsGraphicsSelectSlideMovieSize');
       ThemeLoadSelect(OptionsGraphics.SelectMoviePreview, 'OptionsGraphicsSelectMoviePreview');
       ThemeLoadButton(OptionsGraphics.ButtonExit, 'OptionsGraphicsButtonExit');
 
diff --git a/Game/Code/Screens/UScreenOptionsGraphics.pas b/Game/Code/Screens/UScreenOptionsGraphics.pas
index 999fb054..688d95ad 100644
--- a/Game/Code/Screens/UScreenOptionsGraphics.pas
+++ b/Game/Code/Screens/UScreenOptionsGraphics.pas
@@ -87,7 +87,7 @@ begin
   AddSelect(Theme.OptionsGraphics.SelectFullscreen, Ini.Fullscreen, IFullscreen);
   AddSelect(Theme.OptionsGraphics.SelectDepth, Ini.Depth, IDepth);
   AddSelect(Theme.OptionsGraphics.SelectOscilloscope, Ini.Oscilloscope, IOscilloscope);
-  AddSelect(Theme.OptionsGraphics.SelectMovieSize, Ini.MovieSize, IMovieSize);
+  AddSelectSlide(Theme.OptionsGraphics.SelectSlideMovieSize, Ini.MovieSize, IMovieSize);
   AddSelect(Theme.OptionsGraphics.SelectMoviePreview, Ini.MoviePreview, IMoviePreview);
 
 
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 207e5de1..28541ac0 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -2297,7 +2297,7 @@ end;
 
 procedure TScreenSong.StartVideoPreview;
 begin
-  if (Ini.PreviewVolume <> 0) and (Ini.MovieSize < 2) then
+  if (Ini.PreviewVolume <> 0) and (Ini.MovieSize < 3) then
   begin
     if (NOT CatSongs.Song[Interaction].Main) AND (CatSongs.VisibleSongs > 0) then
     begin
-- 
cgit v1.2.3