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

Various fixes

Browse Source
This commit is contained in:
Heath Volmer
2019-06-11 10:15:38 -06:00
parent 3ceecd3fbe
commit 68064c7194
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PepperDashEssentials/AppServer/Messengers/Ddvc01AtcMessenger.cs
View File

@@ -19,7 +19,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
/// <summary> /// <summary>
/// 221 /// 221
/// </summary> /// </summary>
const uint BDialHangup = 221; const uint BDialHangupOnHook = 221;
/// <summary> /// <summary>
/// 251 /// 251
/// </summary> /// </summary>
@@ -134,7 +135,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
{ {
CurrentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true); CurrentCallItem.Status = (eCodecCallStatus)Enum.Parse(typeof(eCodecCallStatus), s, true);
//GetCurrentCallList(); //GetCurrentCallList();
SendCallsList(); SendFullStatus();
}); });
EISC.SetStringSigAction(SCurrentCallNumber, s => EISC.SetStringSigAction(SCurrentCallNumber, s =>
@@ -162,7 +163,8 @@ namespace PepperDash.Essentials.AppServer.Messengers
// Add straight pulse calls // Add straight pulse calls
Action<string, uint> addAction = (s, u) => Action<string, uint> addAction = (s, u) =>
AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100))); AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
addAction("/endCallById", BDialHangup); addAction("/endCallById", BDialHangupOnHook);
addAction("/endAllCalls", BDialHangupOnHook);
addAction("/acceptById", BIncomingAnswer); addAction("/acceptById", BIncomingAnswer);
addAction("/rejectById", BIncomingReject); addAction("/rejectById", BIncomingReject);
addAction("/speedDial1", BSpeedDial1); addAction("/speedDial1", BSpeedDial1);

4
PepperDashEssentials/AppServer/Messengers/Ddvc01VtcMessenger.cs
View File

@@ -361,6 +361,7 @@ namespace PepperDash.Essentials.AppServer.Messengers
Action<string, uint> addAction = (s, u) => Action<string, uint> addAction = (s, u) =>
AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100))); AppServerController.AddAction(MessagePath + s, new Action(() => EISC.PulseBool(u, 100)));
addAction("/endCallById", BDialHangup); addAction("/endCallById", BDialHangup);
addAction("/endAllCalls", BDialHangup);
addAction("/acceptById", BIncomingAnswer); addAction("/acceptById", BIncomingAnswer);
addAction("/rejectById", BIncomingReject); addAction("/rejectById", BIncomingReject);
addAction("/speedDial1", BSpeedDial1); addAction("/speedDial1", BSpeedDial1);
@@ -465,8 +466,9 @@ namespace PepperDash.Essentials.AppServer.Messengers
isInCall = EISC.GetString(SHookState) == "Connected", isInCall = EISC.GetString(SHookState) == "Connected",
hasDirectory = true, hasDirectory = true,
hasDirectorySearch = false, hasDirectorySearch = false,
hasRecents = true, hasRecents = !EISC.BooleanOutput[502].BoolValue,
hasCameras = true, hasCameras = true,
showCamerasWhenNotInCall = EISC.BooleanOutput[503].BoolValue,
selectedCamera = GetSelectedCamera(), selectedCamera = GetSelectedCamera(),
}); });
} }

14
PepperDashEssentials/AppServer/RoomBridges/CotijaDdvc01RoomBridge.cs
View File

@@ -333,10 +333,10 @@ namespace PepperDash.Essentials.Room.Cotija
Parent.AddAction(@"/room/room1/defaultsource", new Action(() => Parent.AddAction(@"/room/room1/defaultsource", new Action(() =>
EISC.PulseBool(BoolJoin.ActivityShare))); EISC.PulseBool(BoolJoin.ActivityShare)));
Parent.AddAction(@"/room/room1/activityVideo", new Action(() =>
EISC.PulseBool(BoolJoin.ActivityVideoCall)));
Parent.AddAction(@"/room/room1/activityPhone", new Action(() => Parent.AddAction(@"/room/room1/activityPhone", new Action(() =>
EISC.PulseBool(BoolJoin.ActivityPhoneCall))); EISC.PulseBool(BoolJoin.ActivityPhoneCall)));
Parent.AddAction(@"/room/room1/activityVideo", new Action(() =>
EISC.PulseBool(BoolJoin.ActivityVideoCall)));
Parent.AddAction(@"/room/room1/volumes/master/level", new Action<ushort>(u => Parent.AddAction(@"/room/room1/volumes/master/level", new Action<ushort>(u =>
EISC.SetUshort(UshortJoin.MasterVolumeLevel, u))); EISC.SetUshort(UshortJoin.MasterVolumeLevel, u)));
@@ -487,9 +487,9 @@ namespace PepperDash.Essentials.Room.Cotija
EISC.SetSigTrueAction(BoolJoin.ConfigIsReady, LoadConfigValues); EISC.SetSigTrueAction(BoolJoin.ConfigIsReady, LoadConfigValues);
// Activity modes // Activity modes
EISC.SetSigTrueAction(BoolJoin.ActivityPhoneCall, () => UpdateActivity(3));
EISC.SetSigTrueAction(BoolJoin.ActivityShare, () => UpdateActivity(1)); EISC.SetSigTrueAction(BoolJoin.ActivityShare, () => UpdateActivity(1));
EISC.SetSigTrueAction(BoolJoin.ActivityVideoCall, () => UpdateActivity(2)); EISC.SetSigTrueAction(BoolJoin.ActivityPhoneCall, () => UpdateActivity(2));
EISC.SetSigTrueAction(BoolJoin.ActivityVideoCall, () => UpdateActivity(3));
} }
@@ -714,8 +714,6 @@ namespace PepperDash.Essentials.Room.Cotija
{ {
favorites = favs, favorites = favs,
cameras = camsProps, cameras = camsProps,
hideRecents = EISC.BooleanOutput[BoolJoin.HideVideoConfRecents].BoolValue,
showCamerasWhenNotInCall = EISC.BooleanOutput[BoolJoin.ShowCameraWhenNotInCall].BoolValue,
}; };
var str = "videoCodec"; var str = "videoCodec";
var conf = new DeviceConfig() var conf = new DeviceConfig()
@@ -802,9 +800,9 @@ namespace PepperDash.Essentials.Room.Cotija
/// <returns></returns> /// <returns></returns>
int GetActivityMode() int GetActivityMode()
{ {
if (EISC.BooleanOutput[BoolJoin.ActivityPhoneCall].BoolValue) return 3; if (EISC.BooleanOutput[BoolJoin.ActivityPhoneCall].BoolValue) return 2;
else if (EISC.BooleanOutput[BoolJoin.ActivityShare].BoolValue) return 1; else if (EISC.BooleanOutput[BoolJoin.ActivityShare].BoolValue) return 1;
else if (EISC.BooleanOutput[BoolJoin.ActivityVideoCall].BoolValue) return 2; else if (EISC.BooleanOutput[BoolJoin.ActivityVideoCall].BoolValue) return 3;
return 0; return 0;
} }