seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix VU meters for remote participants

This commit is contained in:
Jonathon Wilson 2013-08-04 21:00:23 -06:00
parent a686a30162
commit badacb4d6c
2 changed files with 2 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/session.js
View File

@ -425,7 +425,9 @@
var $track = $('div.track[client-id="' + key + '"]');
// Set mixer-id attributes and render VU/Fader
context.JK.VuHelpers.renderVU(vuLeftSelector, vuOpts);
$track.find('.track-vu-left').attr('mixer-id', mixer.id + '_vul');
context.JK.VuHelpers.renderVU(vuRightSelector, vuOpts);
$track.find('.track-vu-right').attr('mixer-id', mixer.id + '_vur');
context.JK.FaderHelpers.renderFader(faderSelector, faderOpts);
context.JK.FaderHelpers.subscribe(mixer.id, faderChanged);

49
app/views/clients/_session.html.erb
View File

@ -170,55 +170,6 @@
<option value="{value}" title="{label}" {selected}>{label}</option>
</script>
<!-- VU Template -->
<!-- TODO JW: Starting to pull these out into _gain_meters.html.erb. -->
<!-- Have duplicated this there, and renamed from template-vu to template-vu-v
but haven't used it yet. I'd like it to be its own self-contained table
instead of a set of rows like it is now. -->
<!--
<script type="text/template" id="template-vu">
<tr>
<td width=3 height=17 class="vulight vu12 vu-red-off"></td>
</tr>
<tr>
<td width=3 height=17 class="vulight vu11 vu-red-off"></td>
</tr>
<tr>
<td width=3 height=17 class="vulight vu10 vu-red-off"></td>
</tr>
<tr>
<td width=3 height=17 class="vulight vu9 vu-red-off"></td>
</tr>
<tr>
<td width=3 height=17 class="vulight vu8 vu-green-off"></td>
</tr>
<tr>
<td width=3 height=17 class="vulight vu7 vu-green-off"></td>
</tr>
<tr>
<td width=3 height=17 class="vulight vu6 vu-green-off"></td>
</tr>
<tr>
<td width=3 height=17 class="vulight vu5 vu-green-off"></td>
</tr>
<tr>
<td width=3 height=17 class="vulight vu4 vu-green-off"></td>
</tr>
<tr>
<td width=3 height=17 class="vulight vu3 vu-green-off"></td>
</tr>
<tr>
<td width=3 height=17 class="vulight vu2 vu-green-off"></td>
</tr>
<tr>
<td width=3 height=17 class="vulight vu1 vu-green-off"></td>
</tr>
<tr>
<td width=3 height=17 class="vulight vu0 vu-green-off"></td>
</tr>
</script>
-->
<!-- Genre option template -->
<script type="text/template" id="template-genre-option">
<option value="{value}">{label}</option>