Revert "[Port] TTS (#121)"

This reverts commit 0db8f3a.
WWhiteDreamProject · Dec 5, 2024 · 15b35a1 · 15b35a1
1 parent 6e3e3e0
commit 15b35a1
Show file tree

Hide file tree

Showing 43 changed files with 2 additions and 5,276 deletions.
diff --git a/Content.Client/Audio/ContentAudioSystem.cs b/Content.Client/Audio/ContentAudioSystem.cs
@@ -30,7 +30,6 @@ public sealed partial class ContentAudioSystem : SharedContentAudioSystem
     public const float LobbyMultiplier = 3f;
     public const float InterfaceMultiplier = 2f;
     public const float AnnouncerMultiplier = 3f;
-    public const float TTSMultiplier = 1f; // WD EDIT
 
     public override void Initialize()
     {

diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
@@ -1,4 +1,3 @@
-using Content.Client._White.TTS;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -73,7 +72,6 @@ public sealed class EntryPoint : GameClient
         [Dependency] private readonly ILogManager _logManager = default!;
         [Dependency] private readonly JoinQueueManager _joinQueue = default!;
         [Dependency] private readonly DiscordAuthManager _discordAuth = default!;
-        [Dependency] private readonly TTSManager _ttsManager = default!; // WD EDIT
 
         public override void Init()
         {
@@ -168,7 +166,6 @@ public override void PostInit()
             _documentParsingManager.Initialize();
             _joinQueue.Initialize();
             _discordAuth.Initialize();
-            _ttsManager.Initialize(); // WD EDIT
 
             _baseClient.RunLevelChanged += (_, args) =>
             {

diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
@@ -1,4 +1,3 @@
-using Content.Client._White.TTS;
 using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
@@ -53,7 +52,6 @@ public static void Register()
             collection.Register<ISharedPlaytimeManager, JobRequirementsManager>();
             IoCManager.Register<JoinQueueManager>();
             IoCManager.Register<DiscordAuthManager>();
-            IoCManager.Register<TTSManager>(); // WD EDIT
         }
     }
 }
diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
@@ -80,15 +80,6 @@
                                     <Control HorizontalExpand="True"/>
                                     <OptionButton Name="SexButton" HorizontalAlignment="Right" />
                                 </BoxContainer>
-                                <!--WD EDIT START-->
-                                <!--TTS-->
-                                <BoxContainer HorizontalExpand="True">
-                                    <Label Text="{Loc 'humanoid-profile-editor-voice-label'}" />
-                                    <Control HorizontalExpand="True"/>
-                                    <OptionButton Name="VoiceButton" HorizontalAlignment="Right" />
-                                    <Button Name="VoicePlayButton" Text="▶" MaxWidth="80" />
-                                </BoxContainer>
-                                <!--WD EDIT END-->
                                 <!-- Pronouns -->
                                 <BoxContainer HorizontalExpand="True">
                                     <Label Text="{Loc 'humanoid-profile-editor-pronouns-label'}" />

diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
@@ -149,14 +149,6 @@ public HumanoidProfileEditor(
 
             #endregion Sex
 
-            // WD EDIT START
-            #region Voice
-
-            InitializeVoice();
-
-            #endregion
-            // WD EDIT END
-
             #region Age
 
             AgeEdit.OnTextChanged += args =>
@@ -644,7 +636,6 @@ public void SetProfile(HumanoidCharacterProfile? profile, int? slot)
 
             UpdateNameEdit();
             UpdateSexControls();
-            UpdateTTSVoicesControls(); // WD EDIT
             UpdateGenderControls();
             UpdateSkinColor();
             UpdateSpawnPriorityControls();
@@ -1138,19 +1129,10 @@ private void SetSex(Sex newSex)
             }
             UpdateGenderControls();
             Markings.SetSex(newSex);
-            UpdateTTSVoicesControls(); // WD EDIT
             ReloadProfilePreview();
             SetDirty();
         }
 
-        // WD EDIT START
-        private void SetVoice(string newVoice)
-        {
-            Profile = Profile?.WithVoice(newVoice);
-            IsDirty = true;
-        }
-        // WD EDIT END
-
         private void SetGender(Gender newGender)
         {
             Profile = Profile?.WithGender(newGender);

diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml b/Content.Client/Options/UI/Tabs/AudioTab.xaml
@@ -48,21 +48,6 @@
                     <Label Name="AmbientMusicVolumeLabel" MinSize="48 0" Align="Right" />
                     <Control MinSize="4 0"/>
                 </BoxContainer>
-                <!--WD EDIT START-->
-                <BoxContainer Orientation="Horizontal" Margin="5 0 0 0">
-                    <Label Text="{Loc 'ui-options-tts-volume'}" HorizontalExpand="True" />
-                    <Control MinSize="8 0" />
-                    <Slider Name="TtsVolumeSlider"
-                            MinValue="0"
-                            MaxValue="200"
-                            HorizontalExpand="True"
-                            MinSize="80 0"
-                            Rounded="True" />
-                    <Control MinSize="8 0" />
-                    <Label Name="TtsVolumeLabel" MinSize="48 0" Align="Right" />
-                    <Control MinSize="4 0" />
-                </BoxContainer>
-                <!--WD EDIT END-->
                 <BoxContainer Orientation="Horizontal" Margin="5 0 0 0">
                     <Label Text="{Loc 'ui-options-ambience-volume'}" HorizontalExpand="True" />
                     <Control MinSize="8 0" />

diff --git a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
@@ -1,5 +1,4 @@
 using Content.Client.Audio;
-using Content.Shared._White;
 using Content.Shared.CCVar;
 using Robust.Client.Audio;
 using Robust.Client.AutoGenerated;
@@ -41,7 +40,6 @@ public AudioTab()
                 LobbyVolumeSlider,
                 InterfaceVolumeSlider,
                 AnnouncerVolumeSlider,
-                TtsVolumeSlider, // WD EDIT
 
                 LobbyMusicCheckBox,
                 RestartSoundsCheckBox,
@@ -127,7 +125,6 @@ private void OnApplyButtonPressed(BaseButton.ButtonEventArgs args)
             _cfg.SetCVar(CCVars.LobbyMusicVolume, LobbyVolumeSlider.Value / 100f * ContentAudioSystem.LobbyMultiplier);
             _cfg.SetCVar(CCVars.InterfaceVolume, InterfaceVolumeSlider.Value / 100f * ContentAudioSystem.InterfaceMultiplier);
             _cfg.SetCVar(CCVars.AnnouncerVolume, AnnouncerVolumeSlider.Value / 100f * ContentAudioSystem.AnnouncerMultiplier);
-            _cfg.SetCVar(WhiteCVars.TtsVolume, TtsVolumeSlider.Value  / 100f * ContentAudioSystem.TTSMultiplier); // WD EDIT
 
             _cfg.SetCVar(CCVars.MaxAmbientSources, (int)AmbienceSoundsSlider.Value);
 
@@ -154,7 +151,6 @@ private void Reset()
             LobbyVolumeSlider.Value = _cfg.GetCVar(CCVars.LobbyMusicVolume) * 100f / ContentAudioSystem.LobbyMultiplier;
             InterfaceVolumeSlider.Value = _cfg.GetCVar(CCVars.InterfaceVolume) * 100f / ContentAudioSystem.InterfaceMultiplier;
             AnnouncerVolumeSlider.Value = _cfg.GetCVar(CCVars.AnnouncerVolume) * 100f / ContentAudioSystem.AnnouncerMultiplier;
-            TtsVolumeSlider.Value = _cfg.GetCVar(WhiteCVars.TtsVolume) * 100f / ContentAudioSystem.TTSMultiplier; // WD EDIT
 
             AmbienceSoundsSlider.Value = _cfg.GetCVar(CCVars.MaxAmbientSources);
 

diff --git a/Content.Client/_White/TTS/HumanoidProfileEditor.TTS.cs b/Content.Client/_White/TTS/HumanoidProfileEditor.TTS.cs
diff --git a/Content.Client/_White/TTS/TTSManager.cs b/Content.Client/_White/TTS/TTSManager.cs
diff --git a/Content.Client/_White/TTS/TTSSystem.cs b/Content.Client/_White/TTS/TTSSystem.cs
diff --git a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
@@ -45,7 +45,6 @@ private static HumanoidCharacterProfile CharlieCharlieson()
                 Species = "Human",
                 Customspeciename = "",
                 Age = 21,
-                Voice = "Eugene", // WD EDIT
                 Appearance = new(
                     "Afro",
                     Color.Aqua,