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

3.0.5233.40306

Browse source
This commit is contained in:
Luke Pulverenti 2014-04-30 23:24:55 -04:00
parent 57d8c433c5
commit ea285c28ef
8 changed files with 106 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

38
dashboard-ui/scripts/chromecast.js
View file

@ -1374,44 +1374,6 @@
castPlayer.setReceiverVolume(false, vol / 100);
};
self.sendCommand = function (cmd) {
// Full list
// https://github.com/MediaBrowser/MediaBrowser/blob/master/MediaBrowser.Model/Session/GeneralCommand.cs#L23
switch (cmd.Name) {
case 'VolumeUp':
self.volumeUp();
break;
case 'VolumeDown':
self.volumeDown();
break;
case 'Mute':
self.mute();
break;
case 'Unmute':
self.unMute();
break;
case 'ToggleMute':
self.toggleMute();
break;
case 'SetVolume':
self.setVolume(cmd.Arguments.Volume);
break;
case 'SetAudioStreamIndex':
break;
case 'SetSubtitleStreamIndex':
break;
case 'ToggleFullscreen':
break;
default:
// Not player-related
Dashboard.processGeneralCommand(cmd);
}
};
self.getPlayerState = function () {
var deferred = $.Deferred();

75
dashboard-ui/scripts/mediacontroller.js
View file

@ -20,16 +20,16 @@
$(player).on('playbackstart.mediacontroller', function (e, state) {
var info = {
var info = {
QueueableMediaTypes: state.NowPlayingItem.MediaType,
ItemId: state.NowPlayingItem.Id,
NowPlayingItem: state.NowPlayingItem
};
info = $.extend(info, state.PlayState);
ApiClient.reportPlaybackStart(info);
}).on('playbackstop.mediacontroller', function (e, state) {
ApiClient.reportPlaybackStopped({
@ -285,6 +285,53 @@
self.shuffle = function (id) {
currentPlayer.shuffle(id);
};
self.sendCommand = function (cmd, player) {
player = player || self.getLocalPlayer();
// Full list
// https://github.com/MediaBrowser/MediaBrowser/blob/master/MediaBrowser.Model/Session/GeneralCommand.cs#L23
console.log('MediaController received command: ' + cmd.Name);
switch (cmd.Name) {
case 'VolumeUp':
player.volumeUp();
break;
case 'VolumeDown':
player.volumeDown();
break;
case 'Mute':
player.mute();
break;
case 'Unmute':
player.unMute();
break;
case 'ToggleMute':
player.toggleMute();
break;
case 'SetVolume':
player.setVolume(cmd.Arguments.Volume);
break;
case 'SetAudioStreamIndex':
break;
case 'SetSubtitleStreamIndex':
break;
case 'ToggleFullscreen':
player.toggleFullscreen();
break;
default:
{
if (player.isLocalPlayer) {
// Not player-related
Dashboard.processGeneralCommand(cmd);
} else {
player.sendCommand(cmd);
}
break;
}
}
};
}
window.MediaController = new mediaController();
@ -343,27 +390,7 @@
localPlayer = MediaController.getLocalPlayer();
if (cmd.Name === 'Mute') {
localPlayer.mute();
}
else if (cmd.Name === 'Unmute') {
localPlayer.unMute();
}
else if (cmd.Name === 'VolumeUp') {
localPlayer.volumeUp();
}
else if (cmd.Name === 'VolumeDown') {
localPlayer.volumeDown();
}
else if (cmd.Name === 'ToggleMute') {
localPlayer.toggleMute();
}
else if (cmd.Name === 'Fullscreen') {
localPlayer.remoteFullscreen();
}
else if (cmd.Name === 'SetVolume') {
localPlayer.setVolume(parseFloat(cmd.Arguments.Volume));
}
MediaController.sendCommand(cmd, localPlayer);
}
}

46
dashboard-ui/scripts/mediaplayer.js
View file

@ -724,49 +724,6 @@
});
};
self.sendCommand = function (cmd) {
// Full list
// https://github.com/MediaBrowser/MediaBrowser/blob/master/MediaBrowser.Model/Session/GeneralCommand.cs#L23
switch (cmd.Name) {
case 'VolumeUp':
self.volumeUp();
break;
case 'VolumeDown':
self.volumeDown();
break;
case 'Mute':
self.mute();
break;
case 'Unmute':
self.unMute();
break;
case 'ToggleMute':
self.toggleMute();
break;
case 'SetVolume':
self.setVolume(cmd.Arguments.Volume);
break;
case 'SetAudioStreamIndex':
break;
case 'SetSubtitleStreamIndex':
break;
case 'ToggleFullscreen':
if (currentItem && currentItem.MediaType == 'Video') {
self.toggleFullscreen();
}
break;
default:
// Not player-related
Dashboard.processGeneralCommand(cmd);
}
};
self.pause = function () {
currentMediaElement.pause();
@ -795,6 +752,8 @@
if (currentMediaElement) {
console.log('MediaPlayer toggling mute');
if (currentMediaElement.volume) {
self.mute();
} else {
@ -822,6 +781,7 @@
if (currentMediaElement) {
console.log('MediaPlayer setting volume to ' + val);
currentMediaElement.volume = val / 100;
self.onVolumeChanged(currentMediaElement);

13
dashboard-ui/scripts/nowplayingpage.js
View file

@ -16,9 +16,10 @@
$('.btnCommand,.btnToggleFullscreen', page).on('click', function () {
currentPlayer.sendCommand({
MediaController.sendCommand({
Name: this.getAttribute('data-command')
});
}, currentPlayer);
});
$('.btnStop', page).on('click', function () {
@ -79,9 +80,7 @@
player.endPlayerUpdates();
onStateChanged.call(player, e, state);
$('.itemName', page).html('');
onStateChanged.call(player, e, {});
}
function onStateChanged(e, state) {
@ -220,6 +219,10 @@
return;
}
setImageUrl(page, url);
}
function setImageUrl(page, url) {
currentImgUrl = url;
$('.nowPlayingPageImage', page).html(url ? '<img src="' + url + '" />' : '');

12
dashboard-ui/scripts/remotecontrol.js
View file

@ -131,6 +131,18 @@
});
};
self.volumeUp = function () {
sendCommandByName('VolumeUp');
};
self.volumeDown = function () {
sendCommandByName('VolumeDown');
};
self.toggleFullscreen = function () {
sendCommandByName('ToggleFullscreen');
};
self.displayContent = function (options) {
sendCommandByName('DisplayContent', {

42
dashboard-ui/scripts/site.js
View file

@ -835,20 +835,33 @@ var Dashboard = {
// Full list
// https://github.com/MediaBrowser/MediaBrowser/blob/master/MediaBrowser.Model/Session/GeneralCommand.cs#L23
if (cmd.Name === 'GoHome') {
Dashboard.navigate('index.html');
}
else if (cmd.Name === 'GoToSettings') {
Dashboard.navigate('dashboard.html');
}
else if (cmd.Name === 'DisplayContent') {
Dashboard.onBrowseCommand(cmd.Arguments);
}
else if (cmd.Name === 'GoToSearch') {
Search.showSearchPanel($.mobile.activePage);
}
else {
console.log('Unrecognized command: ' + cmd.Name);
switch (cmd.Name) {
case 'GoHome':
Dashboard.navigate('index.html');
break;
case 'GoToSettings':
Dashboard.navigate('dashboard.html');
break;
case 'DisplayContent':
Dashboard.onBrowseCommand(cmd.Arguments);
break;
case 'GoToSearch':
Search.showSearchPanel($.mobile.activePage);
break;
case 'VolumeUp':
case 'VolumeDown':
case 'Mute':
case 'Unmute':
case 'ToggleMute':
case 'SetVolume':
case 'SetAudioStreamIndex':
case 'SetSubtitleStreamIndex':
case 'ToggleFullscreen':
break;
default:
console.log('Unrecognized command: ' + cmd.Name);
break;
}
},
@ -1294,7 +1307,6 @@ var Dashboard = {
"Unmute",
"ToggleMute",
"SetVolume",
"ToggleFullscreen",
"SetAudioStreamIndex",
"SetSubtitleStreamIndex",
"DisplayContent",