From f53f62a5ecf8343941e2c74d06b429bb271d7df2 Mon Sep 17 00:00:00 2001
From: Heshan <heshan@heidisoft.com>
Date: Sun, 13 Mar 2011 00:03:05 +0530
Subject: Completed some transcoding stuff and tested the video convert on
 save.

---
 includes/preset.inc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'includes/preset.inc')

diff --git a/includes/preset.inc b/includes/preset.inc
index f1c14b8..d3a3fdd 100644
--- a/includes/preset.inc
+++ b/includes/preset.inc
@@ -36,7 +36,7 @@ class video_preset {
     }
     $preset = array();
     foreach ($presets as $id => $value) {
-      $preset[$id] = $value['name'] . ' ' . l(t('edit'), ('admin/config/media/video/presets/preset/' . $value['name']));
+      $preset[$value['name']] = $value['name'] . ' ' . l(t('edit'), ('admin/config/media/video/presets/preset/' . $value['name']));
 //      $help[] = $value['name'] . ' - ' . $value['description'] . ' ' . l(t('edit'), preset_get_preset_path('video', $value['name']));
     }
 
@@ -62,10 +62,13 @@ class video_preset {
    * @return array $properties
    */
   public function properties() {
+    module_load_include('inc', 'video_ui', 'video.preset');
+    $presets = array();
     $preset = $this->preset;
-    return $options['properties'];
-    if (preset_exists('video', $preset))
-      preset_get_settings($preset);
+    foreach ($preset as $preset_name) {
+      $presets[$preset_name] = video_get_preset($preset_name);
+    }
+    return $presets;
   }
 
 }
\ No newline at end of file
-- 
cgit v1.2.3