diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2010-02-02 21:13:34 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2010-02-02 21:13:34 +0000 |
| commit | 146012c4ef72b4563cc388d360c23f87826dde60 (patch) | |
| tree | 25ae3e2a1a79bcecdcd28472289eaa4391f5c113 /play | |
| parent | c6566e8d1be0979c23a14326a62c158f144f8588 (diff) | |
| download | ampache-146012c4ef72b4563cc388d360c23f87826dde60.tar.gz ampache-146012c4ef72b4563cc388d360c23f87826dde60.tar.bz2 ampache-146012c4ef72b4563cc388d360c23f87826dde60.zip | |
sync from 3.5.x r2268
Diffstat (limited to 'play')
| -rw-r--r-- | play/index.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/play/index.php b/play/index.php index 6123e81e..efa97a7f 100644 --- a/play/index.php +++ b/play/index.php @@ -305,8 +305,8 @@ if (Config::get('downsample_remote')) { // If they are downsampling, or if the song is not a native stream or it's non-local if ((Config::get('transcode') == 'always' || !$media->native_stream() || $not_local) && Config::get('transcode') != 'never') { debug_event('Downsample','Starting Downsample {Transcode:' . Config::get('transcode') . '} {Native Stream:' . $media->native_stream() .'} {Not Local:' . $not_local . '}','5'); - $fp = Stream::start_downsample($media,$lastid,$song_name,$start); - $song_name = $media->f_artist_full . " - " . $media->title . "." . $media->type; + $fp = Stream::start_downsample($media,$lastid,$media_name,$start); + $media_name = $media->f_artist_full . " - " . $media->title . "." . $media->type; // Note that this is downsampling $downsampled_song = true; } // end if downsampling @@ -314,8 +314,6 @@ else { // Send file, possible at a byte offset $fp = fopen($media->file, 'rb'); - $song_name = $media->f_artist_full . " - " . $media->title . "." . $media->type; - if (!is_resource($fp)) { debug_event('Play',"Error: Unable to open $media->file for reading",'2'); cleanup_and_exit($lastid); @@ -339,7 +337,7 @@ if ($start > 0) { } debug_event('Play','Content-Range header recieved, skipping ahead ' . $start . ' bytes out of ' . $media->size,'5'); - $browser->downloadHeaders($song_name, $media->mime, false, $media->size); + $browser->downloadHeaders($media_name, $media->mime, false, $media->size); if (!$downsampled_song) { fseek( $fp, $start ); } @@ -353,7 +351,7 @@ if ($start > 0) { else { debug_event('Play','Starting stream of ' . $media->file . ' with size ' . $media->size,'5'); header("Content-Length: $media->size"); - $browser->downloadHeaders($song_name, $media->mime, false, $media->size); + $browser->downloadHeaders($media_name, $media->mime, false, $media->size); $stream_size = $media->size; } |