? .svn
? 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	22 Apr 2009 14:33:32 -0000
@@ -126,8 +126,13 @@ function flvmediaplayer_nodeapi(&$node, 
       if ($enabled_types[$node->type]) {
         // get the configuration values for this node
         if ($node->flvmediaplayer_config = flvmediaplayer_configuration_values($node)) {
-          // add player to node if it exists
-          flvmediaplayer_insert_player($node, theme('flvmediaplayer_display', $node, null, null, $a3));
+          $player = theme('flvmediaplayer_display', $node, $node->flvmediaplayer_config['flvmp']['name'], null, $a3);
+          // add player to body and or teaser if requested
+          if ($node->flvmediaplayer_config['player_node_body'] || ($a3 && $node->flvmediaplayer_config['embed_teaser'] )) {
+            flvmediaplayer_insert_player($node, $player);
+          }
+          // add the player on the node object for themers
+          $node->flvmediaplayer_display = $player;
         }
       }
     break;
@@ -609,8 +614,6 @@ function flvmediaplayer_insert_player(&$
   else {
     $node->content['body']['#value'] .= $player;
   }
-  // add the player on the node object for themers
-  $node->flvmediaplayer_display = $player;
 }
 
 
@@ -834,10 +837,10 @@ function theme_flvmediaplayer_display($n
 
       // check to see if we use this profile for embedding, or if another is selected
       if ($data['flvmp']['embed_profile'] && $data['flvmp']['embed_profile'] != $data['flvmp']['name']) {
-        $config = flvmediaplayer_node_data($node, $data['embed_profile'], $params);
+        $config = flvmediaplayer_node_data($node, $data['flvmp']['embed_profile'], $params);
       }
       // now create the embed code
-      $output .= theme("flvmediaplayer_embed_display", $data['player_path'], $data['params'], $data['flashvars']);
+      $output .= theme("flvmediaplayer_embed_display", $config['player_path'], $config['params'], $config['flashvars']);
     }
     return $output;
   }