Merge pull request #3741 from keveleigh/speech-system-ifs

Update #if wrappings around speech providers

Author: keveleigh

Assets/MixedRealityToolkit.Providers/WindowsVoiceInput/WindowsDictationInputProvider.cs

@@ -13,8 +13,6 @@
 
 namespace Microsoft.MixedReality.Toolkit.Windows.Input
 {
-#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
-
     [MixedRealityExtensionService(SupportedPlatforms.WindowsStandalone | SupportedPlatforms.WindowsUniversal | SupportedPlatforms.WindowsEditor)]
     public class WindowsDictationInputProvider : BaseDeviceManager, IMixedRealityDictationSystem
     {
@@ -31,11 +29,10 @@ public WindowsDictationInputProvider(
             uint priority = DefaultPriority,
             BaseMixedRealityProfile profile = null) : base(registrar, name, priority, profile) { }
 
-        /// <summary>
-        /// Is the Dictation Manager currently running?
-        /// </summary>
+        /// <inheritdoc />
         public bool IsListening { get; private set; } = false;
 
+#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
         private bool hasFailed;
         private bool hasListener;
         private bool isTransitioning;
@@ -130,6 +127,7 @@ public override async void Disable()
             }
         }
 
+        /// <inheritdoc />
         public override void Destroy()
         {
             if (Application.isPlaying)
@@ -297,6 +295,6 @@ private void DictationRecognizer_DictationError(string error, int hresult)
             textSoFar = null;
             dictationResult = string.Empty;
         }
-    }
 #endif // UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
+    }
 }

Assets/MixedRealityToolkit.Providers/WindowsVoiceInput/WindowsSpeechInputProvider.cs

@@ -3,18 +3,16 @@
 
 using Microsoft.MixedReality.Toolkit.Input;
 using Microsoft.MixedReality.Toolkit.Utilities;
-using System;
-using UnityEngine;
-using UInput = UnityEngine.Input;
 
 #if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
+using System;
+using UnityEngine;
 using UnityEngine.Windows.Speech;
+using UInput = UnityEngine.Input;
 #endif // UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
 
 namespace Microsoft.MixedReality.Toolkit.Windows.Input
 {
-#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
-
     [MixedRealityExtensionService(SupportedPlatforms.WindowsStandalone | SupportedPlatforms.WindowsUniversal | SupportedPlatforms.WindowsEditor)]
     public class WindowsSpeechInputProvider : BaseDeviceManager, IMixedRealitySpeechSystem
     {
@@ -26,9 +24,9 @@ public class WindowsSpeechInputProvider : BaseDeviceManager, IMixedRealitySpeech
         /// <param name="priority">Service priority. Used to determine order of instantiation.</param>
         /// <param name="profile">The service's configuration profile.</param>
         public WindowsSpeechInputProvider(
-            IMixedRealityServiceRegistrar registrar, 
-            string name = null, 
-            uint priority = DefaultPriority, 
+            IMixedRealityServiceRegistrar registrar,
+            string name = null,
+            uint priority = DefaultPriority,
             BaseMixedRealityProfile profile = null) : base(registrar, name, priority, profile) { }
 
         /// <summary>
@@ -41,6 +39,12 @@ public WindowsSpeechInputProvider(
         /// </summary>
         public IMixedRealityInputSource InputSource = null;
 
+        /// <summary>
+        /// The minimum confidence level for the recognizer to fire an event.
+        /// </summary>
+        public RecognitionConfidenceLevel RecognitionConfidenceLevel { get; set; }
+
+#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
         private KeywordRecognizer keywordRecognizer;
 
         /// <inheritdoc />
@@ -49,8 +53,6 @@ public bool IsRecognitionActive
             get { return keywordRecognizer != null && keywordRecognizer.IsRunning; }
         }
 
-        public RecognitionConfidenceLevel RecognitionConfidenceLevel { get; set; }
-
         /// <inheritdoc />
         public override void Enable()
         {
@@ -135,6 +137,6 @@ private void OnPhraseRecognized(ConfidenceLevel confidence, TimeSpan phraseDurat
                 }
             }
         }
-    }
 #endif // UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
+    }
 }

Assets/MixedRealityToolkit/Interfaces/Devices/IMixedRealityDictationSystem.cs

@@ -12,7 +12,7 @@ namespace Microsoft.MixedReality.Toolkit.Input
     public interface IMixedRealityDictationSystem : IMixedRealityDeviceManager, IMixedRealityExtensionService
     {
         /// <summary>
-        /// Is the system currently listing to dictation input?
+        /// Is the system currently listing for dictation input?
         /// </summary>
         bool IsListening { get; }