Index: plugins/flashvideo_streaming/flashvideo_streaming.module
===================================================================
--- plugins/flashvideo_streaming/flashvideo_streaming.module	(revision 246)
+++ plugins/flashvideo_streaming/flashvideo_streaming.module	(working copy)
@@ -199,7 +199,8 @@
 	}
   // xmoov-php process:
 	elseif (flashvideo_variable_get($node_type, 'streaming_enable', 0) && flashvideo_variable_get($node_type, 'streaming_method', 0) == FLASHVIDEO_STREAMING_METHOD_XMOOV) {
-		if (!variable_get('flashvideo_xmoov_path', 0)) {
+		
+    if (!flashvideo_variable_get($node_type, 'xmoov_path', 0)) {
 			return array(); // User doesn't want to do streaming "gets".
 		}
 
@@ -213,6 +214,7 @@
 
 			$filepath['file'] = $filename; // Finished xmoov-php filepath
 		}
+    
 		return $filepath;
 	}
 	else {
Index: flashvideo.module
===================================================================
--- flashvideo.module	(revision 247)
+++ flashvideo.module	(working copy)
@@ -721,7 +721,7 @@
    }    
    
    // Tell other modules to save this file.
-   module_invoke_all('flashvideo_save_file', $newfile);   
+   module_invoke_all('flashvideo_save_file', $newfile, $node_type);   
    
 	// Set the status of this video to say it is converted and also set all flags to zero.
    db_query("UPDATE {flashvideo} SET status=%d, flags=0 WHERE nid=%d AND (oid=fid)", FLASHVIDEO_STATUS_CONVERTED, $newfile->nid);           // Set the status to converted.     	
@@ -1873,7 +1873,7 @@
     // If a video path was provided.
     elseif (isset($video_file->filepath)) {
       // Give other modules a chance to override this path...
-      if ( !($temp_video = module_invoke_all('flashvideo_get_file', $video_file)) ) {
+      if ( !($temp_video = module_invoke_all('flashvideo_get_file', $video_file, $video['node_type'])) ) {
         // Set up our video['file'] variable.                      
         $video['file'] = check_url(file_create_url($video_file->filepath));
       }	
@@ -2074,8 +2074,8 @@
             $additions = '';
             $files = upload_load($node);
             if( count($files) ) {
-               foreach( $files as $file ) {
-                  if( ($filepath = module_invoke_all('flashvideo_get_file', $file)) ) {
+               foreach( $files as $file ) {  
+                  if( ($filepath = module_invoke_all('flashvideo_get_file', $file, $node->type)) ) {
                      $additions['s3files'][$file->fid] = $filepath['file'];
                   }
                }