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-2716 : Compare proper string for backing track type. Change a few client calls to correct function names.

This commit is contained in:
Steven Miers 2015-01-31 17:57:54 -06:00
parent cb63439219
commit d8c000c7f7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -843,7 +843,7 @@
if(mediaType == 'RecordingTrack') {
recordingTrackMixers.push(mixer)
} else if(mediaType == 'PeerMediaTrack') {
} else if(mediaType == 'PeerMediaTrack' || mediaType == 'BackingTrack') {
// BackingTrack
backingTrackMixers.push(mixer);
} else if(mediaType == 'MetronomeTrack') {
@ -882,7 +882,6 @@
function renderBackingTracks(backingTrackMixers) {
var backingTrack = sessionModel.backingTrack()
var backingTrackPath = backingTrack ? backingTrack.path : null
console.log("rendering backing track",backingTrackPath)
// pluck the 1st mixer, and assume that all other mixers in this group are of the same type (between JamTrack vs Peer)
// if it's a locally opened track (MediaTrackGroup), then we can say this person is the opener
@ -2174,7 +2173,8 @@
} else {
rest.openMetronome({id: sessionModel.id()})
.done(function() {
setMetronomeFromForm()
context.jamClient.SessionOpenMetronome(120, "click", 1, 0)
context.JK.CurrentSessionModel.refreshCurrentSession(true)
context.JK.CurrentSessionModel.refreshCurrentSession(true)
})
.fail(function(jqXHR) {
@ -2241,7 +2241,7 @@
});
});
context.jamClient.closeBackingTrackFile();
context.jamClient.SessionCloseBackingTrackFile();
return false;
}