From dbdd96ed1b3b00a850be001f3dbeea3273739a98 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Sat, 28 Feb 2009 18:13:48 +0000
Subject: unify how the stream is constructed and played, this is a major
 change might be some regressions

---
 templates/rightbar.inc.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'templates/rightbar.inc.php')

diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php
index 990d4f20..01a6aa10 100644
--- a/templates/rightbar.inc.php
+++ b/templates/rightbar.inc.php
@@ -88,17 +88,14 @@
 		$objects = array_slice($objects,0,100); 
 	} 
 
-	$normal_array = array('radio','song','video'); 
+	$normal_array = array('radio','song','video','random'); 
 
 	foreach ($objects as $uid=>$object_data) { 
-		if (in_array($object_data['1'],$normal_array)) { 
-			$object = new $object_data['1']($object_data['0']); 
+		$type = array_shift($object_data);
+		if (in_array($type,$normal_array)) { 
+			$object = new $type(array_shift($object_data)); 
 			$object->format(); 
 		} 
-		else { 
-			$object = new Random(); 
-			$object->f_link = Random::get_type_name($object_data['1']); 
-		} 
 ?>
 <li class="<?php echo flip_class(); ?>" >
   <?php echo $object->f_link; ?>
-- 
cgit