Skip to content

Commit d56eb4d

Browse files
Merge pull request #2678 from StephenHodgson/vNEXT-SpeechCleanup
Removed unneeded platform specific compiler definitions.
2 parents a651cd0 + 1bfde55 commit d56eb4d

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

Assets/MixedRealityToolkit-SDK/Features/Input/MixedRealityInputManager.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,9 @@ public class MixedRealityInputManager : MixedRealityEventManager, IMixedRealityI
6363
private InputEventData<Quaternion> rotationInputEventData;
6464
private InputEventData<MixedRealityPose> poseInputEventData;
6565

66-
#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
67-
6866
private SpeechEventData speechEventData;
6967
private DictationEventData dictationEventData;
7068

71-
#endif // UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
72-
7369
/// <summary>
7470
/// Current Speech Input Source.
7571
/// </summary>
@@ -197,13 +193,9 @@ private void InitializeInternal()
197193
rotationInputEventData = new InputEventData<Quaternion>(EventSystem.current);
198194
poseInputEventData = new InputEventData<MixedRealityPose>(EventSystem.current);
199195

200-
#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
201-
202196
speechEventData = new SpeechEventData(EventSystem.current);
203197
dictationEventData = new DictationEventData(EventSystem.current);
204198

205-
#endif // UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
206-
207199
if (MixedRealityManager.Instance.ActiveProfile.IsSpeechCommandsEnabled)
208200
{
209201
SpeechInputSource = new SpeechInputSource(
@@ -1449,8 +1441,6 @@ public void RaiseManipulationCanceled(IMixedRealityInputSource source, Handednes
14491441

14501442
#endregion Gestures
14511443

1452-
#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
1453-
14541444
#region Speech Keyword Events
14551445

14561446
private static readonly ExecuteEvents.EventFunction<IMixedRealitySpeechHandler> OnSpeechKeywordRecognizedEventHandler =
@@ -1544,8 +1534,6 @@ public void RaiseDictationError(IMixedRealityInputSource source, string dictatio
15441534

15451535
#endregion Dictation Events
15461536

1547-
#endif // UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
1548-
15491537
#endregion Input Events
15501538
}
15511539
}

Assets/MixedRealityToolkit/_Core/Interfaces/InputSystem/IMixedRealityInputSystem.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -610,9 +610,6 @@ public interface IMixedRealityInputSystem : IMixedRealityEventSystem
610610

611611
#endregion Manipulation Events
612612

613-
#region Windows Speech
614-
#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
615-
616613
#region Speech Keyword Events
617614

618615
/// <summary>
@@ -665,9 +662,6 @@ public interface IMixedRealityInputSystem : IMixedRealityEventSystem
665662

666663
#endregion Dictation Events
667664

668-
#endif // UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
669-
#endregion Windows Speech
670-
671665
#endregion Input Events
672666
}
673667
}

0 commit comments

Comments
 (0)