/[drupal]/contributions/modules/media_mover/mm_ffmpeg/mm_ffmpeg.module
ViewVC logotype

Diff of /contributions/modules/media_mover/mm_ffmpeg/mm_ffmpeg.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.1.2.60.2.18, Tue Oct 27 11:32:28 2009 UTC revision 1.1.2.60.2.19, Sun Nov 1 15:40:51 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2    
3  /* $Id: mm_ffmpeg.module,v 1.1.2.60.2.17 2009/10/04 22:54:08 arthuregg Exp $ */  /* $Id: mm_ffmpeg.module,v 1.1.2.60.2.18 2009/10/27 11:32:28 arthuregg Exp $ */
4    
5    
6  /*  /*
# Line 45  function mm_ffmpeg_media_mover($op, $act Line 45  function mm_ffmpeg_media_mover($op, $act
45        }        }
46      break;      break;
47    
     // validate configuration  
     case 'config_validate':  
         switch ($action_id) {  
                 case 1:  
             return mm_ffmpeg_config_validate($configuration);  
           break;  
                 case 2:  
                 break;  
         }  
     break;  
   
48      // define global settings for this module      // define global settings for this module
49      // @return array drupal form array      // @return array drupal form array
50      case 'admin':      case 'admin':
# Line 284  function mm_ffmpeg_video(&$file, $config Line 273  function mm_ffmpeg_video(&$file, $config
273    }    }
274    $file['data']['file']['filename'] = pathinfo($output_file, PATHINFO_FILENAME);    $file['data']['file']['filename'] = pathinfo($output_file, PATHINFO_FILENAME);
275    $file['data']['file']['filesize'] = filesize($output_file);    $file['data']['file']['filesize'] = filesize($output_file);
276    
277    
278    // get any meta data for this file    // get any meta data for this file
279    $file['data']['file']['meta'] = ffmpeg_wrapper_file_data($output_file);    $file['data']['file']['meta'] = ffmpeg_wrapper_file_data($output_file);
280    

Legend:
Removed from v.1.1.2.60.2.18  
changed lines
  Added in v.1.1.2.60.2.19

  ViewVC Help
Powered by ViewVC 1.1.2