From 05a58ef6e05078fde0e90f74bf2a609dbc543fd5 Mon Sep 17 00:00:00 2001
From: TheTroll <trolldev@gmail.com>
Date: Sat, 27 Feb 2010 03:26:17 +0100
Subject: Sessions are now working yeah!

---
 includes/inc_stream.php | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

(limited to 'includes/inc_stream.php')

diff --git a/includes/inc_stream.php b/includes/inc_stream.php
index f29271e..925fd7b 100755
--- a/includes/inc_stream.php
+++ b/includes/inc_stream.php
@@ -20,7 +20,7 @@ switch ($type)
 		break;
 	// Media
 	case 3:
-		list($title, $desc) = mediagetinfostream($name);
+		list($title, $desc) = mediagetinfostream($name, 0);
 		$realname = basename($name);
 		break;
 	default:
@@ -49,30 +49,13 @@ print " <span class=\"graytitle\">Select stream mode</span>\r\n";
 // Print the right logo
 print " <ul class=\"pageitem\">\r\n";
 
-switch ($type)
-{
-	case 1:
-		$channoslash = preg_replace("$/$", " ", $realname);
-		$logopath = "logos/" .$channoslash .".png";
-		if (!file_exists($logopath))
-			$logopath = "logos/nologoTV.png";
-		break;
-	case 2:
-		$channoslash = preg_replace("$/$", " ", $realname);
-		$logopath = "logos/" .$channoslash .".png";
-		if (!file_exists($logopath))
-			$logopath = "logos/nologoREC.png";
-		break;
-	case 3:
-		if (file_exists("ram/stream-tb.png"))
-		$logopath = "ram/stream-tb.png";
-		else if (file_exists("ram/stream-tb.jpg"))
-			$logopath = "ram/stream-tb.jpg";
-		else
-			$logopath = "logos/nologoMEDIA.png";
-}
+// Get logo
+if ($type == 2)
+	generatelogo($type, $realname, 'ram/tmp-logo.png');
+else
+	generatelogo($type, $name, 'ram/tmp-logo.png');
 
-print " <center><img src=\"{$logopath}\"></img></center>\r\n";
+print " <center><img src=\"ram/tmp-logo.png\"></img></center>\r\n";
 
 print " </ul>\r\n";
 
-- 
cgit v1.2.3