diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/conversion.inc | 7 | ||||
| -rw-r--r-- | includes/video_helper.inc | 5 |
2 files changed, 11 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 diff --git a/includes/video_helper.inc b/includes/video_helper.inc index dfbb29f..41a8293 100644 --- a/includes/video_helper.inc +++ b/includes/video_helper.inc @@ -40,6 +40,7 @@ class video_helper { $video->files->{$extension}->filename = pathinfo($variables['item']['filename'], PATHINFO_FILENAME) . '.' . $extension; $video->files->{$extension}->filepath = $variables['item']['uri']; $video->files->{$extension}->url = file_create_url($variables['item']['uri']); + $video->files->{$extension}->uri = $variables['item']['uri']; $video->files->{$extension}->extension = $extension; // set the player to play $video->player = $extension; @@ -97,6 +98,10 @@ class video_helper { } $thumbnail->url = file_create_url($thumbnail->filepath); + // uri + $thumbnail->uri = $thumbnail->filepath; + //mime + $thumbnail->filemime = file_get_mimetype($thumbnail->filepath); //swftools appends sites/default/files to the front of our path... //@todo Is this a setting? Need to figure this out. |