vanzhiganov/clipbucket
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modified : lock file deleted flow changed

Browse source 
modified  : player volume cookie save flow done
This commit is contained in:
Fahad Abbas 2016-05-23 19:01:33 +05:00
parent 1e10a25d6d
commit 523480cb4b
3 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
upload/actions/video_convert.php
View file

@ -133,6 +133,9 @@
$ffmpeg->ClipBucket();
if ($ffmpeg->lock_file && file_exists($ffmpeg->lock_file)){
unlink($ffmpeg->lock_file);
}
logData($ffmpeg->video_files,'video_files');

6
upload/includes/classes/conversion/ffmpeg.class.php
View file

@ -886,9 +886,6 @@ class FFMpeg{
$this->log->writeLine("Max Duration configs",$this->TemplogData , true);
//$this->create_log_file();
if($this->lock_file && file_exists($this->lock_file))
unlink($this->lock_file);
$this->failed_reason = 'max_duration';
@ -1016,9 +1013,6 @@ class FFMpeg{
$this->log->writeLine("Conversion Completed", $this->log->TemplogData , true );
//$this->create_log_file();
if($this->lock_file && file_exists($this->lock_file))
unlink($this->lock_file);
break;
}else
{

34
upload/player/CB_video_js/js/cb_vjs_plugin.js
View file

@ -56,6 +56,39 @@ cbvjsheader.prototype.init = function(){
cbvjsheader.player.el_.insertBefore(CbVjsHeader, BigPlayButton);
}
//Starting Captions Menu Holder Class
var cbvjsvolume = function(player){
var cbvjsvolume = this;
cbvjsvolume.player = player;
cbvjsvolume.init();
}
cbvjsvolume.prototype.init = function(){
var cbvjsvolume = this;
cbvjsvolume.Currvol = "";
cbvjsvolume.Muted = "";
cbvjsvolume.vol_cookie = $.cookie("cb_volume");
if (cbvjsvolume.vol_cookie){
if (cbvjsvolume.vol_cookie == "muted"){
cbvjsvolume.player.muted(true);
}else{
cbvjsvolume.player.volume(cbvjsvolume.vol_cookie);
}
}else{
console.log("Dont Mess Around Here! ");
}
cbvjsvolume.player.on('volumechange',function(){
cbvjsvolume.Currvol = cbvjsvolume.player.volume();
cbvjsvolume.Muted = cbvjsvolume.player.muted();
if (cbvjsvolume.Muted == true || cbvjsvolume.Currvol == 0 ){
$.cookie("cb_volume","muted", { expires : 10 });
}else{
$.cookie("cb_volume", cbvjsvolume.Currvol , { expires : 10 });
}
});
}
function cb_vjs_elements(settings){
@ -64,6 +97,7 @@ function cb_vjs_elements(settings){
CbVjsLogo = new cbvjslogo(this,logo_settings);
CbVjsHeader = new cbvjsheader(this,header_settings);
CbVjsVolume = new cbvjsvolume(this);
}
videojs.plugin('cb_vjs_elements', cb_vjs_elements);