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

Start cleaning up QParser

Browse Source
This commit is contained in:
jwetzell
2019-07-10 17:26:25 -05:00
parent d986d810bb
commit 979ddd7756
4 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qController.Standard/Classes/Communication/QClient.cs
+4 -18
View File
@@ -36,9 +36,12 @@ namespace qController
//one method for messages received whether from TCP or UDP (SAME MSG FORMAT) //one method for messages received whether from TCP or UDP (SAME MSG FORMAT)
private void OnMessageReceived(object source, MessageEventArgs args) private void OnMessageReceived(object source, MessageEventArgs args)
{ {
Console.WriteLine("QCLIENT MESSAGE RECEIVED: "+args.Message.Address);
//try to find a better filtering process //try to find a better filtering process
if (!args.Message.Address.Contains("update")) if (!args.Message.Address.Contains("update"))
qParser.ParseMessage(args.Message); qParser.ParseMessage(args.Message);
else if (args.Message.Address.Contains("playbackPosition") || args.Message.Address.Contains("cue_id") || args.Message.Address.Contains("cueList"))
qParser.ParseMessage(args.Message);
else else
ProcessUpdate(args.Message); ProcessUpdate(args.Message);
} }
@@ -106,24 +109,7 @@ namespace qController
public void ProcessUpdate(OscMessage msg) public void ProcessUpdate(OscMessage msg)
{ {
Console.WriteLine("PROCESS UPDATE : " + msg.Address); Console.WriteLine("PROCESS UPDATE : " + msg.Address);
if (msg.Address.Contains("disconnect")) if (msg.Address.Contains("workspace"))
{
qParser.ParseMessage(msg);
}
else if (msg.Address.Contains("cue_id"))
{
var updateID = msg.Address.Split('/').Last();
//UpdateSpecificCue(updateID);
}
else if (msg.Address.Contains("playbackPosition"))
{
if (msg.Arguments.Count > 0)
{
qParser.ParseMessage(msg);
//UpdateSelectedCue();
}
}
else if (msg.Address.Contains("workspace"))
{ {
UpdateWorkspace("not yet implemented"); UpdateWorkspace("not yet implemented");
} }
qController.Standard/Classes/Communication/QParser.cs
+1 -2
View File
@@ -113,8 +113,7 @@ namespace qController
ParseQInfo(msg); ParseQInfo(msg);
else else
{ {
Console.WriteLine("Unknown message type"); Console.WriteLine("QParser/Unknown message type: " + msg.Address);
Console.WriteLine(msg.Address);
foreach (var item in msg.Arguments) foreach (var item in msg.Arguments)
{ {
Console.WriteLine(item); Console.WriteLine(item);
qController.Standard/Classes/Communication/SharpOSC/TCPSender.cs
+2 -2
View File
@@ -78,7 +78,7 @@ namespace SharpOSC
//Console.WriteLine( "Thread " + num + ": Bytes read: " + bytesRead + " - " + Encoding.ASCII.GetString(buffer)); //Console.WriteLine( "Thread " + num + ": Bytes read: " + bytesRead + " - " + Encoding.ASCII.GetString(buffer));
} while (netStream.DataAvailable); } while (netStream.DataAvailable);
Console.WriteLine("Raw TCP In: " + System.Text.Encoding.ASCII.GetString(responseData.ToArray())); //Console.WriteLine("Raw TCP In: " + System.Text.Encoding.ASCII.GetString(responseData.ToArray()));
response = (OscMessage)OscPacket.GetPacket(responseData.Skip(1).ToArray()); response = (OscMessage)OscPacket.GetPacket(responseData.Skip(1).ToArray());
} }
} catch(Exception e) } catch(Exception e)
@@ -101,7 +101,7 @@ namespace SharpOSC
public void SendAndReceive(OscPacket packet) public void SendAndReceive(OscPacket packet)
{ {
OscMessage msg = (OscMessage)packet; OscMessage msg = (OscMessage)packet;
Console.WriteLine("TCP Message Sent: " + msg.Address); //Console.WriteLine("TCP Message Sent: " + msg.Address);
byte[] data = packet.GetBytes(); byte[] data = packet.GetBytes();
SendAndReceive(data); SendAndReceive(data);
} }
qController.Standard/Classes/Communication/SharpOSC/UDPListener.cs
Executable → Regular
+2 -2
View File
@@ -100,7 +100,7 @@ namespace SharpOSC
Console.WriteLine(e.ToString()); Console.WriteLine(e.ToString());
// If there is an error reading the packet, null is sent to the callback // If there is an error reading the packet, null is sent to the callback
} }
Console.WriteLine("Raw UDP In: " + System.Text.Encoding.ASCII.GetString(bytes)); //Console.WriteLine("Raw UDP In: " + System.Text.Encoding.ASCII.GetString(bytes));
OscPacketCallback(packet); OscPacketCallback(packet);
} }
else else
@@ -151,7 +151,7 @@ namespace SharpOSC
{ {
byte[] bytes = queue.Dequeue(); byte[] bytes = queue.Dequeue();
var packet = OscPacket.GetPacket(bytes); var packet = OscPacket.GetPacket(bytes);
Console.WriteLine("Raw UDP In: " + System.Text.Encoding.ASCII.GetString(bytes)); //Console.WriteLine("Raw UDP In: " + System.Text.Encoding.ASCII.GetString(bytes));
return packet; return packet;
} }
else else