summaryrefslogtreecommitdiffstats
path: root/lib/class/stream_playlist.class.php
diff options
context:
space:
mode:
authorPaul Arthur <paul.arthur@flowerysong.com>2013-02-07 14:24:40 -0500
committerPaul Arthur <paul.arthur@flowerysong.com>2013-02-07 14:24:40 -0500
commit239ea81fdf2fa2bda8a8556e19412264396fe52a (patch)
tree0d753486ec6ded74cb4adb1a7e70dd9ce4ccfda6 /lib/class/stream_playlist.class.php
parent31afde9fc07a766229681a13d2cce0825e9fec93 (diff)
downloadampache-239ea81fdf2fa2bda8a8556e19412264396fe52a.tar.gz
ampache-239ea81fdf2fa2bda8a8556e19412264396fe52a.tar.bz2
ampache-239ea81fdf2fa2bda8a8556e19412264396fe52a.zip
Some cleanup of play URL handling
Move parsing from Song into Stream_URL and make it parse more things. Add the type parameter to all generated URLs instead of adding video to Video URLs.
Diffstat (limited to 'lib/class/stream_playlist.class.php')
-rw-r--r--lib/class/stream_playlist.class.php9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/class/stream_playlist.class.php b/lib/class/stream_playlist.class.php
index a49f47d0..ae16dfb0 100644
--- a/lib/class/stream_playlist.class.php
+++ b/lib/class/stream_playlist.class.php
@@ -374,17 +374,16 @@ class Stream_Playlist {
} // create_localplay
/**
- * create_democratic
+ * create_democratic
+ *
* This 'votes' on the songs it inserts them into
* a tmp_playlist with user of -1 (System)
*/
public function create_democratic() {
-
$democratic = Democratic::get_current_playlist();
$democratic->set_parent();
- $democratic->add_vote($this->media);
-
- } // create_democratic
+ $democratic->add_vote($this->urls);
+ }
/**
* create_download