aboutsummaryrefslogtreecommitdiff
path: root/includes/conversion.inc
diff options
context:
space:
mode:
authorHeshan <heshan@heidisoft.com>2011-04-06 21:47:46 +0530
committerHeshan <heshan@heidisoft.com>2011-04-06 21:47:46 +0530
commit0ce24fea04b8b571ef887d184a7f8cdeca2d4c4a (patch)
treed07484b2f7e7de07fe2fec0a27198a6857bc629f /includes/conversion.inc
parent33aed9a2bc33078ffd2ba46d2e77ac78de187512 (diff)
downloadvideo-0ce24fea04b8b571ef887d184a7f8cdeca2d4c4a.tar.gz
video-0ce24fea04b8b571ef887d184a7f8cdeca2d4c4a.tar.bz2
#1092668 by anglo VideoJS player
Diffstat (limited to 'includes/conversion.inc')
-rw-r--r--includes/conversion.inc7
1 files changed, 6 insertions, 1 deletions
diff --git a/includes/conversion.inc b/includes/conversion.inc
index c7596e9..f35984e 100644
--- a/includes/conversion.inc
+++ b/includes/conversion.inc
@@ -66,7 +66,11 @@ class video_conversion {
if ($video->video_status == VIDEO_RENDERING_PENDING) {
return $this->transcoder->convert_video($video);
} else {
- $status = array(VIDEO_RENDERING_COMPLETE => 'completed', VIDEO_RENDERING_FAILED => 'failed');
+ $status = array(
+ VIDEO_RENDERING_INQUEUE => 'in queue',
+ VIDEO_RENDERING_COMPLETE => 'completed',
+ VIDEO_RENDERING_FAILED => 'failed'
+ );
watchdog('transcoder', 'Video conversion has been !status. You should add video to the queue. Please check the re-queue to enable the video conversion.',
array('!status' => $status[$video->video_status]), WATCHDOG_WARNING);
return FALSE;
@@ -105,6 +109,7 @@ class video_conversion {
public function load_job($fid) {
return $this->transcoder->load_job($fid);
}
+
}
?> \ No newline at end of file