pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 13:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/bugfix/ecs-541-1' into bugfix/ecs-535

Browse Source
This commit is contained in:
Heath Volmer
2017-10-23 07:26:06 -06:00
parent 0ac439be14 23fb8311fe
commit 1d8924bc48
1 changed files with 90 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
View File

@@ -97,6 +97,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// <param name="codec"></param> /// <param name="codec"></param>
public EssentialsVideoCodecUiDriver(BasicTriListWithSmartObject triList, IAVDriver parent, VideoCodecBase codec) public EssentialsVideoCodecUiDriver(BasicTriListWithSmartObject triList, IAVDriver parent, VideoCodecBase codec)
: base(triList) : base(triList)
{
try
{ {
if (codec == null) if (codec == null)
throw new ArgumentNullException("Codec cannot be null"); throw new ArgumentNullException("Codec cannot be null");
@@ -122,7 +124,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
LocalPrivacyIsMuted = new BoolFeedback(() => false); LocalPrivacyIsMuted = new BoolFeedback(() => false);
VCControlsInterlock = new JoinedSigInterlock(triList); VCControlsInterlock = new JoinedSigInterlock(triList);
if(CodecHasFavorites) if (CodecHasFavorites)
VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadWithFavoritesVisible); VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadWithFavoritesVisible);
else else
VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadVisible); VCControlsInterlock.SetButDontShow(UIBoolJoin.VCKeypadVisible);
@@ -187,6 +189,11 @@ namespace PepperDash.Essentials.UIDrivers.VC
TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, Codec.StopSharing); TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, Codec.StopSharing);
} }
catch (Exception e)
{
Debug.Console(1, "Exception in VideoCodecUiDriver Constructor: {0}", e);
}
}
/// <summary> /// <summary>
/// Updates the current shared source label on the call list when the source changes /// Updates the current shared source label on the call list when the source changes
@@ -272,7 +279,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
ShowKeypad(); ShowKeypad();
DialStringBuilder.Remove(0, DialStringBuilder.Length); DialStringBuilder.Remove(0, DialStringBuilder.Length);
DialStringFeedback.FireUpdate(); DialStringFeedback.FireUpdate();
Parent.ShowNotificationRibbon("Disonnected", 2000); Parent.ShowNotificationRibbon("Disconnected", 2000);
} }
break; break;
case eCodecCallStatus.Disconnecting: case eCodecCallStatus.Disconnecting: