mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remember volume and playback time in the media player

This commit is contained in:
Robin Appelman 2011-08-01 16:43:02 +02:00
parent 30ce4e5b6b
commit 29239d6638
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/media/ajax/api.php
View File

@ -132,6 +132,7 @@ if($arguments['action']){
header('Expires: 0'); header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public'); header('Pragma: public');
header('Accept-Ranges: bytes');
header('Content-Length: '.OC_Filesystem::filesize($arguments['path'])); header('Content-Length: '.OC_Filesystem::filesize($arguments['path']));
OC_Filesystem::readfile($arguments['path']); OC_Filesystem::readfile($arguments['path']);

31
apps/media/js/player.js
View File

@ -3,6 +3,7 @@ var PlayList={
current:-1, current:-1,
items:[], items:[],
player:null, player:null,
volume:0.8,
next:function(){ next:function(){
var next=PlayList.current+1; var next=PlayList.current+1;
if(next>=PlayList.items.length){ if(next>=PlayList.items.length){
@ -19,7 +20,7 @@ var PlayList={
PlayList.play(next); PlayList.play(next);
PlayList.render(); PlayList.render();
}, },
play:function(index,ready){ play:function(index,time,ready){
if(index==null){ if(index==null){
index=PlayList.current; index=PlayList.current;
} }
@ -28,11 +29,11 @@ var PlayList={
if(PlayList.player){ if(PlayList.player){
if(PlayList.player.data('jPlayer').options.supplied!=PlayList.items[index].type){//the the audio type changes we need to reinitialize jplayer if(PlayList.player.data('jPlayer').options.supplied!=PlayList.items[index].type){//the the audio type changes we need to reinitialize jplayer
PlayList.player.jPlayer("destroy"); PlayList.player.jPlayer("destroy");
PlayList.init(PlayList.items[index].type,function(){PlayList.play(null,ready)}); PlayList.init(PlayList.items[index].type,function(){PlayList.play(null,time,eady)});
}else{ }else{
PlayList.player.jPlayer("setMedia", PlayList.items[PlayList.current]); PlayList.player.jPlayer("setMedia", PlayList.items[PlayList.current]);
PlayList.items[index].playcount++; PlayList.items[index].playcount++;
PlayList.player.jPlayer("play"); PlayList.player.jPlayer("play",time);
localStorage.setItem(oc_current_user+'oc_playlist_current',index); localStorage.setItem(oc_current_user+'oc_playlist_current',index);
if(index>0){ if(index>0){
var previous=index-1; var previous=index-1;
@ -82,6 +83,14 @@ var PlayList={
play:function(){ play:function(){
localStorage.setItem(oc_current_user+'oc_playlist_playing','true'); localStorage.setItem(oc_current_user+'oc_playlist_playing','true');
}, },
timeupdate:function(){
var time=Math.round(PlayList.player.data('jPlayer').status.currentTime);
localStorage.setItem(oc_current_user+'oc_playlist_time',time);
},
volumechange:function(){
var volume=PlayList.player.data('jPlayer').options.volume*100;
localStorage.setItem(oc_current_user+'oc_playlist_volume',volume);
},
supplied:type, supplied:type,
ready:function(){ ready:function(){
PlayList.load(); PlayList.load();
@ -89,6 +98,7 @@ var PlayList={
ready(); ready();
} }
}, },
volume:PlayList.volume,
cssSelectorAncestor:'#jp-interface', cssSelectorAncestor:'#jp-interface',
swfPath:OC.linkTo('media','js'), swfPath:OC.linkTo('media','js'),
}); });
@ -150,11 +160,20 @@ var PlayList={
if(typeof localStorage !== 'undefined'){ if(typeof localStorage !== 'undefined'){
if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items')){ if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items')){
PlayList.items=JSON.parse(localStorage.getItem(oc_current_user+'oc_playlist_items')); PlayList.items=JSON.parse(localStorage.getItem(oc_current_user+'oc_playlist_items'));
PlayList.current=parseInt((localStorage.getItem(oc_current_user+'oc_playlist_current'))); PlayList.current=parseInt(localStorage.getItem(oc_current_user+'oc_playlist_current'));
var time=parseInt(localStorage.getItem(oc_current_user+'oc_playlist_time'));
if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_volume')){
var volume=localStorage.getItem(oc_current_user+'oc_playlist_volume');
PlayList.volume=volume/100;
$('.jp-volume-bar-value').css('width',volume+'%');
if(PlayList.player.data('jPlayer')){
PlayList.player.jPlayer("option",'volume',volume/100);
}
}
if(JSON.parse(localStorage.getItem(oc_current_user+'oc_playlist_playing'))){ if(JSON.parse(localStorage.getItem(oc_current_user+'oc_playlist_playing'))){
PlayList.play(); PlayList.play(null,time);
}else{ }else{
PlayList.play(null,function(){ PlayList.play(null,time,function(){
PlayList.player.jPlayer("pause"); PlayList.player.jPlayer("pause");
}); });
} }