mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Rename Syncplay to SyncPlay

Browse source
This commit is contained in:
gion 2020-05-06 23:41:54 +02:00
parent 11f6217bb2
commit 36d097291e
10 changed files with 162 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -100,7 +100,7 @@
"src/components/syncplay/playbackPermissionManager.js",
"src/components/syncplay/groupSelectionMenu.js",
"src/components/syncplay/timeSyncManager.js",
"src/components/syncplay/syncplayManager.js",
"src/components/syncplay/syncPlayManager.js",
"src/scripts/dfnshelper.js",
"src/scripts/dom.js",
"src/scripts/filesystem.js",

18
src/components/playerstats/playerstats.js
View file

@ -1,4 +1,4 @@
define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncplayManager', 'playMethodHelper', 'layoutManager', 'serverNotifications', 'paper-icon-button-light', 'css!./playerstats'], function (events, globalize, playbackManager, connectionManager, syncplayManager, playMethodHelper, layoutManager, serverNotifications) {
define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncPlayManager', 'playMethodHelper', 'layoutManager', 'serverNotifications', 'paper-icon-button-light', 'css!./playerstats'], function (events, globalize, playbackManager, connectionManager, syncPlayManager, playMethodHelper, layoutManager, serverNotifications) {
'use strict';
function init(instance) {
@ -327,22 +327,22 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncplay
return sessionStats;
}
function getSyncplayStats() {
function getSyncPlayStats() {
var syncStats = [];
var stats = syncplayManager.getStats();
var stats = syncPlayManager.getStats();
syncStats.push({
label: globalize.translate('LabelSyncplayTimeOffset'),
label: globalize.translate('LabelSyncPlayTimeOffset'),
value: stats.TimeOffset + globalize.translate('MillisecondsUnit')
});
syncStats.push({
label: globalize.translate('LabelSyncplayPlaybackDiff'),
label: globalize.translate('LabelSyncPlayPlaybackDiff'),
value: stats.PlaybackDiff + globalize.translate('MillisecondsUnit')
});
syncStats.push({
label: globalize.translate('LabelSyncplaySyncMethod'),
label: globalize.translate('LabelSyncPlaySyncMethod'),
value: stats.SyncMethod
});
@ -405,10 +405,10 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'syncplay
name: 'Original Media Info'
});
if (syncplayManager.isSyncplayEnabled()) {
if (syncPlayManager.isSyncPlayEnabled()) {
categories.push({
stats: getSyncplayStats(),
name: 'Syncplay Info'
stats: getSyncPlayStats(),
name: 'SyncPlay Info'
});
}

10
src/components/serverNotifications.js
View file

@ -1,4 +1,4 @@
define(['connectionManager', 'playbackManager', 'syncplayManager', 'events', 'inputManager', 'focusManager', 'appRouter'], function (connectionManager, playbackManager, syncplayManager, events, inputManager, focusManager, appRouter) {
define(['connectionManager', 'playbackManager', 'syncPlayManager', 'events', 'inputManager', 'focusManager', 'appRouter'], function (connectionManager, playbackManager, syncPlayManager, events, inputManager, focusManager, appRouter) {
'use strict';
var serverNotifications = {};
@ -187,10 +187,10 @@ define(['connectionManager', 'playbackManager', 'syncplayManager', 'events', 'in
events.trigger(serverNotifications, 'UserDataChanged', [apiClient, msg.Data.UserDataList[i]]);
}
}
} else if (msg.MessageType === 'SyncplayCommand') {
syncplayManager.processCommand(msg.Data, apiClient);
} else if (msg.MessageType === 'SyncplayGroupUpdate') {
syncplayManager.processGroupUpdate(msg.Data, apiClient);
} else if (msg.MessageType === 'SyncPlayCommand') {
syncPlayManager.processCommand(msg.Data, apiClient);
} else if (msg.MessageType === 'SyncPlayGroupUpdate') {
syncPlayManager.processGroupUpdate(msg.Data, apiClient);
} else {
events.trigger(serverNotifications, msg.MessageType, [apiClient, msg.Data]);
}

56
src/components/syncplay/groupSelectionMenu.js
View file

@ -1,7 +1,7 @@
import events from 'events';
import connectionManager from 'connectionManager';
import playbackManager from 'playbackManager';
import syncplayManager from 'syncplayManager';
import syncPlayManager from 'syncPlayManager';
import loading from 'loading';
import toast from 'toast';
import actionsheet from 'actionsheet';
@ -37,7 +37,7 @@ function showNewJoinGroupSelection (button, user, apiClient) {
console.debug('No item is currently playing.');
}
apiClient.sendSyncplayCommand(sessionId, 'ListGroups').then(function (response) {
apiClient.sendSyncPlayCommand(sessionId, 'ListGroups').then(function (response) {
response.json().then(function (groups) {
var menuItems = groups.map(function (group) {
return {
@ -49,24 +49,24 @@ function showNewJoinGroupSelection (button, user, apiClient) {
};
});
if (inSession && policy.SyncplayAccess === 'CreateAndJoinGroups') {
if (inSession && policy.SyncPlayAccess === 'CreateAndJoinGroups') {
menuItems.push({
name: globalize.translate('LabelSyncplayNewGroup'),
name: globalize.translate('LabelSyncPlayNewGroup'),
icon: 'add',
id: 'new-group',
selected: true,
secondaryText: globalize.translate('LabelSyncplayNewGroupDescription')
secondaryText: globalize.translate('LabelSyncPlayNewGroupDescription')
});
}
if (menuItems.length === 0) {
if (inSession && policy.SyncplayAccess === 'JoinGroups') {
if (inSession && policy.SyncPlayAccess === 'JoinGroups') {
toast({
text: globalize.translate('MessageSyncplayCreateGroupDenied')
text: globalize.translate('MessageSyncPlayCreateGroupDenied')
});
} else {
toast({
text: globalize.translate('MessageSyncplayNoGroupsAvailable')
text: globalize.translate('MessageSyncPlayNoGroupsAvailable')
});
}
loading.hide();
@ -74,7 +74,7 @@ function showNewJoinGroupSelection (button, user, apiClient) {
}
var menuOptions = {
title: globalize.translate('HeaderSyncplaySelectGroup'),
title: globalize.translate('HeaderSyncPlaySelectGroup'),
items: menuItems,
positionTo: button,
resolveOnClick: true,
@ -83,15 +83,15 @@ function showNewJoinGroupSelection (button, user, apiClient) {
actionsheet.show(menuOptions).then(function (id) {
if (id == 'new-group') {
apiClient.sendSyncplayCommand(sessionId, 'NewGroup');
apiClient.sendSyncPlayCommand(sessionId, 'NewGroup');
} else {
apiClient.sendSyncplayCommand(sessionId, 'JoinGroup', {
apiClient.sendSyncPlayCommand(sessionId, 'JoinGroup', {
GroupId: id,
PlayingItemId: playingItemId
});
}
}).catch((error) => {
console.error('Syncplay: unexpected error listing groups:', error);
console.error('SyncPlay: unexpected error listing groups:', error);
});
loading.hide();
@ -100,7 +100,7 @@ function showNewJoinGroupSelection (button, user, apiClient) {
console.error(error);
loading.hide();
toast({
text: globalize.translate('MessageSyncplayErrorAccessingGroups')
text: globalize.translate('MessageSyncPlayErrorAccessingGroups')
});
});
}
@ -114,24 +114,24 @@ function showNewJoinGroupSelection (button, user, apiClient) {
function showLeaveGroupSelection (button, user, apiClient) {
const sessionId = getActivePlayerId();
if (!sessionId) {
syncplayManager.signalError();
syncPlayManager.signalError();
toast({
text: globalize.translate('MessageSyncplayErrorNoActivePlayer')
text: globalize.translate('MessageSyncPlayErrorNoActivePlayer')
});
showNewJoinGroupSelection(button, user, apiClient);
return;
}
const menuItems = [{
name: globalize.translate('LabelSyncplayLeaveGroup'),
name: globalize.translate('LabelSyncPlayLeaveGroup'),
icon: 'meeting_room',
id: 'leave-group',
selected: true,
secondaryText: globalize.translate('LabelSyncplayLeaveGroupDescription')
secondaryText: globalize.translate('LabelSyncPlayLeaveGroupDescription')
}];
var menuOptions = {
title: globalize.translate('HeaderSyncplayEnabled'),
title: globalize.translate('HeaderSyncPlayEnabled'),
items: menuItems,
positionTo: button,
resolveOnClick: true,
@ -140,23 +140,23 @@ function showLeaveGroupSelection (button, user, apiClient) {
actionsheet.show(menuOptions).then(function (id) {
if (id == 'leave-group') {
apiClient.sendSyncplayCommand(sessionId, 'LeaveGroup');
apiClient.sendSyncPlayCommand(sessionId, 'LeaveGroup');
}
}).catch((error) => {
console.error('Syncplay: unexpected error showing group menu:', error);
console.error('SyncPlay: unexpected error showing group menu:', error);
});
loading.hide();
}
// Register to Syncplay events
let syncplayEnabled = false;
events.on(syncplayManager, 'enabled', function (e, enabled) {
syncplayEnabled = enabled;
// Register to SyncPlay events
let syncPlayEnabled = false;
events.on(syncPlayManager, 'enabled', function (e, enabled) {
syncPlayEnabled = enabled;
});
/**
* Shows a menu to handle Syncplay groups.
* Shows a menu to handle SyncPlay groups.
* @param {HTMLElement} button - Element where to place the menu.
*/
export function show (button) {
@ -168,13 +168,13 @@ export function show (button) {
}).catch((error) => {
console.error('Playback not allowed!', error);
toast({
text: globalize.translate('MessageSyncplayPlaybackPermissionRequired')
text: globalize.translate('MessageSyncPlayPlaybackPermissionRequired')
});
});
const apiClient = connectionManager.currentApiClient();
connectionManager.user(apiClient).then((user) => {
if (syncplayEnabled) {
if (syncPlayEnabled) {
showLeaveGroupSelection(button, user, apiClient);
} else {
showNewJoinGroupSelection(button, user, apiClient);
@ -183,7 +183,7 @@ export function show (button) {
console.error(error);
loading.hide();
toast({
text: globalize.translate('MessageSyncplayNoGroupsAvailable')
text: globalize.translate('MessageSyncPlayNoGroupsAvailable')
});
});
}

150
src/components/syncplay/syncplayManager.js → src/components/syncplay/syncPlayManager.js
View file

@ -1,6 +1,6 @@
/**
* Module that manages the Syncplay feature.
* @module components/syncplay/syncplayManager
* Module that manages the SyncPlay feature.
* @module components/syncplay/syncPlayManager
*/
import events from 'events';
@ -62,9 +62,9 @@ const WaitForEventDefaultTimeout = 30000; // milliseconds
const WaitForPlayerEventTimeout = 500; // milliseconds
/**
* Class that manages the Syncplay feature.
* Class that manages the SyncPlay feature.
*/
class SyncplayManager {
class SyncPlayManager {
constructor() {
this.playbackRateSupported = false;
this.syncEnabled = false;
@ -80,8 +80,8 @@ class SyncplayManager {
this.currentPlayer = null;
this.localPlayerPlaybackRate = 1.0; // used to restore user PlaybackRate
this.syncplayEnabledAt = null; // Server time of when Syncplay has been enabled
this.syncplayReady = false; // Syncplay is ready after first ping to server
this.syncPlayEnabledAt = null; // Server time of when SyncPlay has been enabled
this.syncPlayReady = false; // SyncPlay is ready after first ping to server
this.lastCommand = null;
this.queuedCommand = null;
@ -91,7 +91,7 @@ class SyncplayManager {
this.timeOffsetWithServer = 0; // server time minus local time
this.roundTripDuration = 0;
this.notifySyncplayReady = false;
this.notifySyncPlayReady = false;
events.on(playbackManager, 'playbackstart', (player, state) => {
this.onPlaybackStart(player, state);
@ -113,17 +113,17 @@ class SyncplayManager {
events.on(timeSyncManager, 'update', (event, error, timeOffset, ping) => {
if (error) {
console.debug('Syncplay, time update issue', error);
console.debug('SyncPlay, time update issue', error);
return;
}
this.timeOffsetWithServer = timeOffset;
this.roundTripDuration = ping * 2;
if (this.notifySyncplayReady) {
this.syncplayReady = true;
if (this.notifySyncPlayReady) {
this.syncPlayReady = true;
events.trigger(this, 'ready');
this.notifySyncplayReady = false;
this.notifySyncPlayReady = false;
}
// Report ping
@ -134,12 +134,12 @@ class SyncplayManager {
if (!sessionId) {
this.signalError();
toast({
text: globalize.translate('MessageSyncplayErrorMissingSession')
text: globalize.translate('MessageSyncPlayErrorMissingSession')
});
return;
}
apiClient.sendSyncplayCommand(sessionId, 'UpdatePing', {
apiClient.sendSyncPlayCommand(sessionId, 'UpdatePing', {
Ping: ping
});
}
@ -158,8 +158,8 @@ class SyncplayManager {
*/
onPlaybackStop (stopInfo) {
events.trigger(this, 'playbackstop', [stopInfo]);
if (this.isSyncplayEnabled()) {
this.disableSyncplay(false);
if (this.isSyncPlayEnabled()) {
this.disableSyncPlay(false);
}
}
@ -238,7 +238,7 @@ class SyncplayManager {
// FIXME: the following are needed because the 'events' module
// is changing the scope when executing the callbacks.
// For instance, calling 'onPlayerUnpause' from the wrong scope breaks things because 'this'
// points to 'player' (the event emitter) instead of pointing to the SyncplayManager singleton.
// points to 'player' (the event emitter) instead of pointing to the SyncPlayManager singleton.
const self = this;
this._onPlayerUnpause = () => {
self.onPlayerUnpause();
@ -306,48 +306,48 @@ class SyncplayManager {
break;
case 'UserJoined':
toast({
text: globalize.translate('MessageSyncplayUserJoined', cmd.Data)
text: globalize.translate('MessageSyncPlayUserJoined', cmd.Data)
});
break;
case 'UserLeft':
toast({
text: globalize.translate('MessageSyncplayUserLeft', cmd.Data)
text: globalize.translate('MessageSyncPlayUserLeft', cmd.Data)
});
break;
case 'GroupJoined':
this.enableSyncplay(apiClient, new Date(cmd.Data), true);
this.enableSyncPlay(apiClient, new Date(cmd.Data), true);
break;
case 'NotInGroup':
case 'GroupLeft':
this.disableSyncplay(true);
this.disableSyncPlay(true);
break;
case 'GroupWait':
toast({
text: globalize.translate('MessageSyncplayGroupWait', cmd.Data)
text: globalize.translate('MessageSyncPlayGroupWait', cmd.Data)
});
break;
case 'GroupDoesNotExist':
toast({
text: globalize.translate('MessageSyncplayGroupDoesNotExist')
text: globalize.translate('MessageSyncPlayGroupDoesNotExist')
});
break;
case 'CreateGroupDenied':
toast({
text: globalize.translate('MessageSyncplayCreateGroupDenied')
text: globalize.translate('MessageSyncPlayCreateGroupDenied')
});
break;
case 'JoinGroupDenied':
toast({
text: globalize.translate('MessageSyncplayJoinGroupDenied')
text: globalize.translate('MessageSyncPlayJoinGroupDenied')
});
break;
case 'LibraryAccessDenied':
toast({
text: globalize.translate('MessageSyncplayLibraryAccessDenied')
text: globalize.translate('MessageSyncPlayLibraryAccessDenied')
});
break;
default:
console.error('processSyncplayGroupUpdate: command is not recognised: ' + cmd.Type);
console.error('processSyncPlayGroupUpdate: command is not recognised: ' + cmd.Type);
break;
}
}
@ -360,13 +360,13 @@ class SyncplayManager {
processCommand (cmd, apiClient) {
if (cmd === null) return;
if (!this.isSyncplayEnabled()) {
console.debug('Syncplay processCommand: SyncPlay not enabled, ignoring command', cmd);
if (!this.isSyncPlayEnabled()) {
console.debug('SyncPlay processCommand: SyncPlay not enabled, ignoring command', cmd);
return;
}
if (!this.syncplayReady) {
console.debug('Syncplay processCommand: SyncPlay not ready, queued command', cmd);
if (!this.syncPlayReady) {
console.debug('SyncPlay processCommand: SyncPlay not ready, queued command', cmd);
this.queuedCommand = cmd;
return;
}
@ -374,8 +374,8 @@ class SyncplayManager {
cmd.When = new Date(cmd.When);
cmd.EmittedAt = new Date(cmd.EmitttedAt);
if (cmd.EmitttedAt < this.syncplayEnabledAt) {
console.debug('Syncplay processCommand: ignoring old command', cmd);
if (cmd.EmitttedAt < this.syncPlayEnabledAt) {
console.debug('SyncPlay processCommand: ignoring old command', cmd);
return;
}
@ -385,12 +385,12 @@ class SyncplayManager {
this.lastCommand.PositionTicks === cmd.PositionTicks &&
this.Command === cmd.Command
) {
console.debug('Syncplay processCommand: ignoring duplicate command', cmd);
console.debug('SyncPlay processCommand: ignoring duplicate command', cmd);
return;
}
this.lastCommand = cmd;
console.log('Syncplay will', cmd.Command, 'at', cmd.When, 'PositionTicks', cmd.PositionTicks);
console.log('SyncPlay will', cmd.Command, 'at', cmd.When, 'PositionTicks', cmd.PositionTicks);
switch (cmd.Command) {
case 'Play':
@ -430,7 +430,7 @@ class SyncplayManager {
if (!sessionId) {
console.error('Missing sessionId!');
toast({
text: globalize.translate('MessageSyncplayErrorMissingSession')
text: globalize.translate('MessageSyncPlayErrorMissingSession')
});
return;
}
@ -448,22 +448,22 @@ class SyncplayManager {
if (!success) {
console.warning('Error reporting playback state to server. Joining group will fail.');
}
apiClient.sendSyncplayCommand(sessionId, 'JoinGroup', {
apiClient.sendSyncPlayCommand(sessionId, 'JoinGroup', {
GroupId: groupId,
PlayingItemId: playingItemId
});
}).catch(() => {
console.error('Timed out while waiting for `reportplayback` event!');
toast({
text: globalize.translate('MessageSyncplayErrorMedia')
text: globalize.translate('MessageSyncPlayErrorMedia')
});
return;
});
}).catch(() => {
console.error('Timed out while waiting for `playbackstart` event!');
if (!this.isSyncplayEnabled()) {
if (!this.isSyncPlayEnabled()) {
toast({
text: globalize.translate('MessageSyncplayErrorMedia')
text: globalize.translate('MessageSyncPlayErrorMedia')
});
}
return;
@ -471,19 +471,19 @@ class SyncplayManager {
}).catch((error) => {
console.error(error);
toast({
text: globalize.translate('MessageSyncplayErrorMedia')
text: globalize.translate('MessageSyncPlayErrorMedia')
});
});
}
/**
* Enables Syncplay.
* Enables SyncPlay.
* @param {Object} apiClient The ApiClient.
* @param {Date} enabledAt When Syncplay has been enabled. Server side date.
* @param {Date} enabledAt When SyncPlay has been enabled. Server side date.
* @param {boolean} showMessage Display message.
*/
enableSyncplay (apiClient, enabledAt, showMessage = false) {
this.syncplayEnabledAt = enabledAt;
enableSyncPlay (apiClient, enabledAt, showMessage = false) {
this.syncPlayEnabledAt = enabledAt;
this.injectPlaybackManager();
events.trigger(this, 'enabled', [true]);
@ -492,25 +492,25 @@ class SyncplayManager {
this.queuedCommand = null;
});
this.syncplayReady = false;
this.notifySyncplayReady = true;
this.syncPlayReady = false;
this.notifySyncPlayReady = true;
timeSyncManager.forceUpdate();
if (showMessage) {
toast({
text: globalize.translate('MessageSyncplayEnabled')
text: globalize.translate('MessageSyncPlayEnabled')
});
}
}
/**
* Disables Syncplay.
* Disables SyncPlay.
* @param {boolean} showMessage Display message.
*/
disableSyncplay (showMessage = false) {
this.syncplayEnabledAt = null;
this.syncplayReady = false;
disableSyncPlay (showMessage = false) {
this.syncPlayEnabledAt = null;
this.syncPlayReady = false;
this.lastCommand = null;
this.queuedCommand = null;
this.syncEnabled = false;
@ -519,17 +519,17 @@ class SyncplayManager {
if (showMessage) {
toast({
text: globalize.translate('MessageSyncplayDisabled')
text: globalize.translate('MessageSyncPlayDisabled')
});
}
}
/**
* Gets Syncplay status.
* Gets SyncPlay status.
* @returns {boolean} _true_ if user joined a group, _false_ otherwise.
*/
isSyncplayEnabled () {
return this.syncplayEnabledAt !== null;
isSyncPlayEnabled () {
return this.syncPlayEnabledAt !== null;
}
/**
@ -627,8 +627,8 @@ class SyncplayManager {
* Overrides some PlaybackManager's methods to intercept playback commands.
*/
injectPlaybackManager () {
if (!this.isSyncplayEnabled()) return;
if (playbackManager.syncplayEnabled) return;
if (!this.isSyncPlayEnabled()) return;
if (playbackManager.syncPlayEnabled) return;
// TODO: make this less hacky
playbackManager._localUnpause = playbackManager.unpause;
@ -638,20 +638,20 @@ class SyncplayManager {
playbackManager.unpause = this.playRequest;
playbackManager.pause = this.pauseRequest;
playbackManager.seek = this.seekRequest;
playbackManager.syncplayEnabled = true;
playbackManager.syncPlayEnabled = true;
}
/**
* Restores original PlaybackManager's methods.
*/
restorePlaybackManager () {
if (this.isSyncplayEnabled()) return;
if (!playbackManager.syncplayEnabled) return;
if (this.isSyncPlayEnabled()) return;
if (!playbackManager.syncPlayEnabled) return;
playbackManager.unpause = playbackManager._localUnpause;
playbackManager.pause = playbackManager._localPause;
playbackManager.seek = playbackManager._localSeek;
playbackManager.syncplayEnabled = false;
playbackManager.syncPlayEnabled = false;
}
/**
@ -660,7 +660,7 @@ class SyncplayManager {
playRequest (player) {
var apiClient = connectionManager.currentApiClient();
var sessionId = getActivePlayerId();
apiClient.sendSyncplayCommand(sessionId, 'PlayRequest');
apiClient.sendSyncPlayCommand(sessionId, 'PlayRequest');
}
/**
@ -669,7 +669,7 @@ class SyncplayManager {
pauseRequest (player) {
var apiClient = connectionManager.currentApiClient();
var sessionId = getActivePlayerId();
apiClient.sendSyncplayCommand(sessionId, 'PauseRequest');
apiClient.sendSyncPlayCommand(sessionId, 'PauseRequest');
// Pause locally as well, to give the user some little control
playbackManager._localUnpause(player);
}
@ -680,7 +680,7 @@ class SyncplayManager {
seekRequest (PositionTicks, player) {
var apiClient = connectionManager.currentApiClient();
var sessionId = getActivePlayerId();
apiClient.sendSyncplayCommand(sessionId, 'SeekRequest', {
apiClient.sendSyncPlayCommand(sessionId, 'SeekRequest', {
PositionTicks: PositionTicks
});
}
@ -689,7 +689,7 @@ class SyncplayManager {
* Calls original PlaybackManager's unpause method.
*/
localUnpause(player) {
if (playbackManager.syncplayEnabled) {
if (playbackManager.syncPlayEnabled) {
playbackManager._localUnpause(player);
} else {
playbackManager.unpause(player);
@ -700,7 +700,7 @@ class SyncplayManager {
* Calls original PlaybackManager's pause method.
*/
localPause(player) {
if (playbackManager.syncplayEnabled) {
if (playbackManager.syncPlayEnabled) {
playbackManager._localPause(player);
} else {
playbackManager.pause(player);
@ -711,7 +711,7 @@ class SyncplayManager {
* Calls original PlaybackManager's seek method.
*/
localSeek(PositionTicks, player) {
if (playbackManager.syncplayEnabled) {
if (playbackManager.syncPlayEnabled) {
playbackManager._localSeek(PositionTicks, player);
} else {
playbackManager.seek(PositionTicks, player);
@ -800,8 +800,8 @@ class SyncplayManager {
}
/**
* Gets Syncplay stats.
* @returns {Object} The Syncplay stats.
* Gets SyncPlay stats.
* @returns {Object} The SyncPlay stats.
*/
getStats () {
return {
@ -812,7 +812,7 @@ class SyncplayManager {
}
/**
* Emits an event to update the Syncplay status icon.
* Emits an event to update the SyncPlay status icon.
*/
showSyncIcon (syncMethod) {
this.syncMethod = syncMethod;
@ -820,7 +820,7 @@ class SyncplayManager {
}
/**
* Emits an event to clear the Syncplay status icon.
* Emits an event to clear the SyncPlay status icon.
*/
clearSyncIcon () {
this.syncMethod = 'None';
@ -828,12 +828,12 @@ class SyncplayManager {
}
/**
* Signals an error state, which disables and resets Syncplay for a new session.
* Signals an error state, which disables and resets SyncPlay for a new session.
*/
signalError () {
this.disableSyncplay();
this.disableSyncPlay();
}
}
/** SyncplayManager singleton. */
export default new SyncplayManager();
/** SyncPlayManager singleton. */
export default new SyncPlayManager();

4
src/controllers/useredit.js
View file

@ -104,7 +104,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
$('#chkEnableSharing', page).checked(user.Policy.EnablePublicSharing);
$('#txtRemoteClientBitrateLimit', page).val(user.Policy.RemoteClientBitrateLimit / 1e6 || '');
$('#txtLoginAttemptsBeforeLockout', page).val(user.Policy.LoginAttemptsBeforeLockout || '0');
$('#selectSyncplayAccess').val(user.Policy.SyncplayAccess);
$('#selectSyncPlayAccess').val(user.Policy.SyncPlayAccess);
loading.hide();
}
@ -146,7 +146,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize', 'fnchecked'], function
}).map(function (c) {
return c.getAttribute('data-id');
});
user.Policy.SyncplayAccess = page.querySelector('#selectSyncplayAccess').value;
user.Policy.SyncPlayAccess = page.querySelector('#selectSyncPlayAccess').value;
ApiClient.updateUser(user).then(function () {
ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () {
onSaveComplete(page, user);

12
src/scripts/librarymenu.js
View file

@ -1,4 +1,4 @@
define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', 'viewManager', 'libraryBrowser', 'appRouter', 'apphost', 'playbackManager', 'syncplayManager', 'groupSelectionMenu', 'browser', 'globalize', 'scripts/imagehelper', 'paper-icon-button-light', 'material-icons', 'scrollStyles', 'flexStyles'], function (dom, layoutManager, inputManager, connectionManager, events, viewManager, libraryBrowser, appRouter, appHost, playbackManager, syncplayManager, groupSelectionMenu, browser, globalize, imageHelper) {
define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', 'viewManager', 'libraryBrowser', 'appRouter', 'apphost', 'playbackManager', 'syncPlayManager', 'groupSelectionMenu', 'browser', 'globalize', 'scripts/imagehelper', 'paper-icon-button-light', 'material-icons', 'scrollStyles', 'flexStyles'], function (dom, layoutManager, inputManager, connectionManager, events, viewManager, libraryBrowser, appRouter, appHost, playbackManager, syncPlayManager, groupSelectionMenu, browser, globalize, imageHelper) {
'use strict';
function renderHeader() {
@ -89,7 +89,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
var policy = user.Policy ? user.Policy : user.localUser.Policy;
if (headerSyncButton && policy && policy.SyncplayAccess !== 'None') {
if (headerSyncButton && policy && policy.SyncPlayAccess !== 'None') {
headerSyncButton.classList.remove('hide');
}
} else {
@ -192,7 +192,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
groupSelectionMenu.show(btn);
}
function onSyncplayEnabled(event, enabled) {
function onSyncPlayEnabled(event, enabled) {
var icon = headerSyncButton.querySelector('span');
icon.classList.remove('sync', 'sync_disabled', 'sync_problem');
if (enabled) {
@ -202,7 +202,7 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
}
}
function onSyncplaySyncing(event, is_syncing, syncMethod) {
function onSyncPlaySyncing(event, is_syncing, syncMethod) {
var icon = headerSyncButton.querySelector('span');
icon.classList.remove('sync', 'sync_disabled', 'sync_problem');
if (is_syncing) {
@ -967,8 +967,8 @@ define(['dom', 'layoutManager', 'inputManager', 'connectionManager', 'events', '
updateUserInHeader();
});
events.on(playbackManager, 'playerchange', updateCastIcon);
events.on(syncplayManager, 'enabled', onSyncplayEnabled);
events.on(syncplayManager, 'syncing', onSyncplaySyncing);
events.on(syncPlayManager, 'enabled', onSyncPlayEnabled);
events.on(syncPlayManager, 'syncing', onSyncPlaySyncing);
loadNavDrawer();
return LibraryMenu;
});

2
src/scripts/site.js
View file

@ -826,7 +826,7 @@ var AppInfo = {};
define('playbackManager', [componentsPath + '/playback/playbackmanager'], getPlaybackManager);
define('timeSyncManager', [componentsPath + '/syncplay/timeSyncManager'], returnDefault);
define('groupSelectionMenu', [componentsPath + '/syncplay/groupSelectionMenu'], returnFirstDependency);
define('syncplayManager', [componentsPath + '/syncplay/syncplayManager'], returnDefault);
define('syncPlayManager', [componentsPath + '/syncplay/syncPlayManager'], returnDefault);
define('playbackPermissionManager', [componentsPath + '/syncplay/playbackPermissionManager'], returnDefault);
define('layoutManager', [componentsPath + '/layoutManager', 'apphost'], getLayoutManager);
define('homeSections', [componentsPath + '/homesections/homesections'], returnFirstDependency);

58
src/strings/en-us.json
View file

@ -491,8 +491,8 @@
"HeaderSubtitleProfile": "Subtitle Profile",
"HeaderSubtitleProfiles": "Subtitle Profiles",
"HeaderSubtitleProfilesHelp": "Subtitle profiles describe the subtitle formats supported by the device.",
"HeaderSyncplaySelectGroup": "Join a group",
"HeaderSyncplayEnabled": "Syncplay enabled",
"HeaderSyncPlaySelectGroup": "Join a group",
"HeaderSyncPlayEnabled": "SyncPlay enabled",
"HeaderSystemDlnaProfiles": "System Profiles",
"HeaderTags": "Tags",
"HeaderTaskTriggers": "Task Triggers",
@ -855,18 +855,18 @@
"LabelSubtitlePlaybackMode": "Subtitle mode:",
"LabelSubtitles": "Subtitles",
"LabelSupportedMediaTypes": "Supported Media Types:",
"LabelSyncplayTimeOffset": "Time offset with the server:",
"LabelSyncPlayTimeOffset": "Time offset with the server:",
"MillisecondsUnit": "ms",
"LabelSyncplayPlaybackDiff": "Playback time difference:",
"LabelSyncplaySyncMethod": "Sync method:",
"LabelSyncplayNewGroup": "New group",
"LabelSyncplayNewGroupDescription": "Create a new group",
"LabelSyncplayLeaveGroup": "Leave group",
"LabelSyncplayLeaveGroupDescription": "Disable Syncplay",
"LabelSyncplayAccessCreateAndJoinGroups": "Allow user to create and join groups",
"LabelSyncplayAccessJoinGroups": "Allow user to join groups",
"LabelSyncplayAccessNone": "Disabled for this user",
"LabelSyncplayAccess": "Syncplay access",
"LabelSyncPlayPlaybackDiff": "Playback time difference:",
"LabelSyncPlaySyncMethod": "Sync method:",
"LabelSyncPlayNewGroup": "New group",
"LabelSyncPlayNewGroupDescription": "Create a new group",
"LabelSyncPlayLeaveGroup": "Leave group",
"LabelSyncPlayLeaveGroupDescription": "Disable SyncPlay",
"LabelSyncPlayAccessCreateAndJoinGroups": "Allow user to create and join groups",
"LabelSyncPlayAccessJoinGroups": "Allow user to join groups",
"LabelSyncPlayAccessNone": "Disabled for this user",
"LabelSyncPlayAccess": "SyncPlay access",
"LabelTVHomeScreen": "TV mode home screen:",
"LabelTag": "Tag:",
"LabelTagline": "Tagline:",
@ -1030,21 +1030,21 @@
"MessageUnableToConnectToServer": "We're unable to connect to the selected server right now. Please ensure it is running and try again.",
"MessageUnsetContentHelp": "Content will be displayed as plain folders. For best results use the metadata manager to set the content types of sub-folders.",
"MessageYouHaveVersionInstalled": "You currently have version {0} installed.",
"MessageSyncplayEnabled": "Syncplay enabled.",
"MessageSyncplayDisabled": "Syncplay disabled.",
"MessageSyncplayUserJoined": "<b>{0}</b> has joined the group.",
"MessageSyncplayUserLeft": "<b>{0}</b> has left the group.",
"MessageSyncplayGroupWait": "<b>{0}</b> is buffering...",
"MessageSyncplayNoGroupsAvailable": "No groups available. Start playing something first.",
"MessageSyncplayPlaybackPermissionRequired": "Playback permission required.",
"MessageSyncplayGroupDoesNotExist": "Failed to join group because it does not exist.",
"MessageSyncplayCreateGroupDenied": "Permission required to create a group.",
"MessageSyncplayJoinGroupDenied": "Permission required to use Syncplay.",
"MessageSyncplayLibraryAccessDenied": "Access to this content is restricted.",
"MessageSyncplayErrorAccessingGroups": "An error occurred while accessing groups list.",
"MessageSyncplayErrorNoActivePlayer": "No active player found. Syncplay has been disabled.",
"MessageSyncplayErrorMissingSession": "Failed to enable Syncplay! Missing session.",
"MessageSyncplayErrorMedia": "Failed to enable Syncplay! Media error.",
"MessageSyncPlayEnabled": "SyncPlay enabled.",
"MessageSyncPlayDisabled": "SyncPlay disabled.",
"MessageSyncPlayUserJoined": "<b>{0}</b> has joined the group.",
"MessageSyncPlayUserLeft": "<b>{0}</b> has left the group.",
"MessageSyncPlayGroupWait": "<b>{0}</b> is buffering...",
"MessageSyncPlayNoGroupsAvailable": "No groups available. Start playing something first.",
"MessageSyncPlayPlaybackPermissionRequired": "Playback permission required.",
"MessageSyncPlayGroupDoesNotExist": "Failed to join group because it does not exist.",
"MessageSyncPlayCreateGroupDenied": "Permission required to create a group.",
"MessageSyncPlayJoinGroupDenied": "Permission required to use SyncPlay.",
"MessageSyncPlayLibraryAccessDenied": "Access to this content is restricted.",
"MessageSyncPlayErrorAccessingGroups": "An error occurred while accessing groups list.",
"MessageSyncPlayErrorNoActivePlayer": "No active player found. SyncPlay has been disabled.",
"MessageSyncPlayErrorMissingSession": "Failed to enable SyncPlay! Missing session.",
"MessageSyncPlayErrorMedia": "Failed to enable SyncPlay! Media error.",
"Metadata": "Metadata",
"MetadataManager": "Metadata Manager",
"MetadataSettingChangeHelp": "Changing metadata settings will affect new content that is added going forward. To refresh existing content, open the detail screen and click the refresh button, or perform bulk refreshes using the metadata manager.",
@ -1393,7 +1393,7 @@
"Suggestions": "Suggestions",
"Sunday": "Sunday",
"Sync": "Sync",
"SyncplayAccessHelp": "Select the level of access this user has to the Syncplay feature. Syncplay enables to sync playback with other users.",
"SyncPlayAccessHelp": "Select the level of access this user has to the SyncPlay feature. SyncPlay enables to sync playback with other users.",
"SystemDlnaProfilesHelp": "System profiles are read-only. Changes to a system profile will be saved to a new custom profile.",
"TV": "TV",
"TabAccess": "Access",

12
src/useredit.html
View file

@ -105,13 +105,13 @@
</div>
</div>
<div class="verticalSection">
<div class="selectContainer fldSelectSyncplayAccess">
<select class="selectSyncplayAccess" is="emby-select" id="selectSyncplayAccess" label="${LabelSyncplayAccess}">
<option value="CreateAndJoinGroups">${LabelSyncplayAccessCreateAndJoinGroups}</option>
<option value="JoinGroups">${LabelSyncplayAccessJoinGroups}</option>
<option value="None">${LabelSyncplayAccessNone}</option>
<div class="selectContainer fldSelectSyncPlayAccess">
<select class="selectSyncPlayAccess" is="emby-select" id="selectSyncPlayAccess" label="${LabelSyncPlayAccess}">
<option value="CreateAndJoinGroups">${LabelSyncPlayAccessCreateAndJoinGroups}</option>
<option value="JoinGroups">${LabelSyncPlayAccessJoinGroups}</option>
<option value="None">${LabelSyncPlayAccessNone}</option>
</select>
<div class="fieldDescription">${SyncplayAccessHelp}</div>
<div class="fieldDescription">${SyncPlayAccessHelp}</div>
</div>
</div>
<div class="verticalSection">