? .DS_Store
? flowplayer3/.DS_Store
Index: flowplayer3/flowplayer3.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/swftools/flowplayer3/flowplayer3.admin.inc,v
retrieving revision 1.18
diff -u -p -r1.18 flowplayer3.admin.inc
--- flowplayer3/flowplayer3.admin.inc	18 Mar 2009 00:21:58 -0000	1.18
+++ flowplayer3/flowplayer3.admin.inc	2 Mar 2010 18:33:48 -0000
@@ -341,6 +341,99 @@ function flowplayer3_admin_settings() {
     '#size' => 8,
   );
 
+  // Logo configuration
+  $form[FLOWPLAYER3_MEDIAPLAYER]['logo'] = array(
+    '#type'			=> 'fieldset',
+    '#collapsible'	=> TRUE,
+    '#collapsed'	=> TRUE,
+    '#title'		=> t('Logo properties (Commercial version ONLY)'),
+	'#description'	=> t('This section is only configurable if you are using the commercial version of flowplayer'),
+  );
+
+  $form[FLOWPLAYER3_MEDIAPLAYER]['logo']['url'] = array(
+    '#type'				=> 'textfield',
+    '#default_value'	=> $saved_settings['logo']['url'],
+    '#title'			=> t('URL'),
+    '#description'		=> t('Relative URL of logo image'),
+    '#size'				=> 100,
+  ); 
+  
+   $form[FLOWPLAYER3_MEDIAPLAYER]['logo']['displayTime'] = array(
+    '#type'				=> 'textfield',
+    '#default_value'	=> $saved_settings['logo']['displayTime'],
+    '#title'			=> t('Display time'),
+    '#description'		=> t('mSecs to display logo'),
+    '#size'				=> 5,
+  );  
+
+  $form[FLOWPLAYER3_MEDIAPLAYER]['logo']['fadeSpeed'] = array(
+    '#type'				=> 'textfield',
+    '#default_value'	=> $saved_settings['logo']['fadeSpeed'],
+    '#title'			=> t('Fade speed'),
+    '#description'		=> t('Logo fade to opacity 0 speed'),
+    '#size'				=> 5,
+  ); 
+
+  $form[FLOWPLAYER3_MEDIAPLAYER]['logo']['opacity'] = array(
+    '#type'				=> 'textfield',
+    '#default_value'	=> $saved_settings['logo']['opacity'],
+    '#title'			=> t('Opacity'),
+    '#description'		=> t('Opacity (0.0-1.0)'),
+    '#size'				=> 5,
+  ); 
+  
+  $form[FLOWPLAYER3_MEDIAPLAYER]['logo']['top'] = array(
+    '#type'				=> 'textfield',
+    '#default_value'	=> $saved_settings['logo']['top'],
+    '#title'			=> t('Top offset'),
+    '#description'		=> t('Logo position from top'),
+    '#size'				=> 5,
+  ); 
+  
+  $form[FLOWPLAYER3_MEDIAPLAYER]['logo']['left'] = array(
+    '#type'				=> 'textfield',
+    '#default_value'	=> $saved_settings['logo']['left'],
+    '#title'			=> t('Left offset'),
+    '#description'		=> t('Logo position from left'),
+    '#size'				=> 5,
+  ); 
+
+  
+  $form[FLOWPLAYER3_MEDIAPLAYER]['logo']['width'] = array(
+    '#type'				=> 'textfield',
+    '#default_value'	=> $saved_settings['logo']['width'],
+    '#title'			=> t('Width'),
+    '#description'		=> t('Logo width'),
+    '#size'				=> 5,
+  ); 
+  
+  $form[FLOWPLAYER3_MEDIAPLAYER]['logo']['height'] = array(
+    '#type'				=> 'textfield',
+    '#default_value'	=> $saved_settings['logo']['height'],
+    '#title'			=> t('Height'),
+    '#description'		=> t('Logo height'),
+    '#size'				=> 5,
+  ); 
+
+  $form[FLOWPLAYER3_MEDIAPLAYER]['logo']['zIndex'] = array(
+    '#type'				=> 'textfield',
+    '#default_value'	=> $saved_settings['logo']['zIndex'],
+    '#title'			=> t('Z-order'),
+    '#description'		=> t('Logo z-order - just leave it as is'),
+    '#size'				=> 5,
+  ); 
+
+  $form[FLOWPLAYER3_MEDIAPLAYER]['logo']['fullscreenOnly'] = array(
+    '#type'				=> 'select',
+    '#options'			=> $options['bool'],
+    '#default_value'	=> $saved_settings['logo']['fullscreenOnly'],
+    '#title'			=> t('Fullscreen only'),
+    '#description'		=> t('True: Show only when fullscreen'),
+  );
+
+  // Add custom form handler to flush cache upon submit
+  $form['#submit'][] = 'flowplayer3_admin_settings_submit';
+  
   // Return finished form
   return system_settings_form($form);
 
Index: flowplayer3/flowplayer3.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/swftools/flowplayer3/flowplayer3.module,v
retrieving revision 1.30
diff -u -p -r1.30 flowplayer3.module
--- flowplayer3/flowplayer3.module	18 Mar 2009 00:21:58 -0000	1.30
+++ flowplayer3/flowplayer3.module	2 Mar 2010 18:33:48 -0000
@@ -198,6 +198,9 @@ function flowplayer3_swftools_flashvars(
     $flowplayer['key'] = variable_get('flowplayer3_product_key', '');
   }
 
+  // Get flowplayer logo saved settings
+  $flowplayer['logo'] =	$saved_settings['logo']; 
+  
   // Convert $flowplayer array to an object so we can pass it by reference in module_invoke_all()
   $flowplayer = (object)$flowplayer;
   
@@ -346,7 +349,20 @@ function _flowplayer3_settings() {
     'border' => '',
     'borderRadius' => '',
   );
-  
+
+  $defaults['logo'] = array(
+	'displayTime'		=> 100,
+	'fadeSpeed'			=> 2,
+	'opacity'			=> 1,
+	'top'				=> '45%',
+	'left'				=> '50%',
+	'width'				=> '100%',
+	'height'			=> '100%',
+	'zIndex'			=> 0,
+	'url'				=> '',
+	'fullscreenOnly'	=> 'false', 
+  );
+
   // Retrieve settings from database, if available
   $saved_settings = variable_get(FLOWPLAYER3_MEDIAPLAYER, array());
   $saved_colors = variable_get('flowplayer3_palette', array());