Adding namespace to the video module variables

4 files changed, 10 insertions, 10 deletions

diff --git a/includes/filesystem.inc b/includes/filesystem.inc
index 3041ee5..d7c71f9 100644
--- a/includes/filesystem.inc
+++ b/includes/filesystem.inc
@@ -14,7 +14,7 @@ class video_filesystem {
   public function __construct($filesystem = null) {
     //get our configured transcoder.
     if (!isset($filesystem))
-      $filesystem = variable_get('vid_filesystem', 'drupal');
+      $filesystem = variable_get('video_filesystem', 'drupal');
     if (!module_load_include('inc', 'video', '/filesystem/' . $filesystem)) {
       $modules = module_list();
       foreach ($modules as $module) {
@@ -51,10 +51,10 @@ class video_filesystem {
   public function admin_settings() {
     $form = array();
     $options = $this->_filesystem();
-    $form['vid_filesystem'] = array(
+    $form['video_filesystem'] = array(
       '#type' => 'radios',
       '#title' => t('Video Filesystem'),
-      '#default_value' => variable_get('vid_filesystem', 'drupal'),
+      '#default_value' => variable_get('video_filesystem', 'drupal'),
       '#options' => $options['radios'],
       '#description' => t('!list', array('!list' => theme('item_list', $options['help']))),
       '#prefix' => '<div id="filesystem-radios">',
diff --git a/includes/metadata.inc b/includes/metadata.inc
index 42f80b7..c2ad5c3 100644
--- a/includes/metadata.inc
+++ b/includes/metadata.inc
@@ -14,7 +14,7 @@ class video_metadata {
   public function __construct($metadata = null) {
     //get our configured transcoder.
     if (!isset($metadata))
-      $metadata = variable_get('vid_metadata', 'flvtool2');
+      $metadata = variable_get('video_metadata', 'flvtool2');
     if (!module_load_include('inc', 'video', '/metadata/' . $metadata)) {
       $modules = module_list();
       foreach ($modules as $module) {
@@ -51,10 +51,10 @@ class video_metadata {
       '#description' => t('Metadata is particularly useful in video, where information about its contents (such as transcripts of conversations and text descriptions of its scenes) are not directly understandable by a computer, but where efficient search is desirable.'),
     );
     $options = $this->_metadata();
-    $form['vid_metadata'] = array(
+    $form['video_metadata'] = array(
       '#type' => 'radios',
       '#title' => t('Video Metadata'),
-      '#default_value' => variable_get('vid_metadata', 'flvtool2'),
+      '#default_value' => variable_get('video_metadata', 'flvtool2'),
       '#options' => $options['radios'],
       '#description' => t('!list', array('!list' => theme('item_list', $options['help']))),
       '#prefix' => '<div id="metadata-radios">',
diff --git a/includes/transcoder.inc b/includes/transcoder.inc
index c9d79b8..8d604a5 100644
--- a/includes/transcoder.inc
+++ b/includes/transcoder.inc
@@ -28,7 +28,7 @@ class video_transcoder {
   private function get_instance($transcoder = null) {
     //get our configured transcoder.
     if (!isset($transcoder))
-      $transcoder = variable_get('vid_convertor', 'video_ffmpeg');
+      $transcoder = variable_get('video_convertor', 'video_ffmpeg');
 //    module_load_include('inc', 'video', '/transcoders/' . $transcoder);
     if (!module_load_include('inc', 'video', '/transcoders/' . $transcoder)) {
       $modules = module_list();
@@ -85,10 +85,10 @@ class video_transcoder {
   public function admin_settings() {
     $form = array();
     $options = $this->_transcoders();
-    $form['vid_convertor'] = array(
+    $form['video_convertor'] = array(
       '#type' => 'radios',
       '#title' => t('Video transcoder'),
-      '#default_value' => variable_get('vid_convertor', 'video_ffmpeg'),
+      '#default_value' => variable_get('video_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">',
diff --git a/includes/video_helper.inc b/includes/video_helper.inc
index 16598f9..63f3e5a 100644
--- a/includes/video_helper.inc
+++ b/includes/video_helper.inc
@@ -62,7 +62,7 @@ class video_helper {
     // Let othere module to load the video files by referance
     // Lets find out if we have pushed this file to the cdn if enabled.
     // @TODO : add correct filesystem load to this
-    $filesystem = variable_get('vid_filesystem', 'drupal');
+    $filesystem = variable_get('video_filesystem', 'drupal');
     if ($filesystem != 'drupal' && !module_exists('video_zencoder')) {
       module_load_include('inc', 'video', '/includes/filesystem');
       $filesystem = new video_filesystem();