From 972dd76d32128c6180271e5d10aff89a45f0ae74 Mon Sep 17 00:00:00 2001
From: Dalyn Cessac <dalyn.cessac@1214036.no-reply.drupal.org>
Date: Wed, 16 Mar 2011 15:18:28 -0500
Subject: Updated Preset UI and fixed get_codecs function

---
 modules/video_ui/video.preset.inc | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'modules')

diff --git a/modules/video_ui/video.preset.inc b/modules/video_ui/video.preset.inc
index 42680cd..1273fc3 100644
--- a/modules/video_ui/video.preset.inc
+++ b/modules/video_ui/video.preset.inc
@@ -11,6 +11,11 @@ define('VIDEO_PRESET_MAX_LENGTH', 64);
  * @return <array> - The additional form settings that you would like to add to your preset.
  */
 function video_preset_default_form($form, &$form_state, $preset) {
+  module_load_include('inc', 'video', '/includes/conversion');
+  $video_conversion = new video_conversion;
+    
+  $codecs = $video_conversion->get_codecs();
+    
   $form = array();
   $form['settings']['device_profile'] = array(
     '#type' => 'fieldset',
@@ -57,14 +62,7 @@ function video_preset_default_form($form, &$form_state, $preset) {
     '#type' => 'select',
     '#title' => t('Video codec'),
     '#description' => t('The video codec used in the video file can affect the ability to play the video on certain devices. The default codec used is H.264.'),
-    '#options' => array(
-      'h264' => 'H.264 (default)',
-      'vp8' => 'VP8',
-      'theora' => 'Theora',
-      'vp6' => 'VP6',
-      'mpeg4' => 'MPEG-4',
-      'wmv' => 'WMV'
-    ),
+    '#options' => $codecs['encode']['video'],
     '#default_value' => (!empty($preset['settings']['video_codec'])) ? $preset['settings']['video_codec'] : 'h264'
   );
   $form['settings']['video']['video_quality'] = array(
@@ -134,12 +132,7 @@ function video_preset_default_form($form, &$form_state, $preset) {
     '#type' => 'select',
     '#title' => t('Audio codec'),
     '#description' => t('The audio codec to be used.'),
-    '#options' => array(
-      'aac' => 'AAC (default for most cases)',
-      'mp3' => 'MP3',
-      'vorbis' => 'Vorbis (default for VP8 and Theora)',
-      'wma' => 'WMA'
-    ),
+    '#options' => $codecs['encode']['audio'],
     '#default_value' => (!empty($preset['settings']['audio_codec'])) ? $preset['settings']['audio_codec'] : 'h264'
   );
   $form['settings']['audio']['audio_quality'] = array(
-- 
cgit v1.2.3