Forgot to switch branch

This commit is contained in:
Fergal Moran
2014-05-14 20:12:23 +01:00
parent 25ccc29d87
commit 0a0f8cf7ef
2 changed files with 4 additions and 3 deletions

View File

@@ -13,8 +13,8 @@ if (!com.podnoms) com.podnoms = {};
soundManager.url = com.podnoms.settings.staticUrl + '/swf/sm/';
soundManager.bgColor = '#ffffff';
soundManager.consoleOnly = true;
soundManager.debugMode = false; //com.podnoms.settings.smDebugMode;
soundManager.debugFlash = false; //com.podnoms.settings.smDebugMode;
soundManager.debugMode = com.podnoms.settings.smDebugMode;
soundManager.debugFlash = com.podnoms.settings.smDebugMode;
soundManager.flashVersion = 9;
soundManager.flashPollingInterval = null;
soundManager.html5PollingInterval = null;
@@ -22,7 +22,7 @@ soundManager.html5Test = /^(probably|maybe)$/i;
soundManager.flashLoadTimeout = 1000;
soundManager.idPrefix = 'sound';
soundManager.noSWFCache = false;
soundManager.preferFlash = true;
soundManager.preferFlash = false;
soundManager.useConsole = true;
soundManager.useFlashBlock = false;
soundManager.useHighPerformance = false;

View File

@@ -5,6 +5,7 @@ com.podnoms.settings = {
REALTIME_HOST: "{{ REALTIME_HOST }}",
SOCKET_IO_JS_URL: "{{ SOCKET_IO_JS_URL }}",
urlRoot: '{{ API_URL }}',
liveEnabled: {{ LIVE_ENABLED }}',
liveStreamRoot: 'http://{{ LIVE_STREAM_URL }}:{{ LIVE_STREAM_PORT }}/{{ LIVE_STREAM_MOUNT }}',
streamInfoUrl: 'http://{{ LIVE_STREAM_INFO_URL }}',
volume: '{{ DEFAULT_AUDIO_VOLUME }}',