diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ffmpeg.inc | 6 | ||||
| -rw-r--r-- | plugins/ffmpeg_wrapper.inc | 8 | ||||
| -rw-r--r-- | plugins/video_zencoder/includes/zencoder.inc | 2 | ||||
| -rw-r--r-- | plugins/zencoder.inc | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/plugins/ffmpeg.inc b/plugins/ffmpeg.inc index e8e0057..a83653a 100644 --- a/plugins/ffmpeg.inc +++ b/plugins/ffmpeg.inc @@ -188,7 +188,7 @@ function ffmpeg_auto_thumbnail($vidfile) { $file->filepath = $thumbfile; $file->filemime = file_get_mimetype("video-thumb-for-$fid-$i.png"); $file->filesize = filesize($thumbfile); - $file->timestamp = time(); + $file->timestamp = REQUEST_TIME; $files[] = $file; } return $files; @@ -236,7 +236,7 @@ function ffmpeg_auto_convert(&$job) { //print('executing ' . $command); die; watchdog('video_render', 'executing: ' . $command, array(), WATCHDOG_DEBUG); -// watchdog('video_render', 'Starting : ' . time()); +// watchdog('video_render', 'Starting : ' . REQUEST_TIME); //execute the command ob_start(); passthru($command." 2>&1", $command_return); @@ -259,7 +259,7 @@ function ffmpeg_auto_convert(&$job) { $file->filepath = $job->convfile; $file->filemime = file_get_mimetype($file_name); $file->filesize = filesize($job->convfile); - $file->timestamp = time(); + $file->timestamp = REQUEST_TIME; $job->converted = $file; } diff --git a/plugins/ffmpeg_wrapper.inc b/plugins/ffmpeg_wrapper.inc index 228d8ce..fd98e64 100644 --- a/plugins/ffmpeg_wrapper.inc +++ b/plugins/ffmpeg_wrapper.inc @@ -190,7 +190,7 @@ function ffmpeg_wrapper_auto_thumbnail($vidfile) { $file->filepath = $thumbfile; $file->filemime = file_get_mimetype("video-thumb-for-$fid-$i.png"); $file->filesize = filesize($thumbfile); - $file->timestamp = time(); + $file->timestamp = REQUEST_TIME; $files[] = $file; } return $files; @@ -233,7 +233,7 @@ function ffmpeg_wrapper_check_exe_path($path = NULL) { // // //print('executing ' . $command); die; // watchdog('video_render', 'executing: ' . $options); -//// watchdog('video_render', 'Starting : ' . time()); +//// watchdog('video_render', 'Starting : ' . REQUEST_TIME); // //execute the command //// ob_start(); //// passthru($command." 2>&1", $command_return); @@ -256,7 +256,7 @@ function ffmpeg_wrapper_check_exe_path($path = NULL) { // $file->filepath = $job->convfile; // $file->filemime = file_get_mimetype($file_name); // $file->filesize = filesize($job->convfile); -// $file->timestamp = time(); +// $file->timestamp = REQUEST_TIME; // // $job->converted = $file; // } @@ -399,7 +399,7 @@ function ffmpeg_wrapper_auto_convert(&$job) { $file->filepath = $output_file; $file->filemime = file_get_mimetype($file_name); $file->filesize = filesize($output_file); - $file->timestamp = time(); + $file->timestamp = REQUEST_TIME; $job->converted = $file; } diff --git a/plugins/video_zencoder/includes/zencoder.inc b/plugins/video_zencoder/includes/zencoder.inc index 1269505..fcf7e48 100644 --- a/plugins/video_zencoder/includes/zencoder.inc +++ b/plugins/video_zencoder/includes/zencoder.inc @@ -181,7 +181,7 @@ class video_zencoder_api { */ public function update($video) { $result = db_query("UPDATE {video_zencoder} SET jobid = %d, outputid = %d, bucket='%s', filename='%s', filepath='%s', filemime='%s', filesize='%s', status=%d, completed=%d WHERE vid=%d", - $video->jobid, $video->outputid, $video->bucket, $video->filename, $video->filepath, $video->filemime, $video->filesize, VIDEO_ZC_ACTIVE, time(), $video->vid); + $video->jobid, $video->outputid, $video->bucket, $video->filename, $video->filepath, $video->filemime, $video->filesize, VIDEO_ZC_ACTIVE, REQUEST_TIME, $video->vid); return $result; } diff --git a/plugins/zencoder.inc b/plugins/zencoder.inc index 29d6b7c..989222b 100644 --- a/plugins/zencoder.inc +++ b/plugins/zencoder.inc @@ -196,7 +196,7 @@ function zencoder_auto_thumbnail($vidfile) { $file->filepath = $thumbfile; $file->filemime = file_get_mimetype("video-thumb-for-$fid-$i.png"); $file->filesize = filesize($thumbfile); - $file->timestamp = time(); + $file->timestamp = REQUEST_TIME; $files[] = $file; } return $files; @@ -244,7 +244,7 @@ function zencoder_auto_convert(&$job) { //print('executing ' . $command); die; watchdog('video_render', 'executing: ' . $command, array(), WATCHDOG_DEBUG); -// watchdog('video_render', 'Starting : ' . time()); +// watchdog('video_render', 'Starting : ' . REQUEST_TIME); //execute the command ob_start(); passthru($command." 2>&1", $command_return); @@ -267,7 +267,7 @@ function zencoder_auto_convert(&$job) { $file->filepath = $job->convfile; $file->filemime = file_get_mimetype($file_name); $file->filesize = filesize($job->convfile); - $file->timestamp = time(); + $file->timestamp = REQUEST_TIME; $job->converted = $file; } |