summaryrefslogtreecommitdiffstats
path: root/play/index.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-08-05 22:39:53 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-08-05 22:39:53 +0000
commit246c321617b18035725b3d42c6a313386687cedc (patch)
tree45262291e66caae786ed06873c2fe9e67089f8ae /play/index.php
parentad3d2363c4c20d6b5049c8db92d08786650bd2ae (diff)
downloadampache-246c321617b18035725b3d42c6a313386687cedc.tar.gz
ampache-246c321617b18035725b3d42c6a313386687cedc.tar.bz2
ampache-246c321617b18035725b3d42c6a313386687cedc.zip
fixed some typos, minor bugs, updated the sql, added playlist as a browse type
Diffstat (limited to 'play/index.php')
-rw-r--r--play/index.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/play/index.php b/play/index.php
index d4aa0710..95840d70 100644
--- a/play/index.php
+++ b/play/index.php
@@ -248,7 +248,7 @@ if (Config::get('access_control') AND Config::get('downsample_remote')) {
} // if access_control
// If they are downsampling, or if the song is not a native stream or it's non-local
-if ($GLOBALS['user']->prefs['transcode'] == 'always' || !$song->native_stream() || $not_local) {
+if (($GLOBALS['user']->prefs['transcode'] == 'always' || !$song->native_stream() || $not_local) && $GLOBALS['user']->prefs['transcode'] != 'never') {
debug_event('downsample','Starting Downsample...','5');
$results = start_downsample($song,$lastid,$song_name);
$fp = $results['handle'];