jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-17 21:24:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

BIG TCP Overhaul and passcode start

Browse Source 
- Switch to Serilog for console logging
- TCPSender is now persistent (let's hope) so can be used with passcode protected workspaces
- UDP connection works with passcodes just can't timeout
- Passcode prompt is automatic for workspaces that are password protected
This commit is contained in:
Joel Wetzell
2020-06-05 23:53:16 -05:00
parent 4eb84939ca
commit 9899a6d33e
25 changed files with 245 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qController.Standard/Classes/Communication/QParser.cs
+15 -6
View File
@@ -3,6 +3,8 @@ using SharpOSC;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using System.Collections.Generic;
using Serilog;
namespace qController
{
public class CueEventArgs : EventArgs
@@ -39,6 +41,12 @@ namespace qController
get;
set;
}
public string WorkspaceId
{
get;
set;
}
}
public class WorkspaceInfoArgs : EventArgs
@@ -102,7 +110,7 @@ namespace qController
else if (msg.Address.Contains("playbackPosition"))
ParsePositionUpdateInfo(msg);
else if (msg.Address.Contains("thump"))
Console.WriteLine("QPARSER - Heartbeat Received");
Log.Debug("QPARSER - Heartbeat Received");
else if (msg.Address.Contains("disconnect"))
OnWorkspaceDisconnect();
else if (msg.Address.Contains("connect"))
@@ -113,10 +121,10 @@ namespace qController
ParseQInfo(msg);
else
{
Console.WriteLine("QPARSER - Unkown message type: " + msg.Address);
Log.Debug("QPARSER - Unkown message type: " + msg.Address);
foreach (var item in msg.Arguments)
{
Console.WriteLine(item);
Log.Debug(item.ToString());
}
}
}
@@ -127,7 +135,8 @@ namespace qController
if (msg.Arguments.Count > 0)
{
JToken connectStatus = OSC2JSON(msg);
OnConnectionStatusChanged(connectStatus.ToString());
;
OnConnectionStatusChanged(connectStatus.ToString(), msg.Address.Split('/')[3]);
}
}
@@ -223,10 +232,10 @@ namespace qController
if (PlaybackPositionUpdated != null)
PlaybackPositionUpdated(this, new PlaybackPositionArgs() { PlaybackPosition = id });
}
protected virtual void OnConnectionStatusChanged(string status)
protected virtual void OnConnectionStatusChanged(string status, string workspace_id)
{
if (ConnectionStatusChanged != null)
ConnectionStatusChanged(this, new ConnectEventArgs() { Status = status });
ConnectionStatusChanged(this, new ConnectEventArgs() { Status = status, WorkspaceId = workspace_id });
}
protected virtual void OnChildrenUpdated(string id, List<QCue> cues)
{