summaryrefslogtreecommitdiffstats
path: root/lib/stream.lib.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-07-16 00:32:51 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-07-16 00:32:51 +0000
commitc024808430c781b03dab0e9b49016ac4cb868fb1 (patch)
tree82f51c7f368d238fb5fafe46f05da2f19ddfd73d /lib/stream.lib.php
parent9d627a263af982108710fa68c2182ef4c897a506 (diff)
downloadampache-c024808430c781b03dab0e9b49016ac4cb868fb1.tar.gz
ampache-c024808430c781b03dab0e9b49016ac4cb868fb1.tar.bz2
ampache-c024808430c781b03dab0e9b49016ac4cb868fb1.zip
fix logic problem that would snafu the headers if we were trying to upsample
Diffstat (limited to 'lib/stream.lib.php')
-rw-r--r--lib/stream.lib.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/stream.lib.php b/lib/stream.lib.php
index a022b6da..b792225f 100644
--- a/lib/stream.lib.php
+++ b/lib/stream.lib.php
@@ -207,12 +207,14 @@ function start_downsample($song,$now_playing_id=0,$song_name=0) {
$sample_rate = $user_sample_rate;
}
+ $sample_ratio = $sample_rate/($song->bitrate/1000);
+
/* Never Upsample a song */
if (($sample_rate*1000) > $song->bitrate) {
unset($sample_rate);
+ $sample_ratio = '1';
}
- $sample_ratio = $sample_rate/($song->bitrate/1000);
$browser->downloadHeaders($song_name, $song->mime, false,$sample_ratio*$song->size);