diff options
Diffstat (limited to 'lib/stream.lib.php')
| -rw-r--r-- | lib/stream.lib.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/stream.lib.php b/lib/stream.lib.php index 8d5dcf42..f363eb92 100644 --- a/lib/stream.lib.php +++ b/lib/stream.lib.php @@ -191,9 +191,6 @@ function start_downsample($song,$now_playing_id=0,$song_name=0) { $sample_rate = floor($max_bitrate/$active_streams); } // end else - /* Validate the bitrate */ - $sample_rate = validate_bitrate($sample_rate); - // Never go over the users sample rate if ($sample_rate > $user_sample_rate) { $sample_rate = $user_sample_rate; } @@ -207,7 +204,6 @@ 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) { @@ -215,6 +211,11 @@ function start_downsample($song,$now_playing_id=0,$song_name=0) { $sample_ratio = '1'; } + /* Validate the bitrate */ + $sample_rate = validate_bitrate($sample_rate); + + /* Set the Sample Ratio */ + $sample_ratio = $sample_rate/($song->bitrate/1000); $browser->downloadHeaders($song_name, $song->mime, false,$sample_ratio*$song->size); |