Re-added api for volume and mute

This commit is contained in:
Heath Volmer
2018-01-01 05:00:33 -07:00
parent 68fb82f801
commit 51afb966d5
6 changed files with 2012 additions and 2011 deletions

View File

@@ -315,7 +315,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class Cameras public class Cameras
{ {
// [JsonConverter(typeof(CameraConverter))] // [JsonConverter(typeof(CameraConverter))]
public List<Camera> Camera { get; set; } public List<Camera> Camera { get; set; }
public SpeakerTrack SpeakerTrack { get; set; } public SpeakerTrack SpeakerTrack { get; set; }
@@ -444,12 +444,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public class Mode2 : ValueProperty public class Mode2 : ValueProperty
{ {
string _Value;
public bool BoolValue { get; private set; } public bool BoolValue { get; private set; }
public string Value public string Value
{ {
get
{
return _Value;
}
set set
{ {
_Value = value;
// If the incoming value is "Sending" it sets the BoolValue true, otherwise sets it false // If the incoming value is "Sending" it sets the BoolValue true, otherwise sets it false
BoolValue = value == "Sending"; BoolValue = value == "Sending";
OnValueChanged(); OnValueChanged();
@@ -523,7 +532,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
{ {
public string id { get; set; } public string id { get; set; }
public string ghost { get; set; } public string ghost { get; set; }
public SendingMode SendingMode {get; set;} public SendingMode SendingMode { get; set; }
public Source2 Source { get; set; } public Source2 Source { get; set; }
public LocalInstance() public LocalInstance()

View File

@@ -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.10.*")] [assembly: AssemblyVersion("1.0.11.*")]

View File

@@ -31,9 +31,11 @@ namespace PepperDash.Essentials
Parent.AddAction(string.Format(@"/room/{0}/source", Room.Key), new Action<SourceSelectMessageContent>(c => room.RunRouteAction(c.SourceListItem))); Parent.AddAction(string.Format(@"/room/{0}/source", Room.Key), new Action<SourceSelectMessageContent>(c => room.RunRouteAction(c.SourceListItem)));
Parent.AddAction(string.Format(@"/room/{0}/defaultsource", Room.Key), new Action(Room.RunDefaultRoute)); Parent.AddAction(string.Format(@"/room/{0}/defaultsource", Room.Key), new Action(Room.RunDefaultRoute));
Parent.AddAction(string.Format(@"/room/{0}/event/masterVolumeUpBtn", Room.Key), new PressAndHoldAction(b => room.CurrentVolumeControls.VolumeUp(b))); //Parent.AddAction(string.Format(@"/room/{0}/event/masterVolumeUpBtn", Room.Key), new PressAndHoldAction(b => room.CurrentVolumeControls.VolumeUp(b)));
Parent.AddAction(string.Format(@"/room/{0}/event/masterVolumeDownBtn", Room.Key), new PressAndHoldAction(b => room.CurrentVolumeControls.VolumeDown(b))); //Parent.AddAction(string.Format(@"/room/{0}/event/masterVolumeDownBtn", Room.Key), new PressAndHoldAction(b => room.CurrentVolumeControls.VolumeDown(b)));
Parent.AddAction(string.Format(@"/room/{0}/event/muteToggle", Room.Key), new Action(() => room.CurrentVolumeControls.MuteToggle())); Parent.AddAction(string.Format(@"/room/{0}/masterVolumeLevel", Room.Key), new Action<ushort>(u =>
(room.CurrentVolumeControls as IBasicVolumeWithFeedback).SetVolume(u)));
Parent.AddAction(string.Format(@"/room/{0}/masterVolumeMuteToggle", Room.Key), new Action(() => room.CurrentVolumeControls.MuteToggle()));
Room.CurrentSingleSourceChange += new SourceInfoChangeHandler(Room_CurrentSingleSourceChange); Room.CurrentSingleSourceChange += new SourceInfoChangeHandler(Room_CurrentSingleSourceChange);

View File

@@ -205,15 +205,11 @@ namespace PepperDash.Essentials
{ {
try try
{ {
//if(Client == null) if(Client == null)
Client = new HttpClient(); Client = new HttpClient();
Client.Verbose = true; Client.Verbose = true;
Client.KeepAlive = true; Client.KeepAlive = true;
try
{
HttpClientRequest request = new HttpClientRequest(); HttpClientRequest request = new HttpClientRequest();
request.RequestType = RequestType.Post; request.RequestType = RequestType.Post;
string url = string.Format("http://{0}/api/system/{1}/status", Config.ServerUrl, SystemUuid); string url = string.Format("http://{0}/api/system/{1}/status", Config.ServerUrl, SystemUuid);
@@ -226,12 +222,6 @@ namespace PepperDash.Essentials
request.ContentString = ignored; request.ContentString = ignored;
request.FinalizeHeader(); request.FinalizeHeader();
Client.DispatchAsync(request, (r, err) => { if (r != null) { Debug.Console(1, this, "Status Response Code: {0}", r.Code); } }); Client.DispatchAsync(request, (r, err) => { if (r != null) { Debug.Console(1, this, "Status Response Code: {0}", r.Code); } });
}
catch (Exception e)
{
Debug.Console(1, this, "PostToServer exception: {0}", e);
}
//ResetOrStartHearbeatTimer(); //ResetOrStartHearbeatTimer();
} }