? .svn
? flvmediaplayer2.patch
? mediaplayer.swf
? contrib/.svn
? contrib/flvmediaplayer_asset/.svn
? players/.svn
Index: flvmediaplayer.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flvmediaplayer/flvmediaplayer.module,v
retrieving revision 1.14.2.52.2.20.2.19
diff -u -p -r1.14.2.52.2.20.2.19 flvmediaplayer.module
--- flvmediaplayer.module	31 Mar 2009 22:54:17 -0000	1.14.2.52.2.20.2.19
+++ flvmediaplayer.module	1 May 2009 10:07:35 -0000
@@ -125,7 +125,7 @@ function flvmediaplayer_nodeapi(&$node, 
       // is this node type enabled to have players displayed on it?
       if ($enabled_types[$node->type]) {
         // get the configuration values for this node
-        if ($node->flvmediaplayer_config = flvmediaplayer_configuration_values($node)) {
+        if ($node->flvmediaplayer_config = flvmediaplayer_node_configuration_values($node)) {
           // add player to node if it exists
           flvmediaplayer_insert_player($node, theme('flvmediaplayer_display', $node, null, null, $a3));
         }
@@ -176,7 +176,7 @@ function flvmediaplayer_nodeapi(&$node, 
 function flvmediaplayer_form_alter(&$form, &$form_state, $form_id) {
   if (isset($form['#node']) && $form_id == $form['#node']->type. '_node_form' && variable_get('flvmp_'. $form['#node']->type .'_override', false)) {
     // get the configuration for this node
-    $config = flvmediaplayer_configuration_values($form['#node']);
+    $config = flvmediaplayer_node_configuration_values($form['#node']);
 
     $form['flvmediaplayer'] = array(
       '#type' => 'fieldset',
@@ -370,7 +370,7 @@ function flvmediaplayer_build_player_dat
   static $control = false;
 
   // build a config to use. This handles overrides by nodes, profiles, and params
-  if (! $config = flvmediaplayer_configuration_values($node, $profile, $params) ) {
+  if (! $config = flvmediaplayer_node_configuration_values($node, $profile, $params) ) {
     return;
   }
 
@@ -445,7 +445,7 @@ function flvmediaplayer_build_player_dat
  *   is this an embed request?
  * @return array
  */
-function flvmediaplayer_configuration_values($node = null, $profile_name = null, $params = array()) {
+function flvmediaplayer_node_configuration_values($node = null, $profile_name = null, $params = array()) {
   // check to see if this configuration allows override
   if (variable_get('flvmp_'. $node->type .'_override', false)) {
     // check to see if we have any data for this node
@@ -476,6 +476,25 @@ function flvmediaplayer_configuration_va
   // @TODO do this before merging the params in, merge params AFTER
   // Now take the configuration data and put it into a structured array
   $data = array();
+  
+  return flvmediaplayer_profile_configuration_values(null, $config);
+}
+
+
+
+/**
+ * Helper function to build configuration data from a profile with
+ * no node data
+ * @param $profile
+ *   string, profile name
+ * @return array
+ */
+function flvmediaplayer_profile_configuration_values($profile = false, $config = false) {
+  $data = array();
+  if (! $config) {
+    $config = flvmediaplayer_profile_get_config($profile);
+  }
+
   // loop through all the form data and strip out form prefixes
   foreach ($config as $name => $value) {
     // get the params out
@@ -494,12 +513,10 @@ function flvmediaplayer_configuration_va
   // now add some data back in
   $data['name'] = $config['flvmp_name'];
   $data['pid'] = $config['flvmp_pid'];
-
-  // merge the values and return
+  
   return $data;
 }
 
-
 /**
  * This is the main function for loading flvmediaplayer data into
  * from node data. It caches based on nodes, profiles, and urls.
Index: players/jw_player_4.x.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flvmediaplayer/players/Attic/jw_player_4.x.inc,v
retrieving revision 1.1.2.2.2.6
diff -u -p -r1.1.2.2.2.6 jw_player_4.x.inc
--- players/jw_player_4.x.inc	6 Apr 2009 21:12:31 -0000	1.1.2.2.2.6
+++ players/jw_player_4.x.inc	1 May 2009 10:07:37 -0000
@@ -548,4 +548,4 @@ function flvmediaplayer_player_form($con
   $form['no_flash']['flvmp_noflash_text_filter']['filter'] = filter_form($config['noflash_text_filter']);
 
   return $form;
-}
\ No newline at end of file
+}