diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-01-01 19:17:11 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-01-01 19:17:11 +0000 |
| commit | a7831486a4bbd6710fdfcea7e7236b38335f8b2b (patch) | |
| tree | 1e74da0ce5eac203816dcf50fca83bd3dd592c48 /src/screens | |
| parent | a13a4c743872c24471054a05d00867e680e5c71c (diff) | |
| download | usdx-a7831486a4bbd6710fdfcea7e7236b38335f8b2b.tar.gz usdx-a7831486a4bbd6710fdfcea7e7236b38335f8b2b.tar.xz usdx-a7831486a4bbd6710fdfcea7e7236b38335f8b2b.zip | |
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
Diffstat (limited to 'src/screens')
| -rw-r--r-- | src/screens/UScreenOptionsRecord.pas | 13 | ||||
| -rw-r--r-- | src/screens/UScreenOptionsSound.pas | 10 |
2 files changed, 11 insertions, 12 deletions
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); |