Changeset 1883

Show
Ignore:
Timestamp:
Wed Jan 18 17:40:01 2006
Author:
tomash
Message:

#1590 - little fix in getid3 + catching getid3 warning added

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/livesupport/src/modules/getid3/var/getid3.id3v2.php

    r1600 r1883  
    88 88 //            d - Tag restrictions  
    89 89 //                Flag data length       $01  
    90               $extheaderflagbytes = fread ($fd, 1);  
    91               $extheaderflags     = fread ($fd, $extheaderflagbytes);  
      90             //$extheaderflagbytes = fread ($fd, 1);  
      91             //$extheaderflags     = fread ($fd, $extheaderflagbytes);  
    92 92             $id3_exthead_flags = BigEndian2Bin(substr($header, 5, 1));  
    93 93             $ThisFileInfo['id3v2']['exthead_flags']['update']       = substr($id3_exthead_flags, 1, 1);  

  • trunk/livesupport/src/modules/storageServer/var/RawMediaData.php

    r1848 r1883  
    148 148     {  
    149 149         if(!$this->exists) return FALSE;  
    150           //$ia = GetAllFileinfo($this->fname);  
    151           //if(!isset($ia['mime_type']) || $ia['mime_type']==''){  
    152               $ia = GetAllFileinfo($this->fname, 'mp3');  
    153           //}  
      150             $ia = @GetAllFileinfo($this->fname, 'mp3');  
      151             //prepared for getid3 upgrade:  
      152             //$getID3 = new getID3;  
      153             //$ia = $getID3->analyze($this->fname);  
    154 154         return $ia;  
    155 155     }  

  • trunk/livesupport/src/modules/storageAdmin/var/import.php

    r1847 r1883  
    134 134     set_time_limit(30);  
    135 135     $infoFromFile = GetAllFileInfo("$filename", 'mp3');  
      136     //prepared for getid3 upgrade:  
      137     //$getID3 = new getID3;  
      138     //$infoFromFile = $getID3->analyze("$filename");  
    136 139     if(PEAR::isError($infoFromFile)){ _err($infoFromFile, $filename); continue; }  
    137 140     if(!$infoFromFile['fileformat']){ echo "???\n"; continue; }