summaryrefslogtreecommitdiffstats
path: root/stream.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-16 21:37:23 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-16 21:37:23 +0000
commit3887ab1f65fa556368d555e33b5c3e9ab59459da (patch)
tree3c006c802b0693a110806d184e038e336d48c35e /stream.php
parent9dc866338aede131ece294b2dcd939d61a60d187 (diff)
downloadampache-3887ab1f65fa556368d555e33b5c3e9ab59459da.tar.gz
ampache-3887ab1f65fa556368d555e33b5c3e9ab59459da.tar.bz2
ampache-3887ab1f65fa556368d555e33b5c3e9ab59459da.zip
fixed some playlist issues, (mime type and selection) cleaned up the preferences lib a little more moved a lot into the class, updated references to old functions
Diffstat (limited to 'stream.php')
-rw-r--r--stream.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/stream.php b/stream.php
index 77621b01..322f5ee7 100644
--- a/stream.php
+++ b/stream.php
@@ -199,7 +199,12 @@ switch ($_REQUEST['method']) {
$GLOBALS['user']->prefs['play_type'] = 'stream';
}
default:
- $stream_type = $GLOBALS['user']->prefs['play_type'];
+ if ($GLOBALS['user']->prefs['play_type'] == 'stream') {
+ $stream_type = $GLOBALS['user']->prefs['playlist_type'];
+ }
+ else {
+ $stream_type = $GLOBALS['user']->prefs['play_type'];
+ }
break;
}