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

update video osd

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-04 15:29:29 -05:00
parent 5fb6288ba2
commit 5516e8b168
9 changed files with 19 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.441", "version": "1.4.442",
"_release": "1.4.441", "_release": "1.4.442",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.441", "tag": "1.4.442",
"commit": "f887007409e0ab3a8ca1f5b2a58aac519fc2c5cc" "commit": "f4fbcdd53e93fcc3c5a8ce58c5f8ba63be77a4ee"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

2
dashboard-ui/bower_components/emby-webcomponents/htmlvideoplayer/plugin.js vendored
View file

@ -698,7 +698,9 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
// simple playback should use the native support // simple playback should use the native support
if (mediaSource.RunTimeTicks) { if (mediaSource.RunTimeTicks) {
//if (!browser.edge) {
return false; return false;
//}
} }
//return false; //return false;

8
dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js vendored
View file

@ -461,6 +461,14 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
lastLocalPlayer = player; lastLocalPlayer = player;
} }
if (previousPlayer) {
self.endPlayerUpdates(previousPlayer);
}
if (player) {
self.beginPlayerUpdates(player);
}
triggerPlayerChange(player, targetInfo, previousPlayer, previousTargetInfo); triggerPlayerChange(player, targetInfo, previousPlayer, previousTargetInfo);
} }

2
dashboard-ui/components/apphost.js
View file

@ -146,7 +146,7 @@ define(['appStorage', 'browser'], function (appStorage, browser) {
} }
if (supportsFullscreen()) { if (supportsFullscreen()) {
features.push('fullscreen'); features.push('fullscreenchange');
} }
if (browser.chrome || (browser.edge && !browser.slow)) { if (browser.chrome || (browser.edge && !browser.slow)) {

9
dashboard-ui/components/remotecontrol.js
View file

@ -460,7 +460,6 @@
console.log('remotecontrol event: ' + e.type); console.log('remotecontrol event: ' + e.type);
var player = this; var player = this;
playbackManager.beginPlayerUpdates(player);
onStateChanged.call(player, e, state); onStateChanged.call(player, e, state);
loadPlaylist(dlg); loadPlaylist(dlg);
@ -469,9 +468,6 @@
function onPlaybackStopped(e, state) { function onPlaybackStopped(e, state) {
console.log('remotecontrol event: ' + e.type); console.log('remotecontrol event: ' + e.type);
var player = this;
playbackManager.endPlayerUpdates(player);
loadPlaylist(dlg); loadPlaylist(dlg);
} }
@ -527,7 +523,6 @@
events.off(player, 'playing', onPlayPauseStateChanged); events.off(player, 'playing', onPlayPauseStateChanged);
events.off(player, 'timeupdate', onTimeUpdate); events.off(player, 'timeupdate', onTimeUpdate);
playbackManager.endPlayerUpdates(player);
currentPlayer = null; currentPlayer = null;
} }
} }
@ -544,10 +539,6 @@
playbackManager.getPlayerState(player).then(function (state) { playbackManager.getPlayerState(player).then(function (state) {
if (state.NowPlayingItem) {
playbackManager.beginPlayerUpdates(player);
}
onStateChanged.call(player, { type: 'init' }, state); onStateChanged.call(player, { type: 'init' }, state);
}); });

4
dashboard-ui/scripts/nowplayingbar.js
View file

@ -642,8 +642,6 @@
console.log('nowplaying event: ' + e.type); console.log('nowplaying event: ' + e.type);
var player = this; var player = this;
playbackManager.endPlayerUpdates(player);
hideNowPlayingBar(); hideNowPlayingBar();
} }
@ -673,7 +671,6 @@
} }
isEnabled = true; isEnabled = true;
playbackManager.beginPlayerUpdates(player);
if (nowPlayingBarElement) { if (nowPlayingBarElement) {
updatePlayerStateInternal(event, state); updatePlayerStateInternal(event, state);
@ -718,7 +715,6 @@
events.off(player, 'playing', onPlayPauseStateChanged); events.off(player, 'playing', onPlayPauseStateChanged);
events.off(player, 'timeupdate', onTimeUpdate); events.off(player, 'timeupdate', onTimeUpdate);
playbackManager.endPlayerUpdates(player);
currentPlayer = null; currentPlayer = null;
hideNowPlayingBar(); hideNowPlayingBar();
} }

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

@ -2745,7 +2745,7 @@ var AppInfo = {};
postInitDependencies.push('playerSelectionMenu'); postInitDependencies.push('playerSelectionMenu');
//if (appHost.supports('fullscreen')) { //if (appHost.supports('fullscreenchange')) {
require(['fullscreen-doubleclick']); require(['fullscreen-doubleclick']);
//} //}

6
dashboard-ui/scripts/videoosd.js
View file

@ -447,8 +447,6 @@
updatePlayerStateInternal(event, state); updatePlayerStateInternal(event, state);
updatePlaylist(); updatePlaylist();
playbackManager.beginPlayerUpdates(player);
enableStopOnBack(true); enableStopOnBack(true);
} }
@ -487,9 +485,6 @@
currentRuntimeTicks = null; currentRuntimeTicks = null;
console.log('nowplaying event: ' + e.type); console.log('nowplaying event: ' + e.type);
var player = this;
playbackManager.endPlayerUpdates(player);
if (state.nextMediaType !== 'Video') { if (state.nextMediaType !== 'Video') {
@ -539,7 +534,6 @@
events.off(player, 'playing', onPlayPauseStateChanged); events.off(player, 'playing', onPlayPauseStateChanged);
events.off(player, 'timeupdate', onTimeUpdate); events.off(player, 'timeupdate', onTimeUpdate);
playbackManager.endPlayerUpdates(player);
currentPlayer = null; currentPlayer = null;
} }
} }

4
dashboard-ui/videoosd.html
View file

@ -198,10 +198,10 @@
<i class="xlargePaperIconButton md-icon">&#xE044;</i> <i class="xlargePaperIconButton md-icon">&#xE044;</i>
</button> </button>
<button is="paper-icon-button-light" class="btnAudio autoSize"> <button is="paper-icon-button-light" class="btnAudio hide autoSize">
<i class="xlargePaperIconButton md-icon">&#xE3A1;</i> <i class="xlargePaperIconButton md-icon">&#xE3A1;</i>
</button> </button>
<button is="paper-icon-button-light" class="btnSubtitles autoSize"> <button is="paper-icon-button-light" class="btnSubtitles hide autoSize">
<i class="xlargePaperIconButton md-icon">&#xE01C;</i> <i class="xlargePaperIconButton md-icon">&#xE01C;</i>
</button> </button>
<button is="paper-icon-button-light" class="btnCast hide autoSize"> <button is="paper-icon-button-light" class="btnCast hide autoSize">