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

* VRFS-2777 use SetSessionControlState to update loop info

This commit is contained in:
Seth Call 2015-02-18 03:43:33 -06:00
parent 39415cdf22
commit c30d42c9dd
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
View File

@ -11,7 +11,7 @@ class JamTrackTrackUploader < CarrierWave::Uploader::Base
# Add a white list of extensions which are allowed to be uploaded.
def extension_white_list
%w(ogg)
%w(ogg wav)
end
def store_dir

16
web/app/assets/javascripts/session.js
View File

@ -1780,8 +1780,7 @@
context.JK.checkbox($trackIconLoopCheckbox)
$trackIconLoopCheckbox.on('ifChanged', function() {
var loop = $trackIconLoopCheckbox.is(':checked')
logger.debug("Looping: ", loop, trackData.filename);
context.jamClient.SessionSetBackingTrackFileLoop(trackData.filename, loop)
_toggleAudioLoop(mixer.id, loop, getMixer(mixer.id).mode)
});
$trackIconLoop.show()
}
@ -1970,6 +1969,16 @@
context.jamClient.SessionSetControlState(mixerId, mode);
}
function _toggleAudioLoop(mixerId, loop, mode) {
fillTrackVolumeObject(mixerId);
context.trackVolumeObject.loop = loop;
if(mode === undefined) {
mode = sessionModel.getMixMode();
}
context.jamClient.SessionSetControlState(mixerId, mode);
}
function showMuteDropdowns($control) {
$control.btOn();
}
@ -2049,6 +2058,7 @@
context.trackVolumeObject.record = mixer.record;
context.trackVolumeObject.volL = mixer.volume_left;
context.trackVolumeObject.volR = mixer.volume_right;
context.trackVolumeObject.loop = mixer.loop;
// trackVolumeObject doesn't have a place for range min/max
currentMixerRangeMin = mixer.range_low;
currentMixerRangeMax = mixer.range_high;
@ -2535,7 +2545,7 @@
s = sound
}
console.log("Setting tempo and sound:", t, s)
logger.debug("Setting tempo and sound:", t, s)
metroTempo = t
metroSound = s
context.jamClient.SessionSetMetronome(t, s, 1, 0)