summaryrefslogtreecommitdiffstats
path: root/lib/class/stream.class.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2010-01-25 13:40:49 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2010-01-25 13:40:49 +0000
commit2fd6fe6d88466960608cd7de18e6489664bd567e (patch)
treed76de1c4a2ed8d9147aa4b38d4668be91a1308d2 /lib/class/stream.class.php
parentb8b3f69a1a7691d9df025bb0e548fb891cd98e23 (diff)
downloadampache-2fd6fe6d88466960608cd7de18e6489664bd567e.tar.gz
ampache-2fd6fe6d88466960608cd7de18e6489664bd567e.tar.bz2
ampache-2fd6fe6d88466960608cd7de18e6489664bd567e.zip
untested change which should fix some stupididity with the flash player
Diffstat (limited to 'lib/class/stream.class.php')
-rw-r--r--lib/class/stream.class.php10
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php
index e238bdd0..cc01ed94 100644
--- a/lib/class/stream.class.php
+++ b/lib/class/stream.class.php
@@ -407,12 +407,6 @@ class Stream {
*/
public function create_xspf() {
- $flash_hack = '';
-
- if (isset($_REQUEST['flash_hack'])) {
- if (!Config::get('require_session')) { $flash_hack = '&sid=' . session_id(); }
- }
-
// Itterate through the songs
foreach ($this->media as $element) {
$type = array_shift($element);
@@ -427,13 +421,13 @@ class Stream {
$xml['track']['title'] = $media->title;
$xml['track']['creator'] = $media->f_artist_full;
$xml['track']['info'] = Config::get('web_path') . "/albums.php?action=show&album=" . $media->album;
- $xml['track']['image'] = Config::get('web_path') . "/image.php?id=" . $media->album . "&thumb=3&sid=" . session_id();
+ $xml['track']['image'] = Config::get('web_path') . "/image.php?id=" . $media->album . "&thumb=3";
$xml['track']['album'] = $media->f_album_full;
$length = $media->time;
break;
} // type
- $xml['track']['location'] = call_user_func(array($type,'play_url'),$media->id) . $flash_hack;
+ $xml['track']['location'] = call_user_func(array($type,'play_url'),$media->id);
$xml['track']['identifier'] = $xml['track']['location'];
$xml['track']['duration'] = $length * 1000;