mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-16 05:05:00 +00:00
Bugfixes: HDMD4k4x1 code around toggle-switching; add source list evaluation when pressing share
This commit is contained in:
@@ -83,7 +83,10 @@ namespace PepperDash.Essentials.DM.Chassis
|
|||||||
|
|
||||||
public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
|
public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
|
||||||
{
|
{
|
||||||
Chassis.HdmiOutputs[1].VideoOut = Chassis.HdmiInputs[(uint)inputSelector];
|
// Try to make switch only when necessary. The unit appears to toggle when already selected.
|
||||||
|
var current = Chassis.HdmiOutputs[1].VideoOut;
|
||||||
|
if(current != Chassis.HdmiInputs[(uint)inputSelector])
|
||||||
|
Chassis.HdmiOutputs[1].VideoOut = Chassis.HdmiInputs[(uint)inputSelector];
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -4,5 +4,5 @@
|
|||||||
[assembly: AssemblyCompany("PepperDash Technology Corp")]
|
[assembly: AssemblyCompany("PepperDash Technology Corp")]
|
||||||
[assembly: AssemblyProduct("PepperDashEssentials")]
|
[assembly: AssemblyProduct("PepperDashEssentials")]
|
||||||
[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")]
|
[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")]
|
||||||
[assembly: AssemblyVersion("1.0.42.*")]
|
[assembly: AssemblyVersion("1.0.44.*")]
|
||||||
|
|
||||||
|
|||||||
@@ -658,6 +658,7 @@ namespace PepperDash.Essentials
|
|||||||
CurrentSourcePageManager.Show();
|
CurrentSourcePageManager.Show();
|
||||||
}
|
}
|
||||||
CurrentMode = UiDisplayMode.Presentation;
|
CurrentMode = UiDisplayMode.Presentation;
|
||||||
|
SetupSourceList();
|
||||||
SetActivityFooterFeedbacks();
|
SetActivityFooterFeedbacks();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -986,6 +987,7 @@ namespace PepperDash.Essentials
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
void SetupSourceList()
|
void SetupSourceList()
|
||||||
{
|
{
|
||||||
|
|
||||||
var inCall = CurrentRoom.InCallFeedback.BoolValue;
|
var inCall = CurrentRoom.InCallFeedback.BoolValue;
|
||||||
var config = ConfigReader.ConfigObject.SourceLists;
|
var config = ConfigReader.ConfigObject.SourceLists;
|
||||||
if (config.ContainsKey(_CurrentRoom.SourceListKey))
|
if (config.ContainsKey(_CurrentRoom.SourceListKey))
|
||||||
@@ -997,11 +999,14 @@ namespace PepperDash.Essentials
|
|||||||
foreach (var kvp in srcList)
|
foreach (var kvp in srcList)
|
||||||
{
|
{
|
||||||
var srcConfig = kvp.Value;
|
var srcConfig = kvp.Value;
|
||||||
|
Debug.Console(1, "**** {0}, {1}, {2}, {3}, {4}", srcConfig.PreferredName, srcConfig.IncludeInSourceList,
|
||||||
|
srcConfig.DisableCodecSharing, inCall, this.CurrentMode);
|
||||||
// Skip sources marked as not included, and filter list of non-sharable sources when in call
|
// Skip sources marked as not included, and filter list of non-sharable sources when in call
|
||||||
// or on share screen
|
// or on share screen
|
||||||
if (!srcConfig.IncludeInSourceList || (inCall && srcConfig.DisableCodecSharing)
|
if (!srcConfig.IncludeInSourceList || (inCall && srcConfig.DisableCodecSharing)
|
||||||
|| this.CurrentMode == UiDisplayMode.Call && srcConfig.DisableCodecSharing)
|
|| this.CurrentMode == UiDisplayMode.Call && srcConfig.DisableCodecSharing)
|
||||||
{
|
{
|
||||||
|
Debug.Console(1, "Skipping {0}", srcConfig.PreferredName);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user