From a7831486a4bbd6710fdfcea7e7236b38335f8b2b Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 1 Jan 2014 19:17:11 +0000
Subject: Move the threshold and mic-boost options from sound to record.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3068 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/base/UThemes.pas                 |  8 ++++----
 src/screens/UScreenOptionsRecord.pas | 13 +++++++++++--
 src/screens/UScreenOptionsSound.pas  | 10 ----------
 3 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/base/UThemes.pas b/src/base/UThemes.pas
index 7dd30f7f..c90c7982 100644
--- a/src/base/UThemes.pas
+++ b/src/base/UThemes.pas
@@ -461,11 +461,9 @@ type
   end;
 
   TThemeOptionsSound = class(TThemeBasic)
-    SelectMicBoost:              TThemeSelectSlide;
     SelectBackgroundMusic:       TThemeSelectSlide;
     SelectClickAssist:           TThemeSelectSlide;
     SelectBeatClick:             TThemeSelectSlide;
-    SelectThreshold:             TThemeSelectSlide;
     SelectSlidePreviewVolume:    TThemeSelectSlide;
     SelectSlidePreviewFading:    TThemeSelectSlide;
     SelectSlideVoicePassthrough: TThemeSelectSlide;
@@ -491,6 +489,8 @@ type
     SelectSlideCard:       TThemeSelectSlide;
     SelectSlideInput:      TThemeSelectSlide;
     SelectSlideChannel:    TThemeSelectSlide;
+    SelectThreshold:       TThemeSelectSlide;
+    SelectMicBoost:        TThemeSelectSlide;
     ButtonExit:            TThemeButton;
   end;
 
@@ -1342,10 +1342,8 @@ begin
       ThemeLoadBasic(OptionsSound, 'OptionsSound');
 
       ThemeLoadSelectSlide(OptionsSound.SelectBackgroundMusic,       'OptionsSoundSelectBackgroundMusic');
-      ThemeLoadSelectSlide(OptionsSound.SelectMicBoost,              'OptionsSoundSelectMicBoost');
       ThemeLoadSelectSlide(OptionsSound.SelectClickAssist,           'OptionsSoundSelectClickAssist');
       ThemeLoadSelectSlide(OptionsSound.SelectBeatClick,             'OptionsSoundSelectBeatClick');
-      ThemeLoadSelectSlide(OptionsSound.SelectThreshold,             'OptionsSoundSelectThreshold');
       //Song Preview
       ThemeLoadSelectSlide(OptionsSound.SelectSlidePreviewVolume,    'OptionsSoundSelectSlidePreviewVolume');
       ThemeLoadSelectSlide(OptionsSound.SelectSlidePreviewFading,    'OptionsSoundSelectSlidePreviewFading');
@@ -1376,6 +1374,8 @@ begin
       ThemeLoadSelectSlide(OptionsRecord.SelectSlideCard,     'OptionsRecordSelectSlideCard');
       ThemeLoadSelectSlide(OptionsRecord.SelectSlideInput,    'OptionsRecordSelectSlideInput');
       ThemeLoadSelectSlide(OptionsRecord.SelectSlideChannel,  'OptionsRecordSelectSlideChannel');
+      ThemeLoadSelectSlide(OptionsRecord.SelectThreshold,     'OptionsRecordSelectThreshold');
+      ThemeLoadSelectSlide(OptionsRecord.SelectMicBoost,      'OptionsRecordSelectMicBoost');
       ThemeLoadButton(OptionsRecord.ButtonExit,               'OptionsRecordButtonExit');
 
       //Options Advanced
diff --git a/src/screens/UScreenOptionsRecord.pas b/src/screens/UScreenOptionsRecord.pas
index 7af598e5..38b75f5d 100644
--- a/src/screens/UScreenOptionsRecord.pas
+++ b/src/screens/UScreenOptionsRecord.pas
@@ -338,6 +338,15 @@ begin
         SelectsS[SelectSlideChannelID[ChannelIndex]].Visible := false;
       end;
     end;
+
+    Theme.OptionsRecord.SelectThreshold.showArrows := true;
+    Theme.OptionsRecord.SelectThreshold.oneItemOnly := true;
+    AddSelectSlide(Theme.OptionsRecord.SelectThreshold, Ini.ThresholdIndex, IThreshold);
+
+    Theme.OptionsRecord.SelectMicBoost.showArrows := true;
+    Theme.OptionsRecord.SelectMicBoost.oneItemOnly := true;
+    AddSelectSlide(Theme.OptionsRecord.SelectMicBoost, Ini.MicBoost, IMicBoostTranslated);
+
   end;
 
   // add Exit-button
@@ -346,9 +355,9 @@ begin
     AddButtonText(20, 5, Theme.Options.Description[7]);
   // store InteractionID
   if (Length(AudioInputProcessor.DeviceList) > 0) then
-    ExitButtonIID := MaxChannelCount + 2
+    ExitButtonIID := MaxChannelCount + 4
   else
-    ExitButtonIID := 0;
+    ExitButtonIID := 2;
 
   // set focus
   Interaction := 0;
diff --git a/src/screens/UScreenOptionsSound.pas b/src/screens/UScreenOptionsSound.pas
index c0efa4d8..ae502946 100644
--- a/src/screens/UScreenOptionsSound.pas
+++ b/src/screens/UScreenOptionsSound.pas
@@ -145,12 +145,6 @@ begin
   Theme.OptionsSound.SelectBackgroundMusic.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsSound.SelectBackgroundMusic, Ini.BackgroundMusicOption, IBackgroundMusicTranslated);
 
-  // TODO: - MicBoost needs to be moved to ScreenOptionsRecord
-  Theme.OptionsSound.SelectMicBoost.showArrows := true;
-  Theme.OptionsSound.SelectMicBoost.oneItemOnly := true;
-  AddSelectSlide(Theme.OptionsSound.SelectMicBoost, Ini.MicBoost, IMicBoostTranslated);
-
-
   Theme.OptionsSound.SelectClickAssist.showArrows := true;
   Theme.OptionsSound.SelectClickAssist.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsSound.SelectClickAssist, Ini.ClickAssist, IClickAssistTranslated);
@@ -159,10 +153,6 @@ begin
   Theme.OptionsSound.SelectBeatClick.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsSound.SelectBeatClick, Ini.BeatClick, IBeatClickTranslated);
 
-  Theme.OptionsSound.SelectThreshold.showArrows := true;
-  Theme.OptionsSound.SelectThreshold.oneItemOnly := true;
-  AddSelectSlide(Theme.OptionsSound.SelectThreshold, Ini.ThresholdIndex, IThreshold);
-
   Theme.OptionsSound.SelectSlidePreviewVolume.showArrows := true;
   Theme.OptionsSound.SelectSlidePreviewVolume.oneItemOnly := true;
   AddSelectSlide(Theme.OptionsSound.SelectSlidePreviewVolume, Ini.PreviewVolume, IPreviewVolumeTranslated);
-- 
cgit v1.2.3