| Index: trunk/extensions/OggHandler/PEAR/File_Ogg/File/Ogg.php |
| — | — | @@ -175,7 +175,7 @@ |
| 176 | 176 | * @access public |
| 177 | 177 | * @param string $fileLocation The path of the file to be examined. |
| 178 | 178 | */ |
| 179 | | - function File_Ogg($fileLocation) |
| | 179 | + function __construct($fileLocation) |
| 180 | 180 | { |
| 181 | 181 | clearstatcache(); |
| 182 | 182 | if (! file_exists($fileLocation)) { |
| Index: trunk/extensions/OggHandler/PEAR/File_Ogg/File/Ogg/Bitstream.php |
| — | — | @@ -72,7 +72,7 @@ |
| 73 | 73 | * @param pointer $filePointer File pointer for the current physical stream. |
| 74 | 74 | * @access private |
| 75 | 75 | */ |
| 76 | | - function File_Ogg_Bitstream($streamSerial, $streamData, $filePointer) |
| | 76 | + function __construct($streamSerial, $streamData, $filePointer) |
| 77 | 77 | { |
| 78 | 78 | $this->_streamSerial = $streamSerial; |
| 79 | 79 | $this->_streamList = $streamData; |
| Index: trunk/extensions/OggHandler/PEAR/File_Ogg/File/Ogg/Media.php |
| — | — | @@ -51,10 +51,6 @@ |
| 52 | 52 | |
| 53 | 53 | /* Start offset of the stream in seconds */ |
| 54 | 54 | var $_startOffset = 0; |
| 55 | | - /*function File_Ogg_Media($streamSerial, $streamData, $filePointer) |
| 56 | | - { |
| 57 | | - File_Ogg_Bitstream::File_Ogg_Bitstream($streamSerial, $streamData, $filePointer); |
| 58 | | - }*/ |
| 59 | 55 | |
| 60 | 56 | /** |
| 61 | 57 | * Get a short string describing the type of the stream |
| Index: trunk/extensions/OggHandler/PEAR/File_Ogg/File/Ogg/Theora.php |
| — | — | @@ -44,9 +44,9 @@ |
| 45 | 45 | /** |
| 46 | 46 | * @access private |
| 47 | 47 | */ |
| 48 | | - function File_Ogg_Theora($streamSerial, $streamData, $filePointer) |
| | 48 | + function __construct($streamSerial, $streamData, $filePointer) |
| 49 | 49 | { |
| 50 | | - File_Ogg_Media::File_Ogg_Media($streamSerial, $streamData, $filePointer); |
| | 50 | + parent::__construct($streamSerial, $streamData, $filePointer); |
| 51 | 51 | $this->_decodeIdentificationHeader(); |
| 52 | 52 | $this->_decodeCommentsHeader(); |
| 53 | 53 | $endSec = $this->getSecondsFromGranulePos( $this->_lastGranulePos ); |
| Index: trunk/extensions/OggHandler/PEAR/File_Ogg/File/Ogg/Speex.php |
| — | — | @@ -38,7 +38,7 @@ |
| 39 | 39 | /** |
| 40 | 40 | * @access private |
| 41 | 41 | */ |
| 42 | | - function File_Ogg_Speex($streamSerial, $streamData, $filePointer) |
| | 42 | + function __construct($streamSerial, $streamData, $filePointer) |
| 43 | 43 | { |
| 44 | 44 | parent::__construct($streamSerial, $streamData, $filePointer); |
| 45 | 45 | $this->_decodeHeader(); |
| Index: trunk/extensions/OggHandler/PEAR/File_Ogg/File/Ogg/Vorbis.php |
| — | — | @@ -166,9 +166,9 @@ |
| 167 | 167 | * @param pointer $filePointer File pointer for the current physical stream. |
| 168 | 168 | * @access private |
| 169 | 169 | */ |
| 170 | | - function File_Ogg_Vorbis($streamSerial, $streamData, $filePointer) |
| | 170 | + function __construct($streamSerial, $streamData, $filePointer) |
| 171 | 171 | { |
| 172 | | - File_Ogg_Bitstream::File_Ogg_Bitstream($streamSerial, $streamData, $filePointer); |
| | 172 | + parent::__construct($streamSerial, $streamData, $filePointer); |
| 173 | 173 | $this->_decodeIdentificationHeader(); |
| 174 | 174 | $this->_decodeCommentsHeader(OGG_VORBIS_COMMENTS_HEADER, OGG_VORBIS_COMMENTS_PAGE_OFFSET); |
| 175 | 175 | $endSec = (( '0x' . substr( $this->_lastGranulePos, 0, 8 ) ) * pow(2, 32) |
| Index: trunk/extensions/OggHandler/PEAR/File_Ogg/File/Ogg/Flac.php |
| — | — | @@ -38,7 +38,7 @@ |
| 39 | 39 | /** |
| 40 | 40 | * @access private |
| 41 | 41 | */ |
| 42 | | - function File_Ogg_Flac($streamSerial, $streamData, $filePointer) |
| | 42 | + function __construct($streamSerial, $streamData, $filePointer) |
| 43 | 43 | { |
| 44 | 44 | parent::__construct($streamSerial, $streamData, $filePointer); |
| 45 | 45 | $this->_decodeHeader(); |