diff --git a/PepperDashEssentials/PepperDashEssentials.suo b/PepperDashEssentials/PepperDashEssentials.suo index 6f9cc6a9..f890a65a 100644 Binary files a/PepperDashEssentials/PepperDashEssentials.suo and b/PepperDashEssentials/PepperDashEssentials.suo differ diff --git a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo index cb2009d9..e7f55d0e 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo and b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo differ diff --git a/PepperDashEssentials/PepperDashEssentials/Room/EssentialsPresentationRoom.cs b/PepperDashEssentials/PepperDashEssentials/Room/EssentialsPresentationRoom.cs index 32863bc9..71868b89 100644 --- a/PepperDashEssentials/PepperDashEssentials/Room/EssentialsPresentationRoom.cs +++ b/PepperDashEssentials/PepperDashEssentials/Room/EssentialsPresentationRoom.cs @@ -18,8 +18,9 @@ namespace PepperDash.Essentials public Dictionary Displays { get; private set; } - public IRoutingSinkWithSwitching DefaultDisplay { get; private set; } - public IRoutingSinkNoSwitching DefaultAudioDevice { get; private set; } + public IRoutingSinkWithSwitching Display1 { get; private set; } + public IRoutingSinkWithSwitching Display2 { get; private set; } + public IRoutingSinkNoSwitching DefaultAudioDevice { get; private set; } public IBasicVolumeControls DefaultVolumeControls { get; private set; } public bool ExcludeFromGlobalFunctions { get; set; } @@ -101,13 +102,15 @@ namespace PepperDash.Essentials /// /// /// - public EssentialsPresentationRoom(string key, string name, IRoutingSinkWithSwitching defaultDisplay, + public EssentialsPresentationRoom(string key, string name, + IRoutingSinkWithSwitching display1, IRoutingSinkWithSwitching display2, IRoutingSinkNoSwitching defaultAudio, EssentialsPresentationRoomPropertiesConfig config) : base(key, name) { Config = config; - DefaultDisplay = defaultDisplay; - DefaultAudioDevice = defaultAudio; + Display1 = display1; + Display2 = display2; + DefaultAudioDevice = defaultAudio; if (defaultAudio is IBasicVolumeControls) DefaultVolumeControls = defaultAudio as IBasicVolumeControls; else if (defaultAudio is IHasVolumeDevice) diff --git a/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-09 14-33-30).log b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-09 14-33-30).log new file mode 100644 index 00000000..e5b29151 --- /dev/null +++ b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-09 14-33-30).log @@ -0,0 +1,7 @@ +2/9/2017 2:33:30 PM, Info: Initializing SIMPLSharp Services... +2/9/2017 2:33:31 PM, Info: ProjectInfo successfully initialized. +2/9/2017 2:44:01 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/9/2017 2:44:02 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/9/2017 2:44:02 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/9/2017 2:44:04 PM, Info: Saving project information... +2/9/2017 4:00:11 PM, Info: Terminating SIMPLSharp Services