| Index: trunk/extensions/OggHandler/OggHandler_body.php |
| — | — | @@ -204,7 +204,7 @@ |
| 205 | 205 | } else { |
| 206 | 206 | $width = $params['width']; |
| 207 | 207 | } |
| 208 | | - return new OggAudioDisplay( $file, $file->getURL(), $width, $height, $length ); |
| | 208 | + return new OggAudioDisplay( $file, $file->getURL(), $width, $height, $length, $dstPath ); |
| 209 | 209 | } |
| 210 | 210 | |
| 211 | 211 | // Video thumbnail only |
| — | — | @@ -213,7 +213,7 @@ |
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | if ( $flags & self::TRANSFORM_LATER ) { |
| 217 | | - return new OggVideoDisplay( $file, $file->getURL(), $dstUrl, $width, $height, $length ); |
| | 217 | + return new OggVideoDisplay( $file, $file->getURL(), $dstUrl, $width, $height, $length, $dstPath ); |
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | $thumbTime = false; |
| — | — | @@ -254,7 +254,7 @@ |
| 255 | 255 | // Return error box |
| 256 | 256 | return new MediaTransformError( 'thumbnail_error', $width, $height, implode( "\n", $lines ) ); |
| 257 | 257 | } |
| 258 | | - return new OggVideoDisplay( $file, $file->getURL(), $dstUrl, $width, $height, $length ); |
| | 258 | + return new OggVideoDisplay( $file, $file->getURL(), $dstUrl, $width, $height, $length, $dstPath ); |
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | function canRender() { return true; } |
| — | — | @@ -450,7 +450,7 @@ |
| 451 | 451 | class OggTransformOutput extends MediaTransformOutput { |
| 452 | 452 | static $serial = 0; |
| 453 | 453 | |
| 454 | | - function __construct( $file, $videoUrl, $thumbUrl, $width, $height, $length, $isVideo ) { |
| | 454 | + function __construct( $file, $videoUrl, $thumbUrl, $width, $height, $length, $isVideo, $path ) { |
| 455 | 455 | $this->file = $file; |
| 456 | 456 | $this->videoUrl = $videoUrl; |
| 457 | 457 | $this->url = $thumbUrl; |
| — | — | @@ -458,6 +458,7 @@ |
| 459 | 459 | $this->height = round( $height ); |
| 460 | 460 | $this->length = round( $length ); |
| 461 | 461 | $this->isVideo = $isVideo; |
| | 462 | + $this->path = $path; |
| 462 | 463 | } |
| 463 | 464 | |
| 464 | 465 | function toHtml( $options = array() ) { |
| — | — | @@ -580,14 +581,14 @@ |
| 581 | 582 | } |
| 582 | 583 | |
| 583 | 584 | class OggVideoDisplay extends OggTransformOutput { |
| 584 | | - function __construct( $file, $videoUrl, $thumbUrl, $width, $height, $length ) { |
| 585 | | - parent::__construct( $file, $videoUrl, $thumbUrl, $width, $height, $length, true ); |
| | 585 | + function __construct( $file, $videoUrl, $thumbUrl, $width, $height, $length, $path ) { |
| | 586 | + parent::__construct( $file, $videoUrl, $thumbUrl, $width, $height, $length, true, $path ); |
| 586 | 587 | } |
| 587 | 588 | } |
| 588 | 589 | |
| 589 | 590 | class OggAudioDisplay extends OggTransformOutput { |
| 590 | | - function __construct( $file, $videoUrl, $width, $height, $length ) { |
| 591 | | - parent::__construct( $file, $videoUrl, false, $width, $height, $length, false ); |
| | 591 | + function __construct( $file, $videoUrl, $width, $height, $length, $path ) { |
| | 592 | + parent::__construct( $file, $videoUrl, false, $width, $height, $length, false, $path ); |
| 592 | 593 | } |
| 593 | 594 | } |
| 594 | 595 | |