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-3128 - reset seek on load of JamTrack

This commit is contained in:
Seth Call 2015-04-29 14:38:03 -05:00
parent 72ff54213a
commit b9d30567db
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/app/assets/javascripts/playbackControls.js
View File

@ -54,6 +54,13 @@
var monitorPlaybackTimeout = null;
var playbackMonitorMode = PLAYBACK_MONITOR_MODE.MEDIA_FILE;
function init() {
updateSliderPosition(0);
updateDurationTime(0);
updateCurrentTime(0);
seenActivity = false;
}
function startPlay() {
seenActivity = false;
updateIsPlaying(true);
@ -349,6 +356,9 @@
function startMonitor(_playbackMonitorMode) {
// resets everything to zero
init();
if(_playbackMonitorMode === undefined || _playbackMonitorMode === null) {
playbackMonitorMode = PLAYBACK_MONITOR_MODE.MEDIA_FILE;
}

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

@ -1273,9 +1273,10 @@
});
}
function renderJamTracks(jamTrackMixers) {
function renderJamTracks(jamTrackMixersOrig) {
logger.debug("rendering jam tracks")
var jamTrackMixers = jamTrackMixersOrig.slice();
var jamTracks = []
var jamTrackName = 'JamTrack';
if(sessionModel.isPlayingRecording()) {
@ -1305,7 +1306,7 @@
var preMasteredClass = "";
// find the track or tracks that correspond to the mixer
var correspondingTracks = []
$.each(jamTrackMixers, function(i, matchMixer) {
$.each(jamTrackMixersOrig, function(i, matchMixer) {
if(matchMixer.id == jamTrack.id) {
correspondingTracks.push(jamTrack);
mixer = matchMixer;
@ -1327,6 +1328,9 @@
return $.inArray(value, correspondingTracks) < 0;
});
// prune found mixers
jamTrackMixers.splice(mixer);
var oneOfTheTracks = correspondingTracks[0];
var instrumentIcon = context.JK.getInstrumentIcon45(oneOfTheTracks.instrument.id);
var photoUrl = "/assets/content/icon_recording.png";