diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-03-01 23:47:36 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-03-01 23:47:36 +0000 |
| commit | abc6eac0e3a28317f8114f78016cfb2b4753003d (patch) | |
| tree | 39b7a55cb7ad45126d2cddc2f5aea09413ad1872 /lib/class/stream.class.php | |
| parent | a8f79bb8f4c222334fbb4d2a216260d0de44a7e3 (diff) | |
| download | ampache-abc6eac0e3a28317f8114f78016cfb2b4753003d.tar.gz ampache-abc6eac0e3a28317f8114f78016cfb2b4753003d.tar.bz2 ampache-abc6eac0e3a28317f8114f78016cfb2b4753003d.zip | |
maybe fix #404, unconfirmed implemented #405 other misc cleanup
Diffstat (limited to 'lib/class/stream.class.php')
| -rw-r--r-- | lib/class/stream.class.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index 9bfb4d78..17ef8c55 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -46,16 +46,13 @@ class Stream { * Constructor for the stream class takes a type and an array * of song ids */ - public function __construct($type='m3u', $media_ids=0) { + public function __construct($type='m3u', $media_ids) { $this->type = $type; $this->media = $media_ids; - $this->web_path = Config::get('web_path'); $this->user_id = $GLOBALS['user']->id; - if (Config::get('force_http_play')) { - $this->web_path = preg_replace("/https/", "http",$this->web_path); - } + if (!is_array($this->media)) { settype($this->media,'array'); } } // Constructor @@ -438,7 +435,7 @@ class Stream { $xml['track']['identifier'] = $xml['track']['location']; $xml['track']['duration'] = $length * 1000; - $result .= xmlData::keyed_array($xml,1); + $result .= xmlData::keyed_array($xml,1) } // end foreach |