Index: ffmpeg_wrapper.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ffmpeg_wrapper/ffmpeg_wrapper.info,v
retrieving revision 1.1
diff -u -r1.1 ffmpeg_wrapper.info
--- ffmpeg_wrapper.info	16 Mar 2008 07:04:36 -0000	1.1
+++ ffmpeg_wrapper.info	18 Sep 2008 14:54:23 -0000
@@ -1,4 +1,4 @@
 ; $Id: ffmpeg_wrapper.info,v 1.1 2008/03/16 07:04:36 arthuregg Exp $
 name = FFmpeg Wrapper
 description = This is a helper module for modules which wish to implement FFmpeg functions
-package = "Other"
+core=6.x
Index: ffmpeg_wrapper.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ffmpeg_wrapper/ffmpeg_wrapper.module,v
retrieving revision 1.1.2.20
diff -u -r1.1.2.20 ffmpeg_wrapper.module
--- ffmpeg_wrapper.module	18 Sep 2008 14:07:50 -0000	1.1.2.20
+++ ffmpeg_wrapper.module	18 Sep 2008 14:54:24 -0000
@@ -13,25 +13,22 @@
 /**
  * Implementation of hook_menu().
  */
-function ffmpeg_wrapper_menu($may_cache) {
+function ffmpeg_wrapper_menu() {
   $items = array();
-  if ($may_cache) { 
-    $items[] = array(
-      'path' => 'admin/settings/ffmpeg_wrapper',
-      'title' => t('FFmpeg Wrapper settings'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('ffmpeg_wrapper_admin'),
-      'access' => user_access('administer ffmpeg wrapper'),
-    );
-    // hand back the specific configurations for a codec
-    $items[] = array(
-      'path' => 'ffmpeg_wrapper/output',
-      'title' => t('FFmpeg Wrapper'),
-      'callback' => 'ffmpeg_wrapper_output_display',    
-      'access' => user_access('access content'),
-    );    
-  }
-  return $items;
+  $items['admin/settings/ffmpeg_wrapper'] = array(
+    'title' => 'FFmpeg Wrapper',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('ffmpeg_wrapper_admin'),
+    'access arguments' => array('administer ffmpeg wrapper'),
+  );
+  // hand back the specific configurations for a codec
+  $items['ffmpeg_wrapper/output'] = array(
+    'title' => 'FFmpeg Wrapper',
+    'page callback' => 'ffmpeg_wrapper_output_display',
+    'page arguments' => array(2),  
+    'access arguments' => array('access content'),
+  );    
+    return $items;
 }
 
 
@@ -124,14 +121,14 @@
  * @param int $form_id
  * @param array $form_values
  */
-function ffmpeg_wrapper_admin_validate($form_id, $form_values) {
+function ffmpeg_wrapper_admin_validate($form, &$form_state) {
   // make sure we've got the path to the ffmpeg binary
-  if (! ffmpeg_wrapper_run_command(null, false, $form_values['ffmpeg_wrapper_path']) && $form_values['ffmpeg_wrapper_path']) {
+  if (! ffmpeg_wrapper_run_command(null, false, $form_state['values']['ffmpeg_wrapper_path']) && $form_values['ffmpeg_wrapper_path']) {
     form_set_error('ffmpeg_wrapper_path', t('FFmpeg binary was not found on the path you specified. Maybe try a different path?'));
   }
   
   // check and see if we can find the vhook directory
-  if (! is_dir($form_values['ffmpeg_wrapper_vhook']) && $form_values['ffmpeg_wrapper_vhook']) {
+  if (! is_dir($form_state['values']['ffmpeg_wrapper_vhook']) && $form_state['values']['ffmpeg_wrapper_vhook']) {
     form_set_error('ffmpeg_wrapper_vhook', t('The vhook directory was not found on the path you specified. Maybe try a different path?'));
   }
 }
@@ -675,10 +672,10 @@
 	// we don't have a configuration setting, load up the defaults
 	// for any thing that we don't have data for. First check 
 	// and see if we have a cache
-	$cache = cache_get('ffmpeg_wrapper_default_output', 'cache');
-	if (unserialize($cache->data)) {
-	  return unserialize($cache->data);
-	}
+  $cache = cache_get('ffmpeg_wrapper_default_output');
+  if (is_array($cache->data)) {
+    return $cache->data;
+  }
 	
 	// no cache, build out the default options
 	$default['audio'] = array(
@@ -693,7 +690,7 @@
 	);
 	$default['default'] = 'default';
 	
-	cache_set('ffmpeg_wrapper_default_output', 'cache', serialize($default), CACHE_TEMPORARY);
+	cache_set('ffmpeg_wrapper_default_output', $default, 'cache', CACHE_TEMPORARY);
 	
 	return $default;	
 }