pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-01-30 21:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

Fixed Presentation source selection on Spark codec to use original Source 1/2 values rather than connectorId
This commit is contained in:
Neil Dorin
2017-10-23 15:53:46 -06:00
parent 8dbb3fd898 01d462d553
commit 84262c782d
6 changed files with 18 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
View File

@@ -212,7 +212,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
/// <summary>
/// Used to track the current connector used for the presentation source
/// </summary>
int PresentationSourceConnector;
int PresentationSource;
string PresentationSourceKey;
@@ -309,9 +309,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
CodecOsdIn = new RoutingInputPort(RoutingPortNames.CodecOsd, eRoutingSignalType.AudioVideo,
eRoutingPortConnectionType.Hdmi, new Action(StopSharing), this);
HdmiIn2 = new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.AudioVideo,
eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSourceConnector2), this);
eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource1), this);
HdmiIn3 = new RoutingInputPort(RoutingPortNames.HdmiIn3, eRoutingSignalType.AudioVideo,
eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSourceConnector3), this);
eRoutingPortConnectionType.Hdmi, new Action(SelectPresentationSource2), this);
HdmiOut1 = new RoutingOutputPort(RoutingPortNames.HdmiOut1, eRoutingSignalType.AudioVideo,
eRoutingPortConnectionType.Hdmi, null, this);
@@ -552,10 +552,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
if (conference.Presentation.LocalInstance.Count > 0)
{
if (!string.IsNullOrEmpty(conference.Presentation.LocalInstance[0].ghost))
PresentationSourceConnector = 0;
PresentationSource = 0;
else if (conference.Presentation.LocalInstance[0].Source != null)
{
PresentationSourceConnector = conference.Presentation.LocalInstance[0].Source.IntValue;
PresentationSource = conference.Presentation.LocalInstance[0].Source.IntValue;
}
}
@@ -992,9 +992,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
}
}
public void SelectPresentationByConnector(int connector)
public void SelectPresentationByConnector(int source)
{
PresentationSourceConnector = connector;
PresentationSource = source;
StartSharing();
}
@@ -1002,17 +1002,17 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
/// <summary>
/// Select source 1 as the presetnation source
/// </summary>
public void SelectPresentationSourceConnector2()
public void SelectPresentationSource1()
{
SelectPresentationByConnector(2);
SelectPresentationByConnector(1);
}
/// <summary>
/// Select source 2 as the presetnation source
/// </summary>
public void SelectPresentationSourceConnector3()
public void SelectPresentationSource2()
{
SelectPresentationByConnector(3);
SelectPresentationByConnector(2);
}
/// <summary>
@@ -1027,7 +1027,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
else
sendingMode = "LocalOnly";
SendText(string.Format("xCommand Presentation Start PresentationSource: {0} SendingMode: {1}", PresentationSourceConnector, sendingMode));
SendText(string.Format("xCommand Presentation Start PresentationSource: {0} SendingMode: {1}", PresentationSource, sendingMode));
}
/// <summary>
@@ -1035,7 +1035,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
/// </summary>
public override void StopSharing()
{
PresentationSourceConnector = 0;
PresentationSource = 0;
SendText("xCommand Presentation Stop");
}

6
Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs
View File

@@ -1,8 +1,8 @@
using System.Reflection;
[assembly: AssemblyTitle("PepperDashEssentials")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("PepperDash Technology Corp")]
[assembly: AssemblyProduct("PepperDashEssentials")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyVersion("1.0.0.*")]
[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")]
[assembly: AssemblyVersion("1.0.1.*")]

63
Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
View File

@@ -187,13 +187,11 @@ namespace PepperDash.Essentials
CTimer NextMeetingTimer;
/// <summary>
/// <summary>
/// Tracks the last meeting that was cancelled
/// </summary>
Meeting LastMeetingDismissed;
/// <summary>
/// Constructor
/// </summary>
@@ -436,9 +434,6 @@ namespace PepperDash.Essentials
// Every 60 seconds, check meetings list for the closest, joinable meeting
var ss = CurrentRoom.ScheduleSource;
var meetings = ss.CodecSchedule.Meetings;
Debug.Console(0, "***** Checking meetings *****");
foreach (var m in meetings)
Debug.Console(0, "****** {0} {1} ******", m.StartTime.ToShortTimeString(), m.Joinable);
if (meetings.Count > 0)
{
@@ -450,16 +445,13 @@ namespace PepperDash.Essentials
if (CurrentRoom.OnFeedback.BoolValue
&& LastMeetingDismissed == meeting)
//|| (LastMeetingDismissed != null && !LastMeetingDismissed.Joinable)))
{
Debug.Console(0, "****** Ignoring previously cancelled meeting warning ******");
return;
}
LastMeetingDismissed = null;
if (meeting != null)
{
Debug.Console(0, "***** First joinable meeting: {0} {1}", meeting.StartTime.ToShortTimeString(), meeting.Joinable);
TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Upcoming meeting");
TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToShortTimeString());
TriList.SetString(UIStringJoin.NextMeetingEndTimeText, meeting.EndTime.ToShortTimeString());
@@ -1027,20 +1019,6 @@ namespace PepperDash.Essentials
TriList.SetSigFalseAction(UIBoolJoin.TechExitButton, () =>
PopupInterlock.HideAndClear());
//HeaderGearButton = new HeaderListButton(HeaderButtonsList, 5);
//HeaderGearButton.SetIcon(HeaderListButton.Gear);
//HeaderGearButton.OutputSig.SetSigHeldAction(2000,
// ShowTech,
// null,
// () =>
// {
// if (CurrentRoom.OnFeedback.BoolValue)
// PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.VolumesPageVisible);
// else
// PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.VolumesPagePowerOffVisible);
// });
// Help button and popup
if (CurrentRoom.Config.Help != null)
{
@@ -1072,36 +1050,11 @@ namespace PepperDash.Essentials
//TriList.StringInput[UIStringJoin.HelpMessage].StringValue = message;
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HelpPageVisible);
});
//var helpButton = new HeaderListButton(HeaderButtonsList, 4);
//helpButton.SetIcon(HeaderListButton.Help);
//helpButton.OutputSig.SetSigFalseAction(() =>
//{
// string message = null;
// var room = DeviceManager.GetDeviceForKey(Config.DefaultRoomKey)
// as EssentialsHuddleSpaceRoom;
// if (room != null)
// message = room.Config.HelpMessage;
// else
// message = "Sorry, no help message available. No room connected.";
// //TriList.StringInput[UIStringJoin.HelpMessage].StringValue = message;
// PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HelpPageVisible);
//});
uint nextJoin = 3953;
// Lights button
//if (WHATEVER MAKES LIGHTS WORK)
//{
// // do lights
// nextIndex--;
//}
// Calendar button
if (_CurrentRoom.ScheduleSource != null) // ******************* Do we need a config option here as well?
if (_CurrentRoom.ScheduleSource != null)
{
//var calBut = new HeaderListButton(HeaderButtonsList, nextIndex);
//calBut.SetIcon(HeaderListButton.Calendar);
//calBut.OutputSig.SetSigFalseAction(CalendarPress);
TriList.SetString(nextJoin, "Calendar");
TriList.SetSigFalseAction(nextJoin, CalendarPress);
@@ -1109,10 +1062,6 @@ namespace PepperDash.Essentials
}
// Call button
//HeaderCallButton = new HeaderListButton(HeaderButtonsList, nextJoin);
//HeaderCallButton.SetIcon(HeaderListButton.OnHook);
//HeaderCallButton.OutputSig.SetSigFalseAction(ShowActiveCallsList);
TriList.SetString(nextJoin, "DND");
TriList.SetSigFalseAction(nextJoin, ShowActiveCallsList);
HeaderCallButtonIconSig = TriList.StringInput[nextJoin];
@@ -1122,15 +1071,10 @@ namespace PepperDash.Essentials
// blank any that remain
for (var i = nextJoin; i > 3950; i--)
{
//var blankBut = new HeaderListButton(HeaderButtonsList, i);
//blankBut.ClearIcon();
//blankBut.OutputSig.SetSigFalseAction(() => { });
TriList.SetString(i, "Blank");
TriList.SetSigFalseAction(i, () => { });
}
TriList.SetSigFalseAction(UIBoolJoin.HeaderCallStatusLabelPress, ShowActiveCallsList);
// Set Call Status Subpage Position
@@ -1148,7 +1092,6 @@ namespace PepperDash.Essentials
TriList.SetBool(UIBoolJoin.HeaderCallStatusRightPositionVisible, false);
}
HeaderButtonsAreSetUp = true;
ComputeHeaderCallStatus(CurrentRoom.VideoCodec);
@@ -1365,8 +1308,6 @@ namespace PepperDash.Essentials
(previousDev as IPower).UnlinkButtons(TriList);
if (previousDev is ITransport)
(previousDev as ITransport).UnlinkButtons(TriList);
//if (previousDev is IRadio)
// (previousDev as IRadio).UnlinkButtons(this);
}
/// <summary>

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

@@ -633,7 +633,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
/// <param name="dir"></param>
void RefreshDirectory()
{
Debug.Console(0, "****** RefreshDirectory!");
if (CurrentDirectoryResult.DirectoryResults.Count > 0)
{
ushort i = 0;

BIN
Release Package/PepperDashEssentials.cpz
View File

Binary file not shown.

BIN
Release Package/PepperDashEssentials.dll
View File

Binary file not shown.