mirror of
https://github.com/jwetzell/QControlKit.git
synced 2026-08-22 15:39:08 +00:00
* QMessage.cs:
* QWorkspace.cs: * QEventHandlers.cs: Cleanup * QControlKit.csproj: * QControlKitXamDemo.csproj: * QControlKitXamDemo.iOS.csproj: * QControlKitXamDemo.Android.csproj: Update packages
This commit is contained in:
@@ -1,4 +1,6 @@
|
|||||||
namespace QControlKit.Events
|
using System;
|
||||||
|
|
||||||
|
namespace QControlKit.Events
|
||||||
{
|
{
|
||||||
public delegate void QServerFoundHandler(object source, QServerFoundArgs args);
|
public delegate void QServerFoundHandler(object source, QServerFoundArgs args);
|
||||||
public delegate void QServerLostHandler(object source, QServerLostArgs args);
|
public delegate void QServerLostHandler(object source, QServerLostArgs args);
|
||||||
@@ -16,7 +18,6 @@
|
|||||||
public delegate void QWorkspaceConnectionErrorHandler(object source, QWorkspaceConnectionErrorArgs args);
|
public delegate void QWorkspaceConnectionErrorHandler(object source, QWorkspaceConnectionErrorArgs args);
|
||||||
public delegate void QQLabPreferencesUpdatedHandler(object source, QQLabPreferencesUpdatedArgs args);
|
public delegate void QQLabPreferencesUpdatedHandler(object source, QQLabPreferencesUpdatedArgs args);
|
||||||
|
|
||||||
|
|
||||||
public delegate void QCueUpdatedHandler(object source, QCueUpdatedArgs args);
|
public delegate void QCueUpdatedHandler(object source, QCueUpdatedArgs args);
|
||||||
public delegate void QCuePropertiesUpdatedHandler(object source, QCuePropertiesUpdatedArgs args);
|
public delegate void QCuePropertiesUpdatedHandler(object source, QCuePropertiesUpdatedArgs args);
|
||||||
public delegate void QCueListsUpdatesHandler(object source, QCueListsUpdatedArgs args);
|
public delegate void QCueListsUpdatesHandler(object source, QCueListsUpdatedArgs args);
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<Authors>Joel Wetzell</Authors>
|
<Authors>Joel Wetzell</Authors>
|
||||||
<Version>1.0.0-devel</Version>
|
<Version>1.0.0-devel</Version>
|
||||||
<PackOnBuild>true</PackOnBuild>
|
<PackOnBuild>true</PackOnBuild>
|
||||||
<PackageVersion>0.0.20</PackageVersion>
|
<PackageVersion>0.0.21</PackageVersion>
|
||||||
<PackageId>QControlKit</PackageId>
|
<PackageId>QControlKit</PackageId>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
<Summary>Unofficial C# port of Figure53's QLabKit.objc</Summary>
|
<Summary>Unofficial C# port of Figure53's QLabKit.objc</Summary>
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ namespace QControlKit
|
|||||||
return (parts.Length == 4 && parts[3].Equals("connect"));
|
return (parts.Length == 4 && parts[3].Equals("connect"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
//host method
|
//host method
|
||||||
|
|||||||
@@ -24,9 +24,6 @@ namespace QControlKit
|
|||||||
|
|
||||||
private QCue root;
|
private QCue root;
|
||||||
|
|
||||||
private Timer heartbeatTimer;
|
|
||||||
private int heartbeatAttempts;
|
|
||||||
|
|
||||||
public bool defaultSendUpdatesOSC;
|
public bool defaultSendUpdatesOSC;
|
||||||
|
|
||||||
public string version;
|
public string version;
|
||||||
@@ -38,7 +35,6 @@ namespace QControlKit
|
|||||||
public event QWorkspaceDisconnectedHandler WorkspaceDisconnected;
|
public event QWorkspaceDisconnectedHandler WorkspaceDisconnected;
|
||||||
public event QWorkspaceConnectedHandler WorkspaceConnected;
|
public event QWorkspaceConnectedHandler WorkspaceConnected;
|
||||||
|
|
||||||
|
|
||||||
private void Init()
|
private void Init()
|
||||||
{
|
{
|
||||||
name = "";
|
name = "";
|
||||||
@@ -219,8 +215,6 @@ namespace QControlKit
|
|||||||
Log.Information($"[workspace] disconnecting from <{name}>");
|
Log.Information($"[workspace] disconnecting from <{name}>");
|
||||||
if (!connected)
|
if (!connected)
|
||||||
return;
|
return;
|
||||||
if (heartbeatTimer != null)
|
|
||||||
stopHeartbeat();
|
|
||||||
stopReceivingUpdates();
|
stopReceivingUpdates();
|
||||||
disconnectFromWorkspace();
|
disconnectFromWorkspace();
|
||||||
|
|
||||||
@@ -269,39 +263,7 @@ namespace QControlKit
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Heartbeat
|
#region Heartbeat
|
||||||
//TODO
|
//TODO? Do I even need this if I only allow TCP and just watch for a change in the state of the TCP connection
|
||||||
public void startHeartbeat()
|
|
||||||
{
|
|
||||||
clearHeartbeatTimeout();
|
|
||||||
sendHeartbeat();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void stopHeartbeat()
|
|
||||||
{
|
|
||||||
clearHeartbeatTimeout();
|
|
||||||
heartbeatAttempts = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void clearHeartbeatTimeout()
|
|
||||||
{
|
|
||||||
heartbeatTimer.Stop();
|
|
||||||
heartbeatTimer = null;
|
|
||||||
heartbeatAttempts = 0;
|
|
||||||
//TODO
|
|
||||||
}
|
|
||||||
|
|
||||||
public void sendHeartbeat()
|
|
||||||
{
|
|
||||||
client.sendMessage("/thump");
|
|
||||||
//TODO
|
|
||||||
}
|
|
||||||
|
|
||||||
public void heartbeatTimeout(object sender, ElapsedEventArgs e)
|
|
||||||
{
|
|
||||||
//TODO
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
<PackageReference Include="Serilog.Sinks.Xamarin">
|
<PackageReference Include="Serilog.Sinks.Xamarin">
|
||||||
<Version>0.2.0.64</Version>
|
<Version>0.2.0.64</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2244" />
|
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2291" />
|
||||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -131,7 +131,7 @@
|
|||||||
<PackageReference Include="Serilog.Sinks.Xamarin">
|
<PackageReference Include="Serilog.Sinks.Xamarin">
|
||||||
<Version>0.2.0.64</Version>
|
<Version>0.2.0.64</Version>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2244" />
|
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2291" />
|
||||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Serilog" Version="2.10.0" />
|
<PackageReference Include="Serilog" Version="2.10.0" />
|
||||||
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2244" />
|
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2291" />
|
||||||
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
<PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user