Skip to content

Commit 82d3746

Browse files
committed
Remove unused properties.
1 parent f8620b0 commit 82d3746

3 files changed

Lines changed: 7 additions & 9 deletions

File tree

SpeechService/SpeechService.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public SpeechService()
142142
if (IsWindowsMediaSynthesizerSupported())
143143
{
144144
// Prep the Windows.Media.SpeechSynthesis synthesizer
145-
windowsMediaSynth = new WindowsMediaSynthesizer(ref voiceStore, lexiconSchemas);
145+
windowsMediaSynth = new WindowsMediaSynthesizer(ref voiceStore);
146146
}
147147
}
148148
catch (Exception e)
@@ -153,7 +153,7 @@ public SpeechService()
153153
// Prep the System.Speech synthesizer
154154
try
155155
{
156-
systemSpeechSynth = new SystemSpeechSynthesizer( ref voiceStore, lexiconSchemas );
156+
systemSpeechSynth = new SystemSpeechSynthesizer( ref voiceStore );
157157
}
158158
catch ( ThreadAbortException )
159159
{
@@ -827,7 +827,7 @@ public class VoiceDetails : IEquatable<VoiceDetails>
827827
internal string cultureTwoLetterISOLanguageName;
828828
internal string cultureIetfLanguageTag;
829829

830-
internal VoiceDetails( string displayName, string gender, CultureInfo Culture, string synthType, XmlSchemaSet lexiconSchemas )
830+
internal VoiceDetails( string displayName, string gender, CultureInfo Culture, string synthType )
831831
{
832832
this.name = displayName;
833833
this.gender = gender;

SpeechService/SpeechSynthesizers/SystemSpeechSynthesizer.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.Linq;
77
using System.Speech.Synthesis;
88
using System.Threading.Tasks;
9-
using System.Xml.Schema;
109
using Utilities;
1110

1211
namespace EddiSpeechService.SpeechSynthesizers
@@ -28,7 +27,7 @@ internal string currentVoice
2827
}
2928
}
3029

31-
public SystemSpeechSynthesizer ( ref HashSet<VoiceDetails> voiceStore, XmlSchemaSet lexiconSchemas )
30+
public SystemSpeechSynthesizer ( ref HashSet<VoiceDetails> voiceStore )
3231
{
3332
bool TrySystemVoice ( VoiceDetails voiceDetails )
3433
{
@@ -69,7 +68,7 @@ bool TrySystemVoice ( VoiceDetails voiceDetails )
6968
Logging.Debug( $"Found voice: {voice.VoiceInfo.Name}", voice.VoiceInfo );
7069

7170
var voiceDetails = new VoiceDetails( voice.VoiceInfo.Name, voice.VoiceInfo.Gender.ToString(),
72-
voice.VoiceInfo.Culture ?? CultureInfo.InvariantCulture, nameof(System), lexiconSchemas );
71+
voice.VoiceInfo.Culture ?? CultureInfo.InvariantCulture, nameof(System) );
7372

7473
// Skip duplicates of voices already added from Windows.Media.SpeechSynthesis
7574
// (for example, if OneCore voices have been added to System.Speech with a registry edit)

SpeechService/SpeechSynthesizers/WindowsMediaSynthesizer.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Linq;
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using System.Xml.Schema;
1110
using Utilities;
1211
using Windows.Media.SpeechSynthesis;
1312

@@ -30,7 +29,7 @@ internal string currentVoice
3029
}
3130
}
3231

33-
public WindowsMediaSynthesizer (ref HashSet<VoiceDetails> voiceStore, XmlSchemaSet lexiconSchemas)
32+
public WindowsMediaSynthesizer (ref HashSet<VoiceDetails> voiceStore)
3433
{
3534
bool TryOneCoreVoiceRegistry( VoiceDetails voiceDetails )
3635
{
@@ -84,7 +83,7 @@ bool TryOneCoreVoiceSpeech ( VoiceDetails voiceDetails )
8483
Logging.Debug($"Found voice: {voice.DisplayName}", voice);
8584

8685
var voiceDetails = new VoiceDetails(voice.DisplayName, voice.Gender.ToString(),
87-
CultureInfo.GetCultureInfo(voice.Language), nameof(Windows.Media), lexiconSchemas);
86+
CultureInfo.GetCultureInfo(voice.Language), nameof(Windows.Media));
8887

8988
// Skip voices which are not fully registered
9089
if (!TryOneCoreVoiceRegistry(voiceDetails) || !TryOneCoreVoiceSpeech(voiceDetails))

0 commit comments

Comments
 (0)