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

playlist functionality

Browse source
This commit is contained in:
Techywarrior 2013-04-17 18:32:38 -07:00
parent 3cf4603fff
commit 2a9a088a9e
4 changed files with 65 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,6 +50,10 @@
$('#mediaElement', nowPlayingBar).html(html);
$(".itemAudio").on("ended",function(){
Playlist.playNext();
});
return $('audio', nowPlayingBar)[0];
}
@ -171,6 +175,12 @@
(this).addEvent("play", updateProgress);
(this).addEvent("ended", function () {
MediaPlayer.stopVideo();
Playlist.playNext();
});
ApiClient.reportPlaybackStart(Dashboard.getCurrentUserId(), item.Id);
});
@ -314,19 +324,7 @@
if ($(elem).hasClass("vjs-tech")) {
var player = _V_("videoWindow");
var startTimeTicks = player.tag.src.match(new RegExp("StartTimeTicks=[0-9]+", "g"));
var startTime = startTimeTicks[0].replace("StartTimeTicks=", "");
var itemString = player.tag.src.match(new RegExp("Videos/[0-9a-z\-]+", "g"));
var itemId = itemString[0].replace("Videos/", "");
var positionTicks = parseInt(startTime) + Math.floor(10000000 * player.currentTime());
ApiClient.reportPlaybackStopped(Dashboard.getCurrentUserId(), itemId, positionTicks);
if (currentProgressInterval) {
clearTimeout(currentProgressInterval);
}
self.stopVideo();
if (player.techName == "html5") {
player.tag.src = "";
@ -354,6 +352,24 @@
currentMediaElement = null;
};
self.stopVideo = function () {
var player = _V_("videoWindow");
var startTimeTicks = player.tag.src.match(new RegExp("StartTimeTicks=[0-9]+", "g"));
var startTime = startTimeTicks[0].replace("StartTimeTicks=", "");
var itemString = player.tag.src.match(new RegExp("Videos/[0-9a-z\-]+", "g"));
var itemId = itemString[0].replace("Videos/", "");
var positionTicks = parseInt(startTime) + Math.floor(10000000 * player.currentTime());
ApiClient.reportPlaybackStopped(Dashboard.getCurrentUserId(), itemId, positionTicks);
if (currentProgressInterval) {
clearTimeout(currentProgressInterval);
}
}
self.isPlaying = function () {
return currentMediaElement;
};