Index: contrib/emvideo/emvideo.theme.inc
===================================================================
--- contrib/emvideo/emvideo.theme.inc	(revision 634)
+++ contrib/emvideo/emvideo.theme.inc	(working copy)
@@ -118,7 +118,7 @@
     $width = $options['width'] ? $options['width'] : ($field['widget']['video_width'] ? $field['widget']['video_width'] : variable_get('emvideo_default_video_width', EMVIDEO_DEFAULT_VIDEO_WIDTH));
     $height = $options['height'] ? $options['height'] : ($field['widget']['video_height'] ? $field['widget']['video_height'] : variable_get('emvideo_default_video_height', EMVIDEO_DEFAULT_VIDEO_HEIGHT));
     $autoplay = $options['autoplay'] ? $options['autoplay'] : $field['widget']['video_autoplay'];
-    $output = module_invoke('emfield', 'include_invoke', 'emvideo', $item['provider'], 'video', $embed, $width, $height, $field, $item, $autoplay, $options);
+    $output = module_invoke('emfield', 'include_invoke', 'emvideo', $item['provider'], 'video', $embed, $width, $height, $field, $item, $node, $autoplay, $options);
   }
 
   return $output;
@@ -134,7 +134,7 @@
     $width = $options['width'] ? $options['width'] : ($field['widget']['preview_width'] ? $field['widget']['preview_width'] : variable_get('emvideo_default_preview_width', EMVIDEO_DEFAULT_PREVIEW_WIDTH));
     $height = $options['height'] ? $options['height'] : ($field['widget']['preview_height'] ? $field['widget']['preview_height'] : variable_get('emvideo_default_preview_height', EMVIDEO_DEFAULT_PREVIEW_HEIGHT));
     $autoplay = $options['autoplay'] ? $options['autoplay'] : $field['widget']['preview_autoplay'];
-    $output = module_invoke('emfield', 'include_invoke', 'emvideo', $item['provider'], 'preview', $embed, $width, $height, $field, $item, $autoplay, $options);
+    $output = module_invoke('emfield', 'include_invoke', 'emvideo', $item['provider'], 'preview', $embed, $width, $height, $field, $item, $node, $autoplay, $options);
   }
 
   return $output;
Index: contrib/emvideo/providers/zzz_custom_url.inc
===================================================================
--- contrib/emvideo/providers/zzz_custom_url.inc	(revision 634)
+++ contrib/emvideo/providers/zzz_custom_url.inc	(working copy)
@@ -137,13 +137,13 @@
   return '';
 }
 
-function emvideo_zzz_custom_url_video($code, $width, $height, $field, $item, $autoplay) {
+function emvideo_zzz_custom_url_video($code, $width, $height, $field, $item, &$node, $autoplay) {
   $type = $item['data']['type'];
   $output = theme('emvideo_zzz_custom_url_embedded_video', $type, $code, $width, $height, $autoplay, $field, $item);
   return $output;
 }
 
-function emvideo_zzz_custom_url_preview($code, $width, $height, $field, $item, $autoplay) {
+function emvideo_zzz_custom_url_preview($code, $width, $height, $field, $item, &$node, $autoplay) {
   $type = $item['data']['type'];
   $output = theme('emvideo_zzz_custom_url_embedded_video', $type, $code, $width, $height, $autoplay, $field, $item);
   return $output;
Index: contrib/emvideo/providers/revver.inc
===================================================================
--- contrib/emvideo/providers/revver.inc	(revision 634)
+++ contrib/emvideo/providers/revver.inc	(working copy)
@@ -68,12 +68,12 @@
   return 'http://frame.revver.com/frame/'. $width .'x'. $height .'/'. check_plain($item['value']) .'.jpg';
 }
 
-function emvideo_revver_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_revver_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_revver_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
 
-function emvideo_revver_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_revver_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_revver_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: contrib/emvideo/providers/spike.inc
===================================================================
--- contrib/emvideo/providers/spike.inc	(revision 634)
+++ contrib/emvideo/providers/spike.inc	(working copy)
@@ -66,12 +66,12 @@
   return 'http://img1.ifilmpro.com/resize/image/stills/films/resize/istd/'. $picturelink .'.jpg?width='. $width;
 }
 
-function emvideo_spike_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_spike_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_spike_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
 
-function emvideo_spike_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_spike_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_spike_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: contrib/emvideo/providers/google.inc
===================================================================
--- contrib/emvideo/providers/google.inc	(revision 634)
+++ contrib/emvideo/providers/google.inc	(working copy)
@@ -176,12 +176,12 @@
   return NULL;
 }
 
-function emvideo_google_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_google_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_google_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
 
-function emvideo_google_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_google_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_google_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: contrib/emvideo/providers/guba.inc
===================================================================
--- contrib/emvideo/providers/guba.inc	(revision 634)
+++ contrib/emvideo/providers/guba.inc	(working copy)
@@ -74,12 +74,12 @@
   return $thm;
 }
 
-function emvideo_guba_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_guba_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_guba_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
 
-function emvideo_guba_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_guba_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_guba_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: contrib/emvideo/providers/vimeo.inc
===================================================================
--- contrib/emvideo/providers/vimeo.inc	(revision 634)
+++ contrib/emvideo/providers/vimeo.inc	(working copy)
@@ -174,7 +174,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_vimeo_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_vimeo_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_vimeo_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
@@ -195,7 +195,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_vimeo_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_vimeo_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_vimeo_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: contrib/emvideo/providers/sevenload.inc
===================================================================
--- contrib/emvideo/providers/sevenload.inc	(revision 634)
+++ contrib/emvideo/providers/sevenload.inc	(working copy)
@@ -106,7 +106,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_sevenload_video($embed, $width, $height, $field, $item) {
+function emvideo_sevenload_video($embed, $width, $height, $field, $item, &$node) {
   $output = theme('emvideo_sevenload_flash', $embed, $width, $height);
   return $output;
 }
@@ -127,7 +127,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_sevenload_preview($embed, $width, $height, $field, $item) {
+function emvideo_sevenload_preview($embed, $width, $height, $field, $item, &$node) {
   $output = theme('emvideo_sevenload_flash', $embed, $width, $height);
   return $output;
 }
Index: contrib/emvideo/providers/lastfm.inc
===================================================================
--- contrib/emvideo/providers/lastfm.inc	(revision 634)
+++ contrib/emvideo/providers/lastfm.inc	(working copy)
@@ -138,7 +138,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_lastfm_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_lastfm_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_lastfm_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
@@ -159,7 +159,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_lastfm_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_lastfm_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_lastfm_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: contrib/emvideo/providers/livevideo.inc
===================================================================
--- contrib/emvideo/providers/livevideo.inc	(revision 634)
+++ contrib/emvideo/providers/livevideo.inc	(working copy)
@@ -157,7 +157,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_livevideo_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_livevideo_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_livevideo_flash', $embed, $width, $height, $autoplay);
 
   return $output;
@@ -179,7 +179,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_livevideo_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_livevideo_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_livevideo_flash', $embed, $width, $height, $autoplay);
 
   return $output;
Index: contrib/emvideo/providers/jumpcut.inc
===================================================================
--- contrib/emvideo/providers/jumpcut.inc	(revision 634)
+++ contrib/emvideo/providers/jumpcut.inc	(working copy)
@@ -51,12 +51,12 @@
   return '';
 }
 
-function emvideo_jumpcut_video($embed, $width, $height, $field, $item) {
+function emvideo_jumpcut_video($embed, $width, $height, $field, $item, &$node) {
   $output = theme('emvideo_jumpcut_flash', $embed, $width, $height);
   return $output;
 }
 
-function emvideo_jumpcut_preview($embed, $width, $height, $field, $item) {
+function emvideo_jumpcut_preview($embed, $width, $height, $field, $item, &$node) {
   $output = theme('emvideo_jumpcut_flash', $embed, $width, $height);
   return $output;
 }
Index: contrib/emvideo/providers/dailymotion.inc
===================================================================
--- contrib/emvideo/providers/dailymotion.inc	(revision 634)
+++ contrib/emvideo/providers/dailymotion.inc	(working copy)
@@ -144,7 +144,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_dailymotion_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_dailymotion_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_dailymotion_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
@@ -165,7 +165,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_dailymotion_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_dailymotion_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_dailymotion_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: contrib/emvideo/providers/imeem.inc
===================================================================
--- contrib/emvideo/providers/imeem.inc	(revision 634)
+++ contrib/emvideo/providers/imeem.inc	(working copy)
@@ -84,12 +84,12 @@
   return $thm;
 }
 
-function emvideo_imeem_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_imeem_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_imeem_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
 
-function emvideo_imeem_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_imeem_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_imeem_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: contrib/emvideo/providers/brightcove.inc
===================================================================
--- contrib/emvideo/providers/brightcove.inc	(revision 634)
+++ contrib/emvideo/providers/brightcove.inc	(working copy)
@@ -123,7 +123,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_brightcove_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_brightcove_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_brightcove_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
@@ -144,7 +144,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_brightcove_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_brightcove_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_brightcove_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: contrib/emvideo/providers/youtube.inc
===================================================================
--- contrib/emvideo/providers/youtube.inc	(revision 634)
+++ contrib/emvideo/providers/youtube.inc	(working copy)
@@ -342,7 +342,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_youtube_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_youtube_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_youtube_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
@@ -363,7 +363,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_youtube_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_youtube_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_youtube_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: contrib/emvideo/providers/tudou.inc
===================================================================
--- contrib/emvideo/providers/tudou.inc	(revision 634)
+++ contrib/emvideo/providers/tudou.inc	(working copy)
@@ -119,7 +119,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_tudou_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_tudou_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_tudou_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
@@ -140,7 +140,7 @@
  *  @return
  *    the html of the embedded video
  */
-function emvideo_tudou_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_tudou_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_tudou_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: contrib/emvideo/providers/bliptv.inc
===================================================================
--- contrib/emvideo/providers/bliptv.inc	(revision 634)
+++ contrib/emvideo/providers/bliptv.inc	(working copy)
@@ -277,7 +277,7 @@
   return $tn;
 }
 
-function emvideo_bliptv_video($code, $width, $height, $field, $item, $autoplay, $options = array()) {
+function emvideo_bliptv_video($code, $width, $height, $field, $item, &$node, $autoplay, $options = array()) {
   if ($item['data']['emvideo_bliptv_data_version'] >= 1) {
     $flv = $item['data']['flv']['url'];
     $thumbnail = $item['data']['thumbnail']['url'];
@@ -291,7 +291,7 @@
   return $output;
 }
 
-function emvideo_bliptv_preview($code, $width, $height, $field, $item, $autoplay, $options = array()) {
+function emvideo_bliptv_preview($code, $width, $height, $field, $item, $autoplay, &$node, $options = array()) {
   if ($item['data']['emvideo_bliptv_data_version'] >= 1) {
     $flv = $item['data']['flv']['url'];
     $thumbnail = $item['data']['thumbnail']['url'];
Index: contrib/emvideo/providers/veoh.inc
===================================================================
--- contrib/emvideo/providers/veoh.inc	(revision 634)
+++ contrib/emvideo/providers/veoh.inc	(working copy)
@@ -106,12 +106,12 @@
   }
 }
 
-function emvideo_veoh_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_veoh_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_veoh_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
 
-function emvideo_veoh_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_veoh_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_veoh_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: contrib/emvideo/providers/myspace.inc
===================================================================
--- contrib/emvideo/providers/myspace.inc	(revision 634)
+++ contrib/emvideo/providers/myspace.inc	(working copy)
@@ -103,12 +103,12 @@
   return _emvideo_myspace_scrape_thumbnail($item['value']);
 }
 
-function emvideo_myspace_video($embed, $width, $height, $field, $item) {
+function emvideo_myspace_video($embed, $width, $height, $field, $item, &$node) {
   $output = theme('emvideo_myspace_flash', $embed, $width, $height);
   return $output;
 }
 
-function emvideo_myspace_preview($embed, $width, $height, $field, $item) {
+function emvideo_myspace_preview($embed, $width, $height, $field, $item, &$node) {
   $output = theme('emvideo_myspace_flash', $embed, $width, $height);
   return $output;
 }
Index: contrib/emvideo/providers/metacafe.inc
===================================================================
--- contrib/emvideo/providers/metacafe.inc	(revision 634)
+++ contrib/emvideo/providers/metacafe.inc	(working copy)
@@ -65,12 +65,12 @@
   return 'http://www.metacafe.com/thumb/'. $picturelink .'.jpg';
 }
 
-function emvideo_metacafe_video($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_metacafe_video($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_metacafe_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
 
-function emvideo_metacafe_preview($embed, $width, $height, $field, $item, $autoplay) {
+function emvideo_metacafe_preview($embed, $width, $height, $field, $item, &$node, $autoplay) {
   $output = theme('emvideo_metacafe_flash', $embed, $width, $height, $autoplay);
   return $output;
 }
Index: emfield.cck.inc
===================================================================
--- emfield.cck.inc	(revision 634)
+++ emfield.cck.inc	(working copy)
@@ -159,7 +159,7 @@
       // Grab the provider's URL.
       $urls[] = l($info['name'], $info['url'], array('target' => '_blank'));
       // Allow the module to add any additional elements to the form, based on individual provider needs.
-      $additional_element = emfield_include_invoke($module, $provider->name, 'form');
+      $additional_element = emfield_include_invoke($module, $provider->name, 'form', $field, $items[$delta]);
       if ($additional_element) {
         $additional_form_elements[$provider->name] = $additional_element;
       }