From 9e4adde030dc83379d91020458e81b02cff932b7 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Fri, 7 Jul 2017 13:17:53 -0700 Subject: [PATCH] Fixed issues with EssentialsHuddlePanelAvFunctionDriver re: volume popup and source bar visbilty --- .../PepperDash_Essentials_Core.projectinfo | Bin 1280 -> 1276 bytes .../Essentials_DM/Essentials_DM.projectinfo | Bin 1138 -> 1131 bytes .../Essentials Devices Common.projectinfo | Bin 1156 -> 1156 bytes .../PepperDashEssentials.projectinfo | Bin 1865 -> 1853 bytes .../EssentialsHuddlePanelAvFunctionsDriver.cs | 28 +++++++++++++++--- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo index 3d8ac5bdf219c3d6c4fd78c74dfec602c3ee4406..6a48bbc52a6f26d19bd302af58aa273e21944712 100644 GIT binary patch delta 1106 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 CIu&&Q diff --git a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo index e836ffde2bb2df7eee996662d7ca0dae15591527..1eac3b58f91eec6bdc8a180d91c1891fe210315e 100644 GIT binary patch delta 980 zcmV;_11tQ534{rdzJCt>_h$Frquu>Sdk5nO_dmUNZ}&cZ_Go8^+Rdrm$)n%*_x)~F zzb%#*>C>Xlr)^aidGq`JzAy9DDzBer&HVTMeP93h@B91aw&&mX_Z`G?<5!bn)A!@) zs{8>VRanBjtgD|Ue9o5V)w80^m)Ro!;UYYY>q<~72sJ|atbZXy+G{h9udkanU%U`> zH%%xF@S@HZXR|liMbI>uTWz(-Ynk2S*{o=bYMGUwjC@8QS45)Om&;pDy?Np1hOoEe zgww?&pS`Zu^)x@Or}N@6x2$net*+lx&#H2k*Ud+dj9~43^h-t`eNiln#d`6qs25jR zo&O}YAZkJE#(z6I59$AV4+;2}>vpwnUuNwORS2l#FS2EEo;R(-`W}6H6So+ee32E) zV`{XRl-CZzK7HfO+3SyI!0B=q0j-p)NB(V<+IWZxz-&}aAeckb`p+dFuWA7qo= zhkMfp)1ArgZuaTy(+BzV;DB1nq}^sbIsrGfdtObm@_&atTQ@SQkn?H2%9pczIVB`M zdh|UrDfh!kIjL#VYkKK*u~?O_=UKfX$sP;D*Xz})s#^u9gq~(uzCYRDyZ*rstlR?fd(TR|+y8G&(8F+ooXEe(ui9$aROcQ0^KiQJaC(1sZ)cX} zv)SzY;Nku0y-&00`>Db*FnvYlcd5PenTAnT2 zynhB|!imZ6ou41%v&keo*q=^k4|eb0pFDhcu%CbWVE^D?5;z980UONFEr7r83=Q}E z|B#HwN2T0mbGr44)%5?pYBfg52gp%-jv2oj@11J zc|Ic%xcA_})Ssu#)VwX#J4B5j_e;M2OMVH*YQ=dm%^*EA%5~Ywp#L9eWob=J5&!_d CXEss* delta 980 zcmV;_11tQ534{rdzJJcA+j|e+?Cw9>*?Y8qZ~W=*{---T2lVlyogHd7r*qmfCw&3JSIZfy6wntx{H4|}$5WK<#N(|naLXZdnU zNPP6@duCGZhm&$r)1=q*((7WeDqqjDdPR~w7KpFct5sFE3eXTb%kurn{@(qES$6*E z?!%q?56^e9{NDclgL{+n*`816_kb?%+`f-nP0^$GK;Y+YF8h=9{n1CS@`fqGfBuq@ znZ8eNHGh4dXKj9!T{q#(J=ojd%lCHovh3c${=L1ugY5q7;ch-7Eqjrn>I&X>dI_dluXJe;4shxdr-cRszhv;S~*|6uaz{f7@HdG;xP zmgPJC{KNqT^KlDsx0{c6U;p2r|G^;rT_2ID$barV$fgGe_lS*mrn9{Vv)Pnb`Tlu+ zp51@A_b?EZ8({{satp}sJuC5U|GzOo55oy^BL5=4YO7^aopHXQgomrO8 zX0!8yhxe!VKFy|+^K6>$%$B#*u8&$^6=roe*Wo${ey!^;27KnY%oK&0RFx+G~Dz5 zN2Y3bXsTZS#Pe_GC1E!(Q|CL=`#bk%vwS)`$Q~Tro9#~?+~3=MaDQiaI+;8en5jXi z!9?8x_WMrMV8{Qjo~Oy(%QyMopQuiO^ z`HV#1-h&5If1Wl|^R`s)5H*6_FZup2`6V2y73ak?gY?iS*JUe%{(k_Ad=@865&!^y C9xC+! diff --git a/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo b/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo index e8d509160409b4ffcacba67431afbacc76ce02f8..af89359be6e25cbcad39c454ac9a5ba79529a25e 100644 GIT binary patch delta 1647 zcmV-#29Wv54!sVLvRMxP_h$Frquu>S_x8v85BK&zrB5F1>`<#YwK{q9`~JS)t?IYM z@*;g&)cLfn>LPD`-{05u^ZWk3uYdga{e5%W+wc4Px}N=Z{-={-8UJcLUHyQ%F6_9I z5CJ0`jn~&rn=f7nRs*!BAzaki;%xRNySTB{BClnRlTQH^e>H)o`OiM#Zko^2#U!7- zuGaN5Kdz_q;xe}rd{V8h-&D`4a+cT4M~@8m?|t-3Mjw4qEQ`f@@vNv9S6Q9^B()%l zKsLrZI}hpqdk+ctm+N-5ZeM2Y&l5!$iK*n7F*zrDSkd-p%;k)}(NZxbx~ESsG_oaMXs??2ehXZP-(-`hFg zo8|kv`#TTsA53=ksHM!x=0PZJH?(+OO|$Z6a|$-`m{96zzRH)gd^x4QK6>;$LuwGq z7l4{3v96Zm*TrI0zMg0GiX?CRG`}pS`Rny+Rn@Hme^eSyvn=1A?C;%wm}Tdm?mpbP z|L}Y#%kS;)Ke#tJp9M6059spF?fbZ44j#Qn*FT)e>QBk{M<2b)8y+|R`AbG-l0LoN zBz+Oi%w%?cKbxLs2Rqa0y~*U@!TH|qET0@a+}+(fnC#AOGcyKcFder5{B@_p^!NY1 zIe2iZe>pg9=Xt%%Te2;S^|F{|uu($^Aq&>fB(MuczCP%_&jU#tL(ZXK@ax!_wv2n zy)3(TuzzoF?;yKBd$>!4{PbY&;rT&!iy7$v4(8+*;J@aabb9@N->mHJ+-h20<%_D# zJF`Lz`)R&2*}J#1zxOcz^x@u=e5##%`suyt!<`3{{1&qk!VM`= ze{VG>U!8^1v2*b79`W$bbh0zqzklz+&V#)fDgM2C`#HJ0JGYq*3o@9ATLAu=GhzGt zf8iwTg_GbwrQ$<2DGXuPcHH0JxxaI7@8CgxkWF@pX&+2?CcC@Yr?XEVQC=Kd^pLoPx-Sf--#362Nb$WH-o!9z5QPPUr6RoSnlENphhUZPuYxnJD=`7f4o20 z+nY_veL1){neE@7?tD7SNlOn4TkvN&eu|{r&s1=`21magbpEcQfGIPe;7J|MyM8UMHS*BY2TtwUjTb&O7<^hf`7_ z_hrj9kh4(|ez0(+S48GrJ$Be-Bzm5^jWfd(!v1`hOwSI}vjjW#;d4NAC0U zPY-emS|5H&(d+DBZ-+8JfBSp84=Ayn<#~1Bj4(`qNClBru&)(nJolYhXX$IzF5Naq7H^aXD zbPRU+|C-t8d|>CM6EnLZJBNPpYBfg52gp%-jv2j8Rz>C@|@h5>AeRJ trv7XU(d=fbc8C^1=$Cx|m;4f5T`$gcWrs$#E?XJs{{w}dAhd)d004^yrd$93 delta 1654 zcmV-+28sE-4#^IXvLVi=+j|e+?Cw9>*?V;V)A8Q^?xznP-lvZr?d(vyIkh{H&Ke{1 z`~JSKfBg6TeRJF2@B90@zWsLor;}nC|7tv4{eZeI?8uV~0V98p*Vj#(FJ1^%1JtJ> zT-4d(Z1yI*xUtnDuVt2wXS1R$s%2JU?DE-3wOA1mW?wFEIfdqhpMBEZG^3}BNj`gB zt?OxiTuFW2pA-M-A)pEZ`HPQJ*N#d+Se4#Ru&>4vG-k$;gD%VYX*F)6Rz zyZiKwH!IQiXJtvPf-%#7d-wJa?tj!HO_wI$CRp^@!M)w-r}=b}-ODEV^kDbF<&^sR=+XBKsX;7X z0BV}Vx>}B37mHQ-dY;uQlD+ZM{IZzluh*+pRksRIX*kWYe1EdPcmH9QoqxLfaOeKR z^PMcex4-}3-sF6?=hN^#pvybA@8gC!c=R4!|8OR&KPBHEee^1Cc-;KwFBzFh`t){_ z^hG!`li7dy{cL)k9qde}_a>8r2j_dcvwU*!aCdj_V6r>A&CD2(!F1dL@YkIV)8GI5 z=HS7t=HRrQ=k+pg$+j%k%VL_rN*NJU^4g5(|g(Z-t7D~8ZH1E%+D==f6e&``uu<2d_26>e0-j@`Biq^k)Q{A`+ND` z?p~JNJJ`Rsw|9`;pFP|qLVkL%_wf86yTy!j00(n&3-DiaPCC8*zi(D{cWyN;ukuCJ z=AD08A%^`l-98P!nYabuuQ?O8 zzyB9b!d^HD4pb^WWRt=Wc5TOW_uyW(|8Rej-FrCQ{WSaZ)7`zDPxtOW*xj8?vrn^o z{v_N4GIWV=27J>b+|=Ly3n$@TI0+8uNmb`B$%W6#*VoHwI0p~2$-R6!&4@?$_a035 zcJ3eC`;_9od*|l|5A&VCTHF9Jn1Wlty=e+==FxLO|3Wf%!g3F92Q@MF~WPi3ly}$dA6#4z^{NaDj&hDo< zIWK#&Pd}YJ9GIFLfQR<^<}Ti2dT!|X|AkZ3iLl*RzMYo@eqdsto;YOIZCw;H0{})od6ETNTX8taB zFoOWe<6W8(Xhk% zReoM#LAY8D=ob!;^4VmP9qdo1vj@BP?@t~+JlM}aeXxIUFbT4$U9f*Ku)ze}0{HDG zV0bA1FPxB0Wb8)q`X`=m)c5B*)B8L3XR~}dJIEd!+?(xB9^5CMy}z?NolG7K%*P@XG}ibo$en@53;=}jgd0W_aEdr zxiQmw4<1bY*%+eP%~T@o5G{hxFZup2`6ax%UYzU74vlPGwldKF2ldb~^@t+?0BPT^ ADF6Tf diff --git a/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs index 6b82e1a1..a117a423 100644 --- a/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs +++ b/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs @@ -180,7 +180,10 @@ namespace PepperDash.Essentials /// /// public override void Show() - { + { + if(CurrentRoom != null) + CurrentRoom.OnFeedback.OutputChange += new EventHandler(OnFeedback_OutputChange); + TriList.BooleanInput[UIBoolJoin.TopBarVisible].BoolValue = true; TriList.BooleanInput[UIBoolJoin.ActivityFooterVisible].BoolValue = true; @@ -236,17 +239,34 @@ namespace PepperDash.Essentials }); base.Show(); - } + } + + void OnFeedback_OutputChange(object sender, EventArgs e) + { + if (CurrentRoom.OnFeedback.BoolValue) + { + TriList.BooleanInput[UIBoolJoin.VolumeSingleMute1Visible].BoolValue = true; + //TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true; + } + else + { + TriList.BooleanInput[UIBoolJoin.VolumeSingleMute1Visible].BoolValue = false; + TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = false; + } + } public override void Hide() - { + { + if (CurrentRoom != null) + CurrentRoom.OnFeedback.OutputChange -= OnFeedback_OutputChange; + HideAndClearCurrentDisplayModeSigsInUse(); TriList.BooleanInput[UIBoolJoin.TopBarVisible].BoolValue = false; TriList.BooleanInput[UIBoolJoin.ActivityFooterVisible].BoolValue = false; TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false; TriList.BooleanInput[UIBoolJoin.TapToBeginVisible].BoolValue = false; TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false; - TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = false; + //TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = false; VolumeButtonsPopupFeedback.ClearNow(); CancelPowerOff();