From 04fb3844ff60d06a096c08b373a40dcbb59bc596 Mon Sep 17 00:00:00 2001
From: Jonathon Wilson <jonathon@jamkazam.com>
Date: Thu, 31 Jan 2013 09:32:32 -0700
Subject: [PATCH] Mute button works. Better ties to music hardware (less
 hard-coding)

---
 app/assets/images/content/icon_mute.png       | Bin 1442 -> 1035 bytes
 app/assets/javascripts/fakeJamClient.js       |  17 ++--
 app/assets/javascripts/session.js             |  78 +++++++++++++++---
 .../stylesheets/client/session.css.scss       |  12 +++
 app/views/clients/_session.html.erb           |  17 ++--
 5 files changed, 97 insertions(+), 27 deletions(-)

diff --git a/app/assets/images/content/icon_mute.png b/app/assets/images/content/icon_mute.png
index 3796133031e37ea132ed7bff920b470aa5dfeacf..a14155706d6006cff82ab59566dcd27f8b43f766 100644
GIT binary patch
literal 1035
zcmV+m1oZofP)<h;3K|Lk000e1NJLTq001Ze000sQ1^@s6DIc7s00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*Z5
z4+|)YbNwU$00WCjL_t(Y$E}r5NK{)K$G_)zoqM}AF}&wuYD|ZjCcMK*BN}uOmAH7T
zaiwH$(Z&{!5K>S?Ca@HR$e_Z7E<|z>wg}6fFfNoQBu@#7N2kD^Ah{Vt(!@tSow;*b
zbnbASZ2r{`elX|$=6ufg{(k58yG6*shKGk$zu$jsadGh@eu71#QPnVvW3#ifS$RsP
zU~6kD_51y20)fCix7+<;Wo0EiIXNi`71rP1PlLhW8OGSX($dloOG``Pv9U2xkig#F
zUT<Y(WyI(6T_J>EeSLk@G|hsuHZn5et*)+)7>03$Qi@nCHkwEzkaq@KT3Vd7wY68v
z%ge88ns&$*qLk9Sh4u9GIP2@{uLc5v>$<LI<Ov~;001E*mJ-<A-5mrV2qC7==VKKW
z758;r_oN?02!RmUt2;C_6a*kBrKVvRtg5Q&zSHUSNC6;(Wa9k=;8y@8DS?fRjc?Nb
zWo@)z>Bc#C$)8({F~K=k02~6a6AT95*k1|&lF6i%vVD0%h{FK>2XG0%pY|9n@Jd|(
zunFLtT;G;!7a;_e3n6mKy4<%*2zd!0CTyGb6=)rh{>)}i0XzrrfOCEvKr4VQ##n4W
z4yE*)?AdvyX|4z%=H+s7PX^=hII_7A0*OQ-RVv1q01yUH4&Yw^?*ZHbfZg5Qte#9J
z5s$}Hyq%pL3gD9zezTwwo2I#^T#T`g03KN*Q;JTNHIrLBOP~<K+}_?kYCG<e5aM?L
zP>PF-a}wxqI8annWN(!704~bxO>oY2#@J_7RdeF0stQH<I^`5aG1u1CTvF@{049Jy
z-c4fN8_xLwITD@&Fl2a?b5083sj5oK%F6zhkN=bY>_@uzHvo45gc)O>0h|U91K|J8
z7|F&vP6%nRO^9LH(NLn%=qVXUmXwr)7-M%dO><>Bh%xpAz!Tejd<EbY0E~~1r+99+
zI}{3q?&!MiN*~l|^LACP*8#-rjiR)-xBp|)@H!HSOw`oWT=RH5T@HuCk#B07nws|T
z1_uWx>gwvQdA;5)P1CaR9?MF6zl;0&`ZmMi@Qt~-xs$7_s}Jqv$#LkWf7>?=!?-au
zHFa`%dHJE$x%=@5A%EmNX4=}?-p$X?UtU;PIJ>pA^;T8YU+i6+uQfC@yqlh$zC1HC
zb9Q56<E^G?Kg8Q(&CSgRJ32Z};3rvUXXn9zfq|TOUjQRjp0M?QpP&E$002ovPDHLk
FV1lgs-U0vs

literal 1442
zcmeAS@N?(olHy`uVBq!ia0vp^B0wy}!3HFwFZ>e#Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?@QuLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&saCvz|c^^%uLVF
z#MI2pP)EVYz|ctF0Eo<V4Na^}&8&>f6`()~Xj@TAnpKdC8`Lf!&sHg;q@=(~U%$M(
zT(8_%FTW^V-_X+15@d#vkuFe$ZgFK^Nn(X=Ua>OF1ees}<f6=ilFa-(1(1n}N%^HE
zwn{*kLcEY$05>+T7#d8#0MoBXEYLU9GXQxBrqI_HztY@Xxa#7Ppj3o=u^L<)Qdy9y
zACy|0Us{w5jJPyqkW~d%&PAz-CHX}m`T04pPz=b(FUc>?$S+WE4mMNJ@J&q4%mWE%
zf_3=%T6yLbmn7yTr+T{BDgn*V%gju%GIDk?bar$#G<G#{Gc<HHax`*wvovxsG&D1G
zF*G$cg6Vb1PcF?(%`1WFO+n~2!l@UO7;+1MHoK%2WtOF;xE1B+Du6w0m5I|WE^au@
zgX&Ge?G^)^di8;h(Fa8>QdGl)fawRsgeP1e2cGm(^ML8S2$-<7nchk=FffUDx;TbZ
z+?q0Fe|A)$$npO3?fX}J(BTl1ZMo)X7~vf?eS(OLRqB+yxn0iFQVKXvUNCKOxK*!^
zqG>TxiI2~zy+nv};kJy|7ySH8UnQ*hwdKC@_i5stmHP2N9_)U9xBA`pIo0d7#pt=~
z^dEQ5+diAEnek?h*(H<SIezM2f7g1cO+FX3_S=f6wg0q4xJss9NtIuAS@Ua^t*Th}
z+GCGDeqR{y!hiG4J4cq!eA=-2W{zBj(aZ_wpK~t{TDdpF<X2drNY?h->VNL}yehDm
zV_z_9j?#xTqnT?xR5tY+*%+J&wb+p9utYeyc*dH;zBUs*YCcr$b$mI)e3JC18zu>6
zv;V5G7a1<s)zOV!-g$rC3eD+#n}4n@5a6`l@QA63bKQYm67pRe%MLg3oH-|U*Yms6
z`~#L2to{f1Zm{N-nn=yO?i!kDBllmw)uT9g$1l#h=H|+oDYMECUMjsSG2tp}<;OkB
zzk{EKZB&|f+>iGb!}?b1eRgsMYcJTQtXM2vBUakeRjzLH^jd?M-!D-MvC=(k=YKdH
zNH(2+-hS$Ja{&&U_Pzq=Ek}>V-FV@nP^zdPD*kVhxTOqVmWfpS>#tRcbN%w$4?m2Z
ze){QxYA?a>(>GMytIp_OowV`Cx)80kTcXzXADg`O(wFUKX1m{(?Y2Ml^wVswrJJt3
zEZLWQxV>!m-972k-?41}G5Ny7PuxxWKK%ac7{e6Y{hvjG!D8~&JXbDdMo_8g>FVdQ
I&MBb@0GAyc2><{9

diff --git a/app/assets/javascripts/fakeJamClient.js b/app/assets/javascripts/fakeJamClient.js
index 0ad7934d2..fd3ab5171 100644
--- a/app/assets/javascripts/fakeJamClient.js
+++ b/app/assets/javascripts/fakeJamClient.js
@@ -79,7 +79,8 @@
         function SessionGetControlState(mixerIds) {
             var response = [];
             for (var i=0; i<mixerIds.length; i++) {
-                response.append({
+                response.push({
+                    client_id: "",
                     group_id: 0,
                     id: mixerIds[i],
                     master: true,
@@ -116,11 +117,17 @@
         function doCallbacks() {
             var names = ["left_vu", "right_vu"];
             var ids = ["FW AP Multi_2_10200", "FW AP Multi_0_10000"];
-            var js = '';
-            for (var i=0; i<names.length; i++) {
-                js = eventCallbackName + '("' + names[i] + '", "' + ids[i] + '",' + vuValue + ')';
-                eval(js);
+            var args = [];
+            for (var i=0; i<ids.length; i++) {
+                for (var j=0; j<names.length; j++) {
+                    args.push('"' + names[j] + '"');
+                    args.push('"' + ids[i] + '"');
+                    args.push(vuValue);
+                }
             }
+            var js = eventCallbackName + '(' + args.join(',') + ')';
+            eval(js);
+
             vuValue += vuChange;
             if (vuValue > 10 || vuValue < -70) { vuChange = vuChange * -1; }
         }
diff --git a/app/assets/javascripts/session.js b/app/assets/javascripts/session.js
index 63ca82f23..d627f6b44 100644
--- a/app/assets/javascripts/session.js
+++ b/app/assets/javascripts/session.js
@@ -92,26 +92,36 @@
 
         // Get the latest list of underlying audio mixer channels
         function _updateMixers() {
-            mixers = context.jamClient.SessionGetIDs();
+            var mixerIds = context.jamClient.SessionGetIDs();
+            mixers = context.jamClient.SessionGetControlState(mixerIds);
+            logger.debug("Mixers updated:");
+            logger.debug(mixers);
         }
 
         // Given a clientId, return a dictionary of mixer ids which
         // correspond to that client's tracks
         // TODO - this is hard-coded. Need fix from Nat
-        function _mixersForTrack(clientId) {
-            return {
-                left: "FW AP Multi_2_10200.l",
-                right: "FW AP Multi_2_10200.r"
-            };
+        function _inputMixerForClient(clientId) {
+            // Iterate over the mixers, but simply return the first
+            // mixer in the AudioInputMusicGroup
+            var mixer = null;
+            for (var i=0; i<mixers.length; i++) {
+                mixer = mixers[i];
+                if (mixer.group_id === 2) {
+                    return mixer.id;
+                }
+            }
+            return null; // no audio input music mixers.
         }
 
         function _renderTracks() {
             var participantCount = 0;
+            var inputMixer = null;
             $.each(session.participants, function(index, value) {
                 if (!(this.client_id in tracks)) {
                     var user = users[this.user.id];
                     // TODO - handle multiple tracks for one user
-                    mixers = _mixersForTrack(this.client_id);
+                    inputMixer = _inputMixerForClient(this.client_id);
                     var trackData = {
                         clientId: this.client_id,
                         name: user.first_name + ' ' + user.last_name,
@@ -121,8 +131,7 @@
                         vu: 0.0,
                         gain: 0.5,
                         mute: false,
-                        leftMixerId: mixers.left,
-                        rightMixerId: mixers.right
+                        mixerId: inputMixer
                     };
                     _addTrack(trackData);
                 }
@@ -147,6 +156,8 @@
         // Given a mixerID and a value between 0.0-1.0,
         // light up the proper VU lights.
         function _updateVU(mixerId, value) {
+            // Minor tweak to support VU values -- the mixerId here will
+            // have a suffix added _vul or _vur to indicate the channel.
             // There are 13 VU lights. Figure out how many to
             // light based on the incoming value.
             var i = 0;
@@ -156,7 +167,7 @@
             var $light = null;
             var colorClass = 'vu-green-';
             // Remove all light classes from all lights
-            var allLightsSelector = '.session-mytracks table[mixer-id="' + mixerId + '"] td.vulight';
+            var allLightsSelector = '#tracks table[mixer-id="' + mixerId + '"] td.vulight';
             $(allLightsSelector).removeClass('vu-green-off vu-green-on vu-red-off vu-red-on');
 
             // Set the lights
@@ -169,7 +180,7 @@
                 if (i >= lights) {
                     state = 'off';
                 }
-                selector = '.session-mytracks table[mixer-id="' + mixerId + '"] td.vu' + i;
+                selector = '#tracks table[mixer-id="' + mixerId + '"] td.vu' + i;
                 $light = $(selector);
                 $light.addClass(colorClass + state);
             }
@@ -211,11 +222,15 @@
                     // value is a DB value from -80 to 20. Convert to float from 0.0-1.0
                     vuVal = (value + 80) / 100;
                     if (eventName === 'left_vu') {
-                        mixerId = mixerId + ".l";
+                        mixerId = mixerId + "_vul";
                     } else {
-                        mixerId = mixerId + ".r";
+                        mixerId = mixerId + "_vur";
                     }
                     _updateVU(mixerId, vuVal);
+                } else {
+                    // Examples of other events
+                    // Add media file track: "add", "The_Abyss_4T", 0
+                    logger.debug('non-vu event: ' + eventName + ',' + mixerId + ',' + value);
                 }
             }
         }
@@ -232,8 +247,45 @@
             }
         }
 
+        function _toggleVisualMuteControl($control, muting) {
+            if (muting) {
+                $control.removeClass('enabled');
+                $control.addClass('muted');
+            } else {
+                $control.removeClass('muted');
+                $control.addClass('enabled');
+            }
+        }
+
+        function _toggleAudioMute(mixerId, muting) {
+            // 'fill' the trackVolume object volumes from what's in the
+            // corresponding mixer.
+            var mixer = null;
+            for (var i=0; i<mixers.length; i++) {
+                mixer = mixers[i];
+                if (mixer.id === mixerId) {
+                    context.trackVolumeObject.volL = mixer.volume_left;
+                    context.trackVolumeObject.volR = mixer.volume_right;
+                    break;
+                }
+            }
+            context.trackVolumeObject.mute = muting;
+            logger.debug("Set Control State:");
+            logger.debug(context.trackVolumeObject);
+            context.jamClient.SessionSetControlState(mixerId);
+        }
+
+        function toggleMute(evt) {
+            var $control = $(evt.currentTarget);
+            var mixerId = $control.attr('mixer-id');
+            var muting = ($control.hasClass('enabled'));
+            _toggleVisualMuteControl($control, muting);
+            _toggleAudioMute(mixerId, muting);
+        }
+
         function events() {
             $('#session-contents').on("click", '[action="delete"]', deleteSession);
+            $('#tracks').on('click', 'div[control="mute"]', toggleMute);
         }
 
         this.initialize = function() {
diff --git a/app/assets/stylesheets/client/session.css.scss b/app/assets/stylesheets/client/session.css.scss
index 5449a8b17..507cec5ba 100644
--- a/app/assets/stylesheets/client/session.css.scss
+++ b/app/assets/stylesheets/client/session.css.scss
@@ -376,9 +376,21 @@ table.vu td {
 }
 
 .track-icon-mute {
+    cursor: pointer;
     position:absolute;
     top:230px;
     left:29px;
+    width: 20px;
+    height: 18px;
+    background-image:url('/assets/content/icon_mute.png');
+    background-repeat:no-repeat;
+}
+
+.track-icon-mute.muted {
+    background-position: 0px 0px;
+}
+.track-icon-mute.enabled {
+    background-position: -20px 0px;
 }
 
 .session-livetracks .track-icon-mute, .session-recordings .track-icon-mute {
diff --git a/app/views/clients/_session.html.erb b/app/views/clients/_session.html.erb
index e9d1be8b4..410c87ff1 100644
--- a/app/views/clients/_session.html.erb
+++ b/app/views/clients/_session.html.erb
@@ -29,6 +29,7 @@
     <!-- end session controls -->
 
     <!-- content scrolling area -->
+    <div id="tracks">
     <div class="content-scroller">
 
         <!-- content wrapper -->
@@ -52,15 +53,16 @@
 
         </div> <!-- end content wrapper -->
     </div> <!-- end of content wrapper -->
+    </div> <!-- end of #tracks -->
 </div> <!-- end of screen -->
 
 <!-- Track Template -->
 <script type="text/template" id="template-session-track">
 <div class="session-track track" client-id="{clientId}">
-    <table class="track-vu-left vu" mixer-id="{leftMixerId}">
+    <table class="track-vu-left vu" mixer-id="{mixerId}_vul">
         {left-vu}
     </table>
-    <table class="track-vu-right vu" mixer-id="{rightMixerId}">
+    <table class="track-vu-right vu" mixer-id="{mixerId}_vur">
         {right-vu}
     </table>
     <div class="track-label">{name}</div>
@@ -79,18 +81,15 @@
     <div class="track-gain">
         <div class="track-gain-wrapper">
             <div class="track-gain-slider pos50" 
-                left-mixer-id="{leftMixerId}" 
-                right-mixer-id="{rightMixerId}">
+                mixer-id="{mixerId}">
                 <%= image_tag "content/slider_gain_vertical.png", 
                     {:width => 28, :height => 11} %>
             </div>
         </div>
     </div>
-    <div class="track-icon-mute"
-        left-mixer-id="{leftMixerId}" 
-        right-mixer-id="{rightMixerId}">
-        <%= image_tag "content/icon_mute.png", 
-            {:width => 20, :height => 18} %>
+    <div class="track-icon-mute enabled"
+        control="mute"
+        mixer-id="{mixerId}">
     </div>
     <div class="track-icon-settings">
         <%= image_tag "content/icon_settings_lg.png",