unify how the stream is constructed and played, this is a major change might be some regressions

1 files changed, 2 insertions, 10 deletions

diff --git a/lib/class/localplay.abstract.php b/lib/class/localplay.abstract.php
index e7baf0ef..3ab95388 100644
--- a/lib/class/localplay.abstract.php
+++ b/lib/class/localplay.abstract.php
@@ -59,17 +59,9 @@ abstract class localplay_controller {
 			return $object; 		
 		} 
 
-		// This can get a little complicated
-		switch ($object_type) { 
-			case 'random': 
+		$class = get_class($object); 
 		
-			break; 
-			case 'radio': 
-			case 'song': 
-			default: 
-				$url = $object->get_url(Stream::get_session()); 	
-			break;
-		} // end switch on objecttype
+		$url = call_user_func(array($class,'play_url'),$object->id); 
 
 		return $url;