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

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2013-09-16 02:28:52 +00:00
parent 4d723bacaf 1d36dcb88f
commit 1082a7386a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/app/assets/javascripts/fakeJamClient.js
View File

@ -189,6 +189,11 @@
// Session Functions
function SessionAddTrack() {}
function SessionAudioResync() {
logger.debug("Fake JamClient: SessionAudioResync()");
}
function SessionGetControlState(mixerIds) {
dbg("SessionGetControlState");
var groups = [0, 1, 2, 3, 7, 9];
@ -553,6 +558,7 @@
this.SessionGetMasterLocalMix = SessionGetMasterLocalMix;
this.SessionSetMasterLocalMix = SessionSetMasterLocalMix;
this.SessionGetDeviceLatency = SessionGetDeviceLatency;
this.SessionAudioResync = SessionAudioResync;
// Track
this.TrackGetChannels = TrackGetChannels;

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

@ -781,7 +781,7 @@
function sessionResync(evt) {
evt.preventDefault();
var response = context.jamClient.FTUESave(true);
var response = context.jamClient.SessionAudioResync();
if (response) {
app.notify({
"title": "Error",