refactor(extOSC): update some code, removed obsolete methods

Iam1337 · Jul 22, 2021 · 5a8b8e1 · 5a8b8e1
1 parent 123e2be
commit 5a8b8e1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/Assets/extOSC/Scripts/Core/OSCBase.cs b/Assets/extOSC/Scripts/Core/OSCBase.cs
@@ -1,5 +1,7 @@
 /* Copyright (c) 2021 dr. ext (Vladimir Sigalkin) */
 
+using System;
+
 using UnityEngine;
 using UnityEngine.Serialization;
 
@@ -25,12 +27,6 @@ public OSCMapBundle MapBundle
 			set => _mapBundle = value;
 		}
 
-        public bool WorkInEditor
-        {
-            get => _workInEditor;
-			set => _workInEditor = value;
-		}
-
         public bool CloseOnPause
         {
             get => _closeOnPause;
@@ -39,6 +35,13 @@ public bool CloseOnPause
 
         public abstract bool IsStarted { get; }
 
+        [Obsolete]
+        public bool WorkInEditor
+        {
+	        get => _workInEditor;
+	        set => _workInEditor = value;
+        }
+
         #endregion
 
         #region Private Vars

diff --git a/Assets/extOSC/Scripts/OSCReceiver.cs b/Assets/extOSC/Scripts/OSCReceiver.cs
@@ -40,7 +40,7 @@ public OSCLocalHostMode LocalHostMode
 
 		public string LocalHost
 		{
-			get => RequestLocalHost();
+			get => GetLocalHost();
 			set
 			{
 				if (_localHost == value)
@@ -172,12 +172,12 @@ protected void OnValidate()
 
 		public override string ToString()
 		{
-			return $"<{GetType().Name} (LocalHost: {_localHost} LocalPort: {_localPort})>";
+			return $"<{nameof(OSCReceiver)} (LocalHost: {_localHost} LocalPort: {_localPort})>";
 		}
 
 		public override void Connect()
 		{
-			_receiverBackend.Connect(RequestLocalHost(), _localPort);
+			_receiverBackend.Connect(GetLocalHost(), _localPort);
 		}
 
 		public override void Close()
@@ -363,8 +363,7 @@ private void PacketReceived(IOSCPacket packet)
 			}
 		}
 
-
-		private string RequestLocalHost()
+		private string GetLocalHost()
 		{
 			return _localHostMode == OSCLocalHostMode.Any ? "0.0.0.0" : _localHost;
 		}

diff --git a/Assets/extOSC/Scripts/OSCTransmitter.cs b/Assets/extOSC/Scripts/OSCTransmitter.cs
@@ -62,7 +62,7 @@ public OSCReceiver SourceReceiver
 
 		public string LocalHost
 		{
-			get => RequestLocalHost();
+			get => GetLocalHost();
 			set
 			{
 				if (_localHost == value)
@@ -76,7 +76,7 @@ public string LocalHost
 
 		public int LocalPort
 		{
-			get => RequestLocalPort();
+			get => GetLocalPort();
 			set
 			{
 				if (_localPort == value)
@@ -217,7 +217,7 @@ protected void OnValidate()
 
 		public override void Connect()
 		{
-			_transmitterBackend.Connect(RequestLocalHost(), RequestLocalPort());
+			_transmitterBackend.Connect(GetLocalHost(), GetLocalPort());
 			_transmitterBackend.RefreshRemote(_remoteHost, _remotePort);
 		}
 
@@ -229,7 +229,7 @@ public override void Close()
 
 		public override string ToString()
 		{
-			return $"<{GetType().Name} (LocalHost: {_localHost} LocalPort: {_localPort} | RemoteHost: {_remoteHost}, RemotePort: {_remotePort})>";
+			return $"<{nameof(OSCTransmitter)} (LocalHost: {_localHost} LocalPort: {_localPort} | RemoteHost: {_remoteHost}, RemotePort: {_remotePort})>";
 		}
 
 		public void Send(IOSCPacket packet, OSCSendOptions options = OSCSendOptions.None)
@@ -278,7 +278,7 @@ private void RemoteRefresh()
 			_transmitterBackend.RefreshRemote(_remoteHost, _remotePort);
 		}
 
-		private string RequestLocalHost()
+		private string GetLocalHost()
 		{
 			if (_localReceiver != null)
 				return _localReceiver.LocalHost;
@@ -289,7 +289,7 @@ private string RequestLocalHost()
 			return _localHost;
 		}
 
-		private int RequestLocalPort()
+		private int GetLocalPort()
 		{
 			if (_localReceiver != null)
 				return _localReceiver.LocalPort;