--- ffmpeg_wrapper2/ffmpeg_wrapper_ui/ffmpeg_wrapper_ui.module	2010-08-24 08:34:19.000000000 -0400
+++ ffmpeg_wrapper/ffmpeg_wrapper_ui/ffmpeg_wrapper_ui.module	2011-07-15 10:57:51.000000000 -0400
@@ -27,7 +27,7 @@
   );
   // Allow users to transcode if they can edit the node
   $items['node/%node/ffmpeg/%'] = array (
-    'title' => 'Test Convert File',
+    'title' => 'Convert File',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('ffmpeg_wrapper_ui_node_convert_form', 1, 3),
     'access callback' => 'ffmpeg_wrapper_ui_access_check',
@@ -291,7 +291,7 @@
   // Add the action form
   ffmpeg_wrapper_ui_node_action_form($form, $form_state, $file);
   // Get the FFmpeg configuration form
-  $form += ffmpeg_wrapper_ui_configuration_form($form_state['values']);
+  $form += ffmpeg_wrapper_ui_configuration_form($form_state['values'], '', TRUE);
 
   // Change the title of the ffmpeg form
   $form['ffmpeg_wrapper']['#title'] = t('Transcode file using these settings');
@@ -328,7 +328,24 @@
     // Get the file path for the file to be converted
     $form_state['values']['source'] = $form_state['storage']['file']->filepath;
     // Convert the file
+    
+    // check for preset; if so, alter ffmpeg_wrapper values with that from preset
+    if (module_exists('ffmpeg_converter')) {
+      if ($form_state['values']['use_preset'] == 1) {
+        $preset = ffmpeg_converter_preset_load($form_state['values']['ffmpeg_converter_preset']);
+        $ffmpeg_wrapper = $preset->ffmpeg_wrapper;
+        foreach($ffmpeg_wrapper as $key => $value) {
+          $form_state['values'][$key] = $value;
+        }
+        if (empty($form_state['values']['destination'])) {
+          $filename = preg_replace('/[^a-zA-Z0-9\.]/', '_', basename($form_state['values']['source'])) . '.' . $ffmpeg_wrapper['ffmpeg_output_type'];
+          $form_state['values']['destination'] = pathinfo($form_state['values']['source'], PATHINFO_DIRNAME) . '/' . $filename;
+        }
+      }
+    }
+    
     $ffmpeg_object = ffmpeg_wrapper_convert_file($form_state['values']);
+    
     // Store the converted file
     $form_state['storage']['ffmpeg_object'] = $ffmpeg_object;
 
@@ -416,10 +433,12 @@
  * @param $prefix
  *   A prefix for the form elelements, needed for javascript activation on
  *   complex forms (eg: media mover).
+ * @param $include_presets
+ *   Whether to include the presets from ffmpeg_converter
  * @return array
  *   A Drupal form array.
  */
-function ffmpeg_wrapper_ui_configuration_form($configuration = array(), $form_prefix = '' ) {
+function ffmpeg_wrapper_ui_configuration_form($configuration = array(), $form_prefix = '', $include_presets = FALSE ) {
   $form['ffmpeg_wrapper'] = array(
     '#type' => 'fieldset',
     '#title' => t('FFmpeg video conversion settings'),
@@ -623,6 +642,25 @@
     '#default_value' => $configuration['ffmpeg_output_perms'] ? $configuration['ffmpeg_output_perms'] : '0644' ,
     '#size' => 4,
   );
+  
+  // add some integration with ffmpeg_converter to make it a little easier for people to convert files
+  if (module_exists('ffmpeg_converter') && $include_presets) {
+    $form['ffmpeg_wrapper']['use_preset'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Use Preset?'),
+      '#default_value' => 1,
+      '#options' => array(0 => 'No', 1 => 'Yes'),
+      '#description' => t('Use a preset to convert this file. This will override ALL options above.')
+    );  
+    $form['ffmpeg_wrapper']['ffmpeg_converter_preset'] = array(
+      '#type' => 'select',
+      '#title' => t('Preset'),
+      '#default_value' => variable_get('ffmpeg_converter_wrapper_default_preset'),
+      '#options' => ffmpeg_converter_presets(),
+      '#description' => t('Select which preset to use to convert this file.')
+    );
+  }
+  
   return $form;
 }