summaryrefslogtreecommitdiffstats
path: root/stream.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2009-02-02 04:25:25 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2009-02-02 04:25:25 +0000
commit00effbf55451016e5863e27de93344dfb4a50216 (patch)
treefe1300051d65f14fd34dd53bc7148a47c8e3d5a6 /stream.php
parent0a2b41b143419e85b968a675c8b83a1c15615399 (diff)
downloadampache-00effbf55451016e5863e27de93344dfb4a50216.tar.gz
ampache-00effbf55451016e5863e27de93344dfb4a50216.tar.bz2
ampache-00effbf55451016e5863e27de93344dfb4a50216.zip
Add very basic buggy as crap video support, fix a few other minor bugs with playlists and random elements
Diffstat (limited to 'stream.php')
-rw-r--r--stream.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/stream.php b/stream.php
index d6eada38..9b0bac03 100644
--- a/stream.php
+++ b/stream.php
@@ -44,18 +44,18 @@ switch ($_REQUEST['action']) {
case 'radio':
$radio = new Radio($object_data['0']);
$urls[] = $radio->url;
- $song_ids[] = '-1';
break;
case 'song':
$song_ids[] = $object_data['0'];
break;
+ case 'video':
+ $video_url = Video::play_url($object_data['0']);
+ if ($video_url) { $urls[] = $video_url; }
+ break;
default:
$random_url = Random::play_url($object_data['1']);
// If there's something to actually add
- if ($random_url) {
- $urls[] = $random_url;
- $song_ids[] = '-1';
- }
+ if ($random_url) { $urls[] = $random_url; }
break;
} // end switch on type
} // end foreach