mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-04-13 20:47:04 +00:00
Updates IMobileControl interface. Adds VideoCodec.StopSharing() to EndShutdown() method in Vtc1 room
This commit is contained in:
parent
3d224496a8
commit
5c63a49071
4 changed files with 161 additions and 146 deletions
|
|
@ -383,6 +383,7 @@ namespace PepperDash.Essentials
|
||||||
protected override void EndShutdown()
|
protected override void EndShutdown()
|
||||||
{
|
{
|
||||||
VideoCodec.EndAllCalls();
|
VideoCodec.EndAllCalls();
|
||||||
|
VideoCodec.StopSharing();
|
||||||
|
|
||||||
SetDefaultLevels();
|
SetDefaultLevels();
|
||||||
|
|
||||||
|
|
@ -652,6 +653,7 @@ namespace PepperDash.Essentials
|
||||||
dest.ReleaseRoute();
|
dest.ReleaseRoute();
|
||||||
if (dest is IHasPowerControl)
|
if (dest is IHasPowerControl)
|
||||||
(dest as IHasPowerControl).PowerOff();
|
(dest as IHasPowerControl).PowerOff();
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
|
||||||
|
|
||||||
void LinkSystemMonitorToAppServer();
|
void LinkSystemMonitorToAppServer();
|
||||||
|
|
||||||
|
IMobileControl GetAppServer();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -26,6 +26,8 @@ namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
|
||||||
|
|
||||||
string QrCodeUrl { get; }
|
string QrCodeUrl { get; }
|
||||||
|
|
||||||
|
string QrCodeChecksum { get; }
|
||||||
|
|
||||||
string McServerUrl { get; }
|
string McServerUrl { get; }
|
||||||
|
|
||||||
string RoomName { get; }
|
string RoomName { get; }
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ using System.Text;
|
||||||
using Crestron.SimplSharp.CrestronIO;
|
using Crestron.SimplSharp.CrestronIO;
|
||||||
using Crestron.SimplSharp.Ssh;
|
using Crestron.SimplSharp.Ssh;
|
||||||
using Crestron.SimplSharpPro.DeviceSupport;
|
using Crestron.SimplSharpPro.DeviceSupport;
|
||||||
|
using Crestron.SimplSharp;
|
||||||
using PepperDash.Core;
|
using PepperDash.Core;
|
||||||
using PepperDash.Core.Intersystem;
|
using PepperDash.Core.Intersystem;
|
||||||
using PepperDash.Core.Intersystem.Tokens;
|
using PepperDash.Core.Intersystem.Tokens;
|
||||||
|
|
@ -231,12 +232,22 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected void SetIsReady()
|
protected void SetIsReady()
|
||||||
{
|
{
|
||||||
IsReady = true;
|
CrestronInvoke.BeginInvoke( (o) =>
|
||||||
var h = IsReadyChange;
|
{
|
||||||
if (h != null)
|
try
|
||||||
{
|
{
|
||||||
h(this, new EventArgs());
|
IsReady = true;
|
||||||
}
|
var h = IsReadyChange;
|
||||||
|
if (h != null)
|
||||||
|
{
|
||||||
|
h(this, new EventArgs());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Debug.Console(2, this, "Error in SetIsReady() : {0}", e);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// **** DEBUGGING THINGS ****
|
// **** DEBUGGING THINGS ****
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue