| Index: trunk/extensions/TimedMediaHandler/handlers/OggHandler/OggHandler.php |
| — | — | @@ -14,7 +14,7 @@ |
| 15 | 15 | try { |
| 16 | 16 | $f = new File_Ogg( $path ); |
| 17 | 17 | $streams = array(); |
| 18 | | - foreach ( $f->listStreams() as $streamType => $streamIDs ) { |
| | 18 | + foreach ( $f->listStreams() as $streamIDs ) { |
| 19 | 19 | foreach ( $streamIDs as $streamID ) { |
| 20 | 20 | $stream = $f->getStream( $streamID ); |
| 21 | 21 | $streams[$streamID] = array( |
| — | — | @@ -88,15 +88,15 @@ |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | function getStreamTypes( $file ) { |
| 92 | | - $streamTypes = ''; |
| | 92 | + $streamTypes = array(); |
| 93 | 93 | $metadata = $this->unpackMetadata( $file->getMetadata() ); |
| 94 | 94 | if ( !$metadata || isset( $metadata['error'] ) ) { |
| 95 | 95 | return false; |
| 96 | 96 | } |
| 97 | 97 | foreach ( $metadata['streams'] as $stream ) { |
| 98 | | - $streamTypes[$stream['type']] = true; |
| | 98 | + $streamTypes[] = $stream['type']; |
| 99 | 99 | } |
| 100 | | - return array_keys( $streamTypes ); |
| | 100 | + return $streamTypes; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | function getOffset( $file ){ |