diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/conversion.inc | 9 | ||||
| -rw-r--r-- | includes/transcoder.inc | 4 | ||||
| -rw-r--r-- | includes/video_helper.inc | 1 |
3 files changed, 11 insertions, 3 deletions
diff --git a/includes/conversion.inc b/includes/conversion.inc index 6611e06..ae25245 100644 --- a/includes/conversion.inc +++ b/includes/conversion.inc @@ -7,6 +7,8 @@ */ defined('VIDEO_RENDERING_PENDING') || define('VIDEO_RENDERING_PENDING', 1); +defined('VIDEO_RENDERING_INQUEUE') || + define('VIDEO_RENDERING_INQUEUE', 2); defined('VIDEO_RENDERING_ACTIVE') || define('VIDEO_RENDERING_ACTIVE', 5); defined('VIDEO_RENDERING_COMPLETE') || @@ -42,8 +44,7 @@ class video_conversion { * @return * An array containing all the videos to be proccessed. */ - private function load_job_queue() { - // @TODO : allow only limited jobs to process + public function load_job_queue() { return $this->transcoder->load_job_queue(); } @@ -97,6 +98,10 @@ class video_conversion { return $this->transcoder->delete_job($video); } + public function change_status($vid, $status) { + return $this->transcoder->change_status($vid, $status); + } + /** * Load a file based on the file id ($fid) * diff --git a/includes/transcoder.inc b/includes/transcoder.inc index e5f7123..bdb447a 100644 --- a/includes/transcoder.inc +++ b/includes/transcoder.inc @@ -172,6 +172,10 @@ class video_transcoder { return $this->transcoder->delete_job($video); } + public function change_status($vid, $status) { + return $this->transcoder->change_status($vid, $status); + } + /** * Load a file based on the file id ($fid) * diff --git a/includes/video_helper.inc b/includes/video_helper.inc index a4f2b65..e47830c 100644 --- a/includes/video_helper.inc +++ b/includes/video_helper.inc @@ -77,7 +77,6 @@ class video_helper { // Moved to last to recheck incase we changed our extension above. $video->flash_player = variable_get('video_extension_' . $video->player . '_flash_player', ''); - // Return our object return $video; } |