jwetzell/QControlKit
1
0
Fork 0
mirror of https://github.com/jwetzell/QControlKit.git synced 2026-08-18 05:34:06 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

* QDefines.cs: Make QDefines public

Browse Source 
* QControlKit.csproj: Bump Version

* QWorkspace.cs: Allow for selection "none" and root cue updates

* AppDelegate.cs: Change to Debug Log Level
This commit is contained in:
Joel Wetzell
2021-02-13 09:44:47 -05:00
parent 81e606bcaf
commit c4383c26e7
4 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
QControlKit/Constants/QDefines.cs
+5 -3
View File
@@ -1,12 +1,12 @@
namespace QControlKit.Constants namespace QControlKit.Constants
{ {
static class QBonjour public static class QBonjour
{ {
public const string TCPService = "_qlab._tcp.local."; public const string TCPService = "_qlab._tcp.local.";
public const string UDPService = "_qlab._udp.local."; public const string UDPService = "_qlab._udp.local.";
} }
static class QCueType public static class QCueType
{ {
public const string Cue = "Cue"; public const string Cue = "Cue";
public const string CueList = "Cue List"; public const string CueList = "Cue List";
@@ -115,11 +115,13 @@
public const string FullScreen = "fullScreen"; public const string FullScreen = "fullScreen";
} }
static class QIdentifiers public static class QIdentifiers
{ {
// Identifiers for "fake" cues // Identifiers for "fake" cues
public const string RootCue = "__root__"; public const string RootCue = "__root__";
public const string ActiveCues = "__active__"; public const string ActiveCues = "__active__";
public const string NoSelection = "none";
public const string RootCueUpdate = "[root group of cue lists]";
} }
QControlKit/QControlKit.csproj
+1 -1
View File
@@ -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.11</PackageVersion> <PackageVersion>0.0.16</PackageVersion>
<PackageId>QControlKit</PackageId> <PackageId>QControlKit</PackageId>
</PropertyGroup> </PropertyGroup>
QControlKit/QWorkspace.cs
+28 -18
View File
@@ -526,24 +526,19 @@ namespace QControlKit
private void OnCueListChangedPlaybackPosition(object source, QCueListChangedPlaybackPositionArgs args) private void OnCueListChangedPlaybackPosition(object source, QCueListChangedPlaybackPositionArgs args)
{ {
QCue cueList = cueWithID(args.cueListID); if (!args.cueID.Equals(QIdentifiers.NoSelection))
if (cueList == null)
return;
if (cueList.ignoreUpdates)
return;
cueList.setProperty(args.cueID, QOSCKey.PlaybackPositionId, false);
QCue selectedCue = cueWithID(args.cueID);
//TODO: need to implement when playbackposition is "none"
if (selectedCue != null)
{ {
Log.Debug($"[workspace] cue list <{cueList.displayName}> playback position changed to <{selectedCue.displayName}>"); QCue cueList = cueWithID(args.cueListID);
CueListChangedPlaybackPosition?.Invoke(this, new QCueListChangedPlaybackPositionArgs { cueListID = cueList.uid, cueID = selectedCue.uid }); if (cueList == null)
return;
if (cueList.ignoreUpdates)
return;
cueList.setProperty(args.cueID, QOSCKey.PlaybackPositionId, false);
} }
//TODO: need to implement when playbackposition is "none"
Log.Debug($"[workspace] cue list <{args.cueListID}> playback position changed to <{args.cueID}>");
CueListChangedPlaybackPosition?.Invoke(this, new QCueListChangedPlaybackPositionArgs { cueListID = args.cueListID, cueID = args.cueID });
} }
@@ -554,11 +549,26 @@ namespace QControlKit
private void OnCueNeedsUpdated(object source, QCueNeedsUpdatedArgs args) private void OnCueNeedsUpdated(object source, QCueNeedsUpdatedArgs args)
{ {
QCue cueToUpdate = cueWithID(args.cueID); if (args.cueID.Equals(QIdentifiers.RootCueUpdate))
if (cueToUpdate == null) {
Log.Debug("[workspace] root cue update requested, updating all cue lists");
foreach (var cuelist in this.cueLists)
{
if (!cuelist.uid.Equals(QIdentifiers.ActiveCues))
OnCueNeedsUpdated(this, new QCueNeedsUpdatedArgs { cueID = cuelist.uid });
}
return; return;
}
else
{
QCue cueToUpdate = cueWithID(args.cueID);
if (cueToUpdate == null)
return;
fetchBasicPropertiesForCue(cueToUpdate);
}
fetchBasicPropertiesForCue(cueToUpdate);
} }
private void OnCueUpdated(object source, QCueUpdatedArgs args) private void OnCueUpdated(object source, QCueUpdatedArgs args)
QControlKitXamDemo/QControlKitXamDemo.iOS/AppDelegate.cs
+1 -1
View File
@@ -23,7 +23,7 @@ namespace QControlKitXamDemo.iOS
public override bool FinishedLaunching(UIApplication app, NSDictionary options) public override bool FinishedLaunching(UIApplication app, NSDictionary options)
{ {
global::Xamarin.Forms.Forms.Init(); global::Xamarin.Forms.Forms.Init();
Log.Logger = new LoggerConfiguration().WriteTo.NSLog().MinimumLevel.Information().CreateLogger(); Log.Logger = new LoggerConfiguration().WriteTo.NSLog().MinimumLevel.Debug().CreateLogger();
LoadApplication(new App()); LoadApplication(new App());
return base.FinishedLaunching(app, options); return base.FinishedLaunching(app, options);