aboutsummaryrefslogtreecommitdiff
path: root/includes/conversion.inc
diff options
context:
space:
mode:
authorHeshan <heshan@heidisoft.com>2011-05-04 17:16:42 +0530
committerHeshan <heshan@heidisoft.com>2011-05-04 17:16:42 +0530
commitaa5c9b48cfa5674f534acab2cdaab685e9e116ee (patch)
treee4e708d3e796f875ce7ebe3b5af7bcfc72f6bd4b /includes/conversion.inc
parentd0d4b273d990ec3869a09e2312a465d357d42d13 (diff)
downloadvideo-aa5c9b48cfa5674f534acab2cdaab685e9e116ee.tar.gz
video-aa5c9b48cfa5674f534acab2cdaab685e9e116ee.tar.bz2
Run through the coder module and review the code and documentation of the module code.
Diffstat (limited to 'includes/conversion.inc')
-rw-r--r--includes/conversion.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/includes/conversion.inc b/includes/conversion.inc
index a5a930f..76e4f34 100644
--- a/includes/conversion.inc
+++ b/includes/conversion.inc
@@ -50,7 +50,8 @@ class video_conversion {
public function process($video) {
if (is_object($video) && isset($video->fid)) {
$return = $this->render($video);
- } else {
+ }
+ else {
$video_object = $this->load_job($video);
$return = $this->render($video_object);
}
@@ -65,14 +66,14 @@ class video_conversion {
// Make sure this video is pending or do nothing.
if ($video->video_status == VIDEO_RENDERING_PENDING) {
return $this->transcoder->convert_video($video);
- } else {
+ }
+ else {
$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);
+ 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;
}
}