Index: transcoder.inc
===================================================================
--- transcoder.inc	(revision 8)
+++ transcoder.inc	(working copy)
@@ -1,134 +1,134 @@
-<?php
-//$Id: transcoder.inc,v 1.1.2.13 2010/07/25 14:39:16 heshanmw Exp $
-/*
- * @file
- * Class file used to wrap the transcoder functions.
- *
- * @todo need more commenting
-*/
-
-class video_transcoder {
-  private $transcoder;
-
-  public function __construct($transcoder = null) {
-    //get our configured transcoder.
-    if(!isset ($transcoder))
-      $transcoder = variable_get('vid_convertor', 'video_ffmpeg');
-//    module_load_include('inc', 'video', '/transcoders/' . $transcoder);
-    if(!module_load_include('inc', 'video', '/transcoders/' . $transcoder)) {
-      $modules = module_list();
-      foreach($modules as $module) {
-        $mobule_files = array();
-        $module_path = drupal_get_path('module', $module) .'/transcoders';
-        $mobule_files = file_scan_directory($module_path, '^.*\.inc$');
-        if(is_array($mobule_files)) {
-          foreach($mobule_files as $file) {
-            if($file->name == $transcoder)
-              require_once $file->filename;
-          }
-
-        }
-//        
-      }
-    }
-    if(class_exists($transcoder)) {
-      $this->transcoder = new $transcoder;
-    }
-    else {
-      drupal_set_message(t('The transcoder is not configured properly.'), 'error');
-    }
-  }
-
-  public function generate_thumbnails($video) {
-    return $this->transcoder->generate_thumbnails($video);
-  }
-
-  public function convert_video($video, $converted, $dimensions) {
-    $output = $this->transcoder->convert_video($video, $converted, $dimensions);
-    // If they are using metadata.
-    if (variable_get('video_metadata', FALSE)) {
-      module_load_include('inc', 'video', '/includes/metadata');
-      $metadata = new video_metadata;
-      $metadata->process($converted);
-    }
-    return $output;
-  }
-
-  public function admin_settings() {
-    $form = array();
-    $options = $this->_transcoders();
-    $form['vid_convertor'] = array(
-      '#type' => 'radios',
-      '#title' => t('Video transcoder'),
-      '#default_value' => variable_get('vid_convertor', 'video_ffmpeg'),
-      '#options' => $options['radios'],
-      '#description' => t('Selecting a video transcoder will help you convert videos and generate thumbnails. !list', array('!list' => theme('item_list', $options['help']))),
-      '#prefix' => '<div id="transcoder-radios">',
-      '#suffix' => '</div>',
-    );
-    $form = $form + $options['admin_settings'];
-    return $form;
-  }
-
-  public function admin_settings_validate($form, &$form_state) {
-    return $this->transcoder->admin_settings_validate($form, &$form_state);
-  }
-
-  private function _transcoders() {
-    // Lets find our transcoder classes and build our radio options
-    // We do this by scanning our transcoders folder
-    $form = array('radios' => array(), 'help' => array(), 'admin_settings' => array());
-    $path = drupal_get_path('module', 'video') .'/transcoders';
-    $files = file_scan_directory($path, '^.*\.inc$');
-    // check inside sub modules
-    $modules = module_list();
-    foreach($modules as $module) {
-      $mobule_files = array();
-      $module_path = drupal_get_path('module', $module) .'/transcoders';
-      $mobule_files = file_scan_directory($module_path, '^.*\.inc$');
-    }
-    $files = array_merge($files, $mobule_files);
-    foreach($files as $file) {
-      if(!module_load_include('inc', 'video', '/transcoders/' . $file->name))
-        require_once $file->filename;
-      $focus = new $file->name;
-      $form['radios'][$focus->get_value()] = $focus->get_name();
-      $form['help'][] = $focus->get_help();
-      $form['admin_settings'] = $form['admin_settings'] + $focus->admin_settings();
-    }
-//    //we need to move our video/thumbnail fieldsets to the bottom of our form as they are used for each trancoder
-//    $autothumb = $form['admin_settings']['autothumb'];
-//    $autoconv = $form['admin_settings']['autoconv'];
-//    unset($form['admin_settings']['autothumb'], $form['admin_settings']['autoconv']);
-//    if(!$this->transcoder->is_wsod())
-//    $form['admin_settings']['autothumb'] = $autothumb;
-//    $form['admin_settings']['autoconv'] = $autoconv;
-    return $form;
-  }
-
-  public function get_dimensions($video) {
-    return $this->transcoder->get_dimensions($video);
-  }
-
-  public function video_converted_extension() {
-    return $this->transcoder->video_converted_extension();
-  }
-
-  public function is_wsod() {
-    return $this->transcoder->is_wsod();
-  }
-
-}
-
-interface transcoder_interface {
-  public function run_command($command);
-  public function generate_thumbnails($video);
-  public function convert_video($video, $converted, $dimensions);
-  public function get_playtime($video);
-  public function get_name();
-  public function get_value();
-  public function get_help();
-  public function is_wsod();
-  public function admin_settings();
-  public function admin_settings_validate($form, &$form_state);
+<?php
+//$Id: transcoder.inc,v 1.1.2.13 2010/07/25 14:39:16 heshanmw Exp $
+/*
+ * @file
+ * Class file used to wrap the transcoder functions.
+ *
+ * @todo need more commenting
+*/
+
+class video_transcoder {
+  private $transcoder;
+
+  public function __construct($transcoder = null) {
+    //get our configured transcoder.
+    if(!isset ($transcoder))
+      $transcoder = variable_get('vid_convertor', 'video_ffmpeg');
+//    module_load_include('inc', 'video', '/transcoders/' . $transcoder);
+    if(!module_load_include('inc', 'video', '/transcoders/' . $transcoder)) {
+      $modules = module_list();
+      foreach($modules as $module) {
+        $mobule_files = array();
+        $module_path = drupal_get_path('module', $module) .'/transcoders';
+        $mobule_files = file_scan_directory($module_path, '^.*\.inc$');
+        if(is_array($mobule_files)) {
+          foreach($mobule_files as $file) {
+            if($file->name == $transcoder)
+              require_once $file->filename;
+          }
+
+        }
+//        
+      }
+    }
+    if(class_exists($transcoder)) {
+      $this->transcoder = new $transcoder;
+    }
+    else {
+      drupal_set_message(t('The transcoder is not configured properly.'), 'error');
+    }
+  }
+
+  public function generate_thumbnails($video) {
+    return $this->transcoder->generate_thumbnails($video);
+  }
+
+  public function convert_video($video, $converted, $dimensions) {
+    $output = $this->transcoder->convert_video($video, $converted, $dimensions);
+    // If they are using metadata.
+    if (variable_get('video_metadata', FALSE)) {
+      module_load_include('inc', 'video', '/includes/metadata');
+      $metadata = new video_metadata;
+      $metadata->process($converted);
+    }
+    return $output;
+  }
+
+  public function admin_settings() {
+    $form = array();
+    $options = $this->_transcoders();
+    $form['vid_convertor'] = array(
+      '#type' => 'radios',
+      '#title' => t('Video transcoder'),
+      '#default_value' => variable_get('vid_convertor', 'video_ffmpeg'),
+      '#options' => $options['radios'],
+      '#description' => t('Selecting a video transcoder will help you convert videos and generate thumbnails. !list', array('!list' => theme('item_list', $options['help']))),
+      '#prefix' => '<div id="transcoder-radios">',
+      '#suffix' => '</div>',
+    );
+    $form = $form + $options['admin_settings'];
+    return $form;
+  }
+
+  public function admin_settings_validate($form, &$form_state) {
+    return $this->transcoder->admin_settings_validate($form, $form_state);
+  }
+
+  private function _transcoders() {
+    // Lets find our transcoder classes and build our radio options
+    // We do this by scanning our transcoders folder
+    $form = array('radios' => array(), 'help' => array(), 'admin_settings' => array());
+    $path = drupal_get_path('module', 'video') .'/transcoders';
+    $files = file_scan_directory($path, '^.*\.inc$');
+    // check inside sub modules
+    $modules = module_list();
+    foreach($modules as $module) {
+      $mobule_files = array();
+      $module_path = drupal_get_path('module', $module) .'/transcoders';
+      $mobule_files = file_scan_directory($module_path, '^.*\.inc$');
+    $files = array_merge($files, $mobule_files);
+    }
+    foreach($files as $file) {
+      if(!module_load_include('inc', 'video', '/transcoders/' . $file->name))
+        require_once $file->filename;
+      $focus = new $file->name;
+      $form['radios'][$focus->get_value()] = $focus->get_name();
+      $form['help'][] = $focus->get_help();
+      $form['admin_settings'] = $form['admin_settings'] + $focus->admin_settings();
+    }
+//    //we need to move our video/thumbnail fieldsets to the bottom of our form as they are used for each trancoder
+//    $autothumb = $form['admin_settings']['autothumb'];
+//    $autoconv = $form['admin_settings']['autoconv'];
+//    unset($form['admin_settings']['autothumb'], $form['admin_settings']['autoconv']);
+//    if(!$this->transcoder->is_wsod())
+//    $form['admin_settings']['autothumb'] = $autothumb;
+//    $form['admin_settings']['autoconv'] = $autoconv;
+    return $form;
+  }
+
+  public function get_dimensions($video) {
+    return $this->transcoder->get_dimensions($video);
+  }
+
+  public function video_converted_extension() {
+    return $this->transcoder->video_converted_extension();
+  }
+
+  public function is_wsod() {
+    return $this->transcoder->is_wsod();
+  }
+
+}
+
+interface transcoder_interface {
+  public function run_command($command);
+  public function generate_thumbnails($video);
+  public function convert_video($video, $converted, $dimensions);
+  public function get_playtime($video);
+  public function get_name();
+  public function get_value();
+  public function get_help();
+  public function is_wsod();
+  public function admin_settings();
+  public function admin_settings_validate($form, &$form_state);
 }
\ No newline at end of file