merging changes from DRUPAL-6--4

4 files changed, 19 insertions, 11 deletions

diff --git a/README.txt b/README.txt
index ac08195..e495dd4 100644
--- a/README.txt
+++ b/README.txt
@@ -1,11 +1,5 @@
 // $Id$
 ------------
-//TODO
-
-
-This module add the possibility to create
-video nodes which are containers to embed
-videos into drupal pages.
 
  to embed videos into drupal pages, using CCK and filefield support.
 This module add the possibility to create video nodes which are containers
@@ -26,5 +20,10 @@ Maintainers
 -----------
 
 	Heshan Wanigasooriya :heshan at heidisoft dot com, heshanmw at gmail dot com
+<<<<<<< README.txt
+        Dennis : http://drupal.org/user/384543
+        Glen Marianko : http://drupal.org/usr/527446 http://linkedin.com/in/glenergetic twitter: @glenergetic
+=======
         Dennis : http://drupal.org/user/384543
         Glen Marianko : http://drupal.org/usr/527446 http://linkedin.com/in/glenergetic twitter: @glenergetic
+>>>>>>> 1.8.4.5.4.5.2.3
diff --git a/video.info b/video.info
index b4a584b..928b5ac 100644
--- a/video.info
+++ b/video.info
@@ -6,4 +6,8 @@ package = "Video"
 dependencies[] = content
 dependencies[] = filefield
 core = 6.x
-version = 6.x-4.x-dev
\ No newline at end of file
+<<<<<<< video.info
+version = 6.x-4.x-dev
+=======
+version = 6.x-4.x-dev
+>>>>>>> 1.3.4.1.4.1.2.2
diff --git a/video.install b/video.install
index 0432d47..5d2ea92 100644
--- a/video.install
+++ b/video.install
@@ -1,5 +1,6 @@
 <?php
 // $Id$
+
 /**
  * @file
  * Provides installation functions for video.module.
@@ -131,4 +132,4 @@ function video_update_6406() {
   variable_set('video_ffmpeg_thumbnailer_options', '-i !videofile -an -y -f mjpeg -ss !seek -vframes 1 !thumbfile');
   variable_set('video_ffmpeg_helper_auto_cvr_options', '-y -i !videofile -f flv -ar 22050 -ab !audiobitrate -s !size -b !videobitrate -qscale 1 !convertfile');
   return array();
-}
\ No newline at end of file
+}
diff --git a/video.module b/video.module
index 1576bee..677404a 100644
--- a/video.module
+++ b/video.module
@@ -27,7 +27,7 @@ function video_init() {
  * We cannot use module_invoke() for this, because the arguments need to
  * be passed by reference.
  */
-function video_module_invoke($action, &$array, &$video, $other = NULL) {
+function video_module_invoke($action, &$array, &$video = NULL, $other = NULL) {
   foreach (module_list() as $module) {
     $function = $module . '_video_' . $action;
     if (function_exists($function)) {
@@ -253,6 +253,8 @@ function video_node_update_submit($form, &$form_state) {
     foreach($form_state['values']['video_id'] as $fid) {
       //lets update our table to include the nid
       db_query("UPDATE {video_files} SET nid=%d WHERE fid=%d", $form_state['nid'], $fid);
+      // Lets other module to know to update
+      video_module_invoke('update', $form, $form_state);
     }
   }
 }
@@ -375,6 +377,8 @@ function video_file_delete($file) {
   $thumb_folder = file_directory_path(). '/' . $video_thumb_path . '/' . $file->fid;
   // Recursively delete our folder and files
   rmdirr($thumb_folder);
+  // Let other modules to know about the file delete
+  video_module_invoke('delete', $file);
 }
 
 /**
@@ -521,7 +525,7 @@ function video_widget_process($element, &$form_state) {
         }
       }
       // Call hook_video_submit API
-      video_module_invoke('submit', $element, $form_state);
+      video_module_invoke('insert', $element, $form_state);
       //
       //queue up the file id to update the node id in the video rendering / cdn tables.
       $form_state['values']['video_id'][] = $item['fid'];
@@ -820,4 +824,4 @@ function rmdirr($dir) {
     }
   }
   @rmdir($dir);
-}
\ No newline at end of file
+}