jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-15 04:13:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust UI

Browse Source
This commit is contained in:
jwetzell
2019-04-05 14:57:46 -05:00
parent 6bc1c3b15c
commit b02e2ef4bc
10 changed files with 118 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qController.Standard/Classes/Communication/QClient.cs
+16 -14
View File
@@ -6,12 +6,19 @@ namespace qController
public class QClient
{
TCPSender tcpSender;
UDPSender udpSender;
public QParser qParser;
public QClient(string address, int port)
{
qParser = new QParser();
tcpSender = new TCPSender(address, port);
udpSender = new UDPSender(address, port);
tcpSender.MessageReceived += OnMessageReceived;
}
private void OnMessageReceived(object source, MessageEventArgs args)
{
qParser.ParseMessage(args.Message);
}
public void sendString(string address)
@@ -19,6 +26,11 @@ namespace qController
tcpSender.Send(new OscMessage(address));
}
public void sendArgs(string address, object args)
{
tcpSender.Send(new OscMessage(address, args));
}
public OscMessage sendAndReceiveString(string address)
{
return tcpSender.SendAndReceive(new OscMessage(address));
@@ -29,17 +41,7 @@ namespace qController
return tcpSender.SendAndReceive(new OscMessage(address, args));
}
public void sendStringUDP(string address)
{
udpSender.Send(new OscMessage(address));
}
public void sendArgs(string address, object args)
{
tcpSender.Send(new OscMessage(address, args));
}
public void sendArgsUDP(string address, object args)
{
udpSender.Send(new OscMessage(address, args));
}
}
}
qController.Standard/Classes/Communication/QController.cs
+3 -8
View File
@@ -9,7 +9,6 @@ namespace qController
{
QUpdater qUpdater;
public QParser qParser;
QCue selectedCue;
public QClient qClient;
QWorkSpace qWorkspace;
@@ -17,12 +16,12 @@ namespace qController
{
qClient = new QClient(address, port);
qParser = new QParser();
qUpdater = new QUpdater(this);
qUpdater.Start();
qParser.SelectedCueUpdated += this.OnSelectedCueUpdated;
qParser.WorkspaceUpdated += this.OnWorkspaceUpdated;
qClient.qParser.SelectedCueUpdated += this.OnSelectedCueUpdated;
qClient.qParser.WorkspaceUpdated += this.OnWorkspaceUpdated;
}
@@ -31,10 +30,6 @@ namespace qController
qClient.sendString(cmd);
}
public void sendCommandUDP(string cmd)
{
qClient.sendStringUDP(cmd);
}
public void updateCueValue(QCue cue, string property, object newValue){
// qSender.sendArgs("/cue_id/"+cue.uniqueID+"/"+property, newValue);
}
qController.Standard/Classes/Communication/QParser.cs
+14 -10
View File
@@ -46,16 +46,20 @@ namespace qController
public event WorkspaceUpdatedHandler WorkspaceUpdated;
public void ParseMessage(OscMessage msg){
if (msg.Address.Contains("selectedCues"))
ParseSelectedCueInfo(msg);
else if (msg.Address.Contains("notes"))
ParseNoteInfo(msg);
else if (msg.Address.Contains("levels"))
ParseLevelInfo(msg);
else if (msg.Address.Contains("cueLists"))
ParseWorkspaceInfo(msg);
else
Console.WriteLine(msg.Address);
if (!msg.Address.Contains("null"))
{
if (msg.Address.Contains("selectedCues"))
ParseSelectedCueInfo(msg);
else if (msg.Address.Contains("notes"))
ParseNoteInfo(msg);
else if (msg.Address.Contains("levels"))
ParseLevelInfo(msg);
else if (msg.Address.Contains("cueLists"))
ParseWorkspaceInfo(msg);
else
Console.WriteLine(msg.Address);
}
}
public void ParseSelectedCueInfo(OscMessage msg){
JArray selectedCues = (JArray)OSC2JSON(msg);
qController.Standard/Classes/Communication/QSender.cs
+7 -10
View File
@@ -7,29 +7,26 @@ namespace qController
public class QSender
{
TCPSender tcpSender;
UDPSender udpSender;
public QSender(string address, int port)
{
tcpSender = new TCPSender(address, port);
udpSender = new UDPSender(address, port);
tcpSender.MessageReceived += OnMessageReceived;
}
void OnMessageReceived(object source, MessageEventArgs args)
{
Console.WriteLine("New Message Received");
}
public void sendString(string address) {
tcpSender.Send(new OscMessage(address));
}
public void sendStringUDP(string address)
{
udpSender.Send(new OscMessage(address));
}
public void sendArgs(string address, object args){
tcpSender.Send(new OscMessage(address, args));
}
public void sendArgsUDP(string address, object args)
{
udpSender.Send(new OscMessage(address, args));
}
}
}
qController.Standard/Classes/Communication/QUpdater.cs
+2 -2
View File
@@ -25,11 +25,11 @@ namespace qController
public void UpdateSelected()
{
qController.qParser.ParseMessage(qController.qClient.sendAndReceiveString("/selectedCues"));
qController.qClient.sendAndReceiveString("/selectedCues");
}
public void UpdateLevels()
{
qController.qParser.ParseMessage(qController.qClient.sendAndReceiveString("/cue/selected/levels"));
qController.qClient.sendAndReceiveString("/cue/selected/levels");
}
public void Kill(){
qController.Standard/Classes/Communication/SharpOSC/TCPSender.cs
+19
View File
@@ -7,6 +7,15 @@ using System.Threading;
namespace SharpOSC
{
public class MessageEventArgs : EventArgs
{
public OscMessage Message
{
get;
set;
}
}
public class TCPSender
{
public int Port
@@ -19,6 +28,9 @@ namespace SharpOSC
{
get { return _address; }
}
public delegate void MessageReceivedHandler(object source, MessageEventArgs args);
public event MessageReceivedHandler MessageReceived;
string _address;
TcpClient client;
Thread receivingThread;
@@ -88,6 +100,7 @@ namespace SharpOSC
{
byte[] data = packet.GetBytes();
OscMessage response = SendAndReceive(data);
OnMessageReceived(response);
return response;
}
public void StartReceiving()
@@ -135,5 +148,11 @@ namespace SharpOSC
receivingThread.Abort();
client.Close();
}
protected virtual void OnMessageReceived(OscMessage msg)
{
if (MessageReceived != null)
MessageReceived(this, new MessageEventArgs() { Message = msg });
}
}
}