Second rev with media streaming. Now it works for all video types.

And some more bugfixes
 Committer: Alib <aliboba@free.fr>
	modified:   HISTORY
	modified:   config.php
	modified:   css/style.css
	modified:   includes/inc_media.php
	modified:   includes/inc_rec.php
	modified:   includes/inc_stream.php
	modified:   includes/inc_vdr.php
	modified:   includes/include.php
	modified:   istream.sh

172 files changed, 96 insertions, 50 deletions

diff --git a/HISTORY b/HISTORY
index 451335d..ccf43bd 100755
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,12 @@
 iStreamdev History
 ------------------
 
+in progress - V.0.3.6-dev
+
+- Added Media streaming. Only video files for the moment. Mediainfo is needed on the system. ( The Troll )
+- fix logos channels size in channel list. Now it's ok ( thanks alex )
+- now recordings show logo channel ( The Troll )
+- fix channels with comma in the name to display epg ( thanks hendrikw01 & Mentox )
 
 18.02.2010 - V.0.3.5
 
diff --git a/config.php b/config.php
index 5a63032..d479ba4 100755
--- a/config.php
+++ b/config.php
@@ -1,5 +1,6 @@
 <?php
-	global $user, $pass, $vdrchannels, $vdrstreamdev, $quality, $httppath, $svdrpip, $svdrpport, $ffmpegpath;
+	global $user, $pass, $vdrchannels, $vdrstreamdev, $quality, $httppath;
+	global $svdrpip, $svdrpport, $ffmpegpath, $videotypes, $audiotypes, $mediainfopath;
 
 	// Http configuration
 	$user = 'istreamdev';		// Login
@@ -14,7 +15,10 @@
 	$vdrrecpath='/video/';
 
 	// Media configuration
+	$mediainfopath='/usr/bin/mediainfo';
 	$mediapath='/mnt/Storage/';
+	$videotypes='avi mkv ts mov mp4 wmv flv mpg mpeg mpeg2 mpv';
+	$audiotypes='mp3 wav aac flac';
 
 	// Encoding
 	//			Name		Video	Audio	Audio channels	Resolution
@@ -22,6 +26,8 @@
 				'3g'	=>	'350k	64k	1		408x272',
 				'Wifi'	=>	'512k	128k	2		480x320'
 			);
+
+	// Misc
 	$ffmpegpath = '/usr/bin/ffmpeg';
 
 	// Version
diff --git a/css/style.css b/css/style.css
index 517fefe..eeb1e44 100755
--- a/css/style.css
+++ b/css/style.css
@@ -533,8 +533,8 @@ li.store .image {
 	position: absolute;
 	left: 0;
 	top: 0;
-	height: 80px;
-	width: 80px;
+	height: 90px;
+	width: 90px;
 	display: block;
 	background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#eff1f5), to(#d6dce6));
 	-webkit-background-size: 90px;
@@ -896,11 +896,11 @@ body.list div#content {
 	margin-top: -13px!important;
 }
 body.list ul img {
-	width: 90px;
-	height: 90px;
+	width: 80px;
+	height: 80px;
 	position: absolute;
-	left: 0;
-	top: 0;
+	left: 5;
+	top: 5;
 }
 body.list li.withimage {
 	height: 90px!important;
diff --git a/includes/inc_media.php b/includes/inc_media.php
index 3d1f820..53788c2 100755
--- a/includes/inc_media.php
+++ b/includes/inc_media.php
@@ -1,11 +1,18 @@
 <?php
 
-global $mediapath;
+global $mediapath, $videotypes, $audiotypes;
 
 $dir = $_REQUEST['dir'];
 if ($dir == "")
 	$dir = $mediapath;
 
+/* Add last slash to dirs */
+if ($mediapath[strlen($mediapath)-1] != '/')
+	$mediapath = $mediapath .'/';
+
+if ($dir[strlen($dir)-1] != '/')
+	$dir = $dir .'/';
+
 // Get current subdir
 $subdir = preg_replace("'" .quotemeta($mediapath) ."'", '', $dir);
 
@@ -16,8 +23,11 @@ if ($dir == $mediapath)
 	print "<a href=\"index.php\"><img alt=\"home\" src=\"images/home.png\" /></a></div>\r\n";
 else
 	print "<a href=\"javascript:sendForm('getback')\">Back</a></div>\r\n";
+if ($dir != $mediapath)
+{
 print "<div id=\"rightnav\">\r\n";
 print "<a href=\"index.php\"><img alt=\"home\" src=\"images/home.png\" /></a></div>\r\n";
+}
 print "<div id=\"title\">iStreamdev</div>\r\n";
 print "</div>\r\n";
 print "<div id=\"content\">\r\n";
@@ -26,38 +36,53 @@ print "<br>";
 print " <span class=\"graytitle\">{$subdir}</span>\r\n";
 print " <ul class=\"pageitem\">";
 
-$dir_handle = @opendir($dir) or die("Unable to open $dir");
-
-while ($medianame = readdir($dir_handle))
+$dir_handle = @opendir($dir);
+if (!$dir_handle)
+{
+	print "Unable to open $dir";
+}
+else while ($medianame = readdir($dir_handle))
 {
 	if($medianame == "." || $medianame == ".." || $medianame == 'lost+found')
 		continue;
-	
+
 	$medianame2=addslashes($medianame);
 
-	if (strstr($medianame, ".avi") == ".avi")
+	// Directories
+	if (is_dir($dir ."/" .$medianame))
 	{
 		print "<li class=\"menu\"><a class=\"noeffect\" href=\"javascript:sendForm('$medianame2');\"><span class=\"name\">$medianame</span><span class=\"arrow\"></span></a></li>\r\n";
 		print "<form name=\"$medianame\" id=\"$medianame\" method=\"post\" action=\"index.php\">";
-		print "   <input name=\"action\" type=\"hidden\" id=\"action\" value=\"stream\"/>";
-                print "   <input name=\"type\" type=\"hidden\" id=\"type\" value=3 />";
-                print "   <input name=\"name\" type=\"hidden\" id=\"name\" value=\"{$dir}/{$medianame}\" />";
+		print "   <input name=\"action\" type=\"hidden\" id=\"action\" value=\"media\"/>";
+		print "   <input name=\"dir\" type=\"hidden\" id=\"dir\" value=\"{$dir}{$medianame}/\" />";
 		print "</form>\r\n";
 	}
 	else
 	{
-		print "<li class=\"menu\"><a class=\"noeffect\" href=\"javascript:sendForm('$medianame2');\"><span class=\"name\">$medianame</span><span class=\"arrow\"></span></a></li>\r\n";
-		print "<form name=\"$medianame\" id=\"$medianame\" method=\"post\" action=\"index.php\">";
-		print "   <input name=\"action\" type=\"hidden\" id=\"action\" value=\"media\"/>";
-		print "   <input name=\"dir\" type=\"hidden\" id=\"dir\" value=\"{$dir}/{$medianame}\" />";
-		print "</form>\r\n";
+		// Get file extension
+		$fileext = end(explode(".", $medianame));
+
+		// Check if it is supported
+		if (	preg_match("'" .$fileext ." '", $videotypes)
+		    ||	preg_match("'" .$fileext ." $'", $videotypes)
+		   )
+		{
+			print "<li class=\"menu\"><a class=\"noeffect\" href=\"javascript:sendForm('$medianame2');\"><img src=\"images/pictos/media.png\" /><span class=\"name\">$medianame</span><span class=\"arrow\"></span></a></li>\r\n";
+			print "<form name=\"$medianame\" id=\"$medianame\" method=\"post\" action=\"index.php\">";
+			print "   <input name=\"action\" type=\"hidden\" id=\"action\" value=\"stream\"/>";
+	                print "   <input name=\"type\" type=\"hidden\" id=\"type\" value=3 />";
+        	        print "   <input name=\"name\" type=\"hidden\" id=\"name\" value=\"{$dir}{$medianame}\" />";
+			print "</form>\r\n";
+		}
 	}
 }
 
 $updir = dirname($dir);
 
 print "<form name=\"getback\" id=\"getback\" method=\"post\" action=\"index.php\"><input name=\"action\" type=\"hidden\" id=\"action\" value=\"media\"/><input name=\"dir\" type=\"hidden\" id=\"dir\" value=\"{$updir}/\" /></form>\r\n";
-closedir($dir_handle);
+
+if ($dir_handle)
+	closedir($dir_handle);
 
 print "</ul></div>\r\n";
 ?>
diff --git a/includes/inc_rec.php b/includes/inc_rec.php
index 8459a07..b01a64c 100755
--- a/includes/inc_rec.php
+++ b/includes/inc_rec.php
@@ -16,10 +16,11 @@ if ($dir == $vdrrecpath)
 	print "<a href=\"index.php\"><img alt=\"home\" src=\"images/home.png\" /></a></div>\r\n";
 else
 	print "<a href=\"javascript:sendForm('getback')\">Back</a></div>\r\n";
-
+if ($dir != $vdrrecpath)
+{
 print "<div id=\"rightnav\">\r\n";
 print "<a href=\"index.php\"><img alt=\"home\" src=\"images/home.png\" /></a></div>\r\n";
-
+}
 print "<div id=\"title\">iStreamdev</div>\r\n";
 print "</div>\r\n";
 print "<div id=\"content\">\r\n";
@@ -28,9 +29,12 @@ print "<br>";
 print " <span class=\"graytitle\">{$subdir}</span>\r\n";
 print " <ul class=\"pageitem\">";
 
-$dir_handle = @opendir($dir) or die("Unable to open $dir");
-
-while ($recname = readdir($dir_handle))
+$dir_handle = @opendir($dir);
+if (!$dir_handle)
+{
+	print "Unable to open $dir";
+}
+else while ($recname = readdir($dir_handle))
 {
 	if($recname == "." || $recname == ".." || $recname == "epg.data" || $recname == 'lost+found')
 		continue;
@@ -59,7 +63,9 @@ while ($recname = readdir($dir_handle))
 $updir = dirname($dir);
 
 print "<form name=\"getback\" id=\"getback\" method=\"post\" action=\"index.php\"><input name=\"action\" type=\"hidden\" id=\"action\" value=\"recordings\"/><input name=\"dir\" type=\"hidden\" id=\"dir\" value=\"{$updir}/\" /></form>\r\n";
-closedir($dir_handle);
+
+if ($dir_handle)
+	closedir($dir_handle);
 
 print "</ul></div>\r\n";
 ?>
diff --git a/includes/inc_stream.php b/includes/inc_stream.php
index b5df588..da191fa 100755
--- a/includes/inc_stream.php
+++ b/includes/inc_stream.php
@@ -21,15 +21,17 @@ if (infostreamexist())
 
 	// Print the right logo
 	print " <ul class=\"pageitem\">\r\n";
-	if ($type <= 2)
-	{
-		if (!file_exists('logos/'.$realname.'.png'))
-			print " <center><video id=\"videofeed\" poster=\"logos/nologo2.png\" width='80' height='80' /></center>\r\n";
-		else
-			print " <center><video id=\"videofeed\" poster=\"logos/{$realname}.png\" width='80' height='80' /></center>\r\n";
-	}
+
+	if ($type == 3)
+		$logopath = "ram/stream-tb.png";
 	else
+		$logopath = "logos/" .$realname .".png";
+
+	if (!file_exists($logopath))
 		print " <center><video id=\"videofeed\" poster=\"logos/nologo2.png\" width='80' height='80' /></center>\r\n";
+	else
+		print " <center><video id=\"videofeed\" poster=\"{$logopath}\" width='80' height='80' /></center>\r\n";
+
 	print " </ul>\r\n";
 
 	print " <ul class=\"pageitem\">\r\n";
@@ -52,7 +54,7 @@ if (infostreamexist())
 			print "   <input name=\"name\" type=\"hidden\" id=\"name\" value=\"{$realname}\" />";
 			break;
 		case 2:
-		case 3:
+		case 3:	
 			print "   <input name=\"name\" type=\"hidden\" id=\"name\" value=\"{$url}\" />";
 			break;
 			
@@ -79,9 +81,8 @@ else
 			break;
 		// Media
 		case 3:
-			$realname = $name;
-			$title = "";
-			$desc = "";
+			list($title, $desc) = mediagetinfostream($name);
+			$realname = basename($name);
 			break;
 		default:
 			$realname = "";
@@ -106,18 +107,18 @@ else
 
 	print " <span class=\"graytitle\">Select stream mode</span>\r\n";
 
+	// Print the right logo
 	print " <ul class=\"pageitem\">\r\n";
 
-	// Print the right logo
-	if ($type <= 2)
-	{
-		if (!file_exists('logos/'.$realname.'.png'))
-			print " <center><img src=\"logos/nologo2.png\"></img></center>\r\n";
-		else
-			print " <center><img src=\"logos/{$realname}.png\"></img></center>\r\n";
-	}
+	if ($type == 3)
+		$logopath = "ram/stream-tb.png";
 	else
+		$logopath = "logos/" .$realname .".png";
+
+	if (!file_exists($logopath))
 		print " <center><img src=\"logos/nologo2.png\"></img></center>\r\n";
+	else
+		print " <center><img src=\"{$logopath}\"></img></center>\r\n";
 
 	print " </ul>\r\n";
 
diff --git a/includes/inc_vdr.php b/includes/inc_vdr.php
index a90d80f..07880e7 100755
--- a/includes/inc_vdr.php
+++ b/includes/inc_vdr.php
@@ -52,6 +52,7 @@ function vdrgetinfostream($stream = "NULL", $ischan = 1)
 		// Find the right chan (take the first one)
 		if ($chanfound == 0)
 		{
+			$streamArray = explode(",",$stream);
 			if (strstr($allepg[$i], $stream) == $stream)
 				$chanfound = 1;
 		}
@@ -73,7 +74,7 @@ function vdrgetinfostream($stream = "NULL", $ischan = 1)
 				{
 					$channame = substr($allepg[$i], 2);
 					$channames = explode(" ", $channame);
-					$channame = substr($channame, strlen($channames[0]));
+					$channame = substr($channame, strlen($channames[0])+1);
 				}
 			}
 			else if(ereg("^T", $allepg[$i]))
diff --git a/includes/include.php b/includes/include.php
index acffb58..05aa4b5 100755
--- a/includes/include.php
+++ b/includes/include.php
@@ -3,6 +3,7 @@
 include ('config.php');
 include ('includes/inc_auth.php');
 include ('includes/inc_vdr.php');
+include ('includes/inc_files.php');
 include ('includes/inc_streaminfo.php');
 
 function selectpage()
@@ -99,7 +100,7 @@ function start_stream($type, $name, $title, $desc, $qname, $qparams, $category,
 			$cmd = "export SHELL=\"/bin/sh\";printf \"cat \\\"" .$url ."\\\"/0* | ./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." \" | at now";
 			break;
 		case 3:
-			$cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh '" .$url ."' " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." \" | at now";
+			$cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." \" | at now";
                         break;
 		default:
 			$cmd = "";
diff --git a/istream.sh b/istream.sh
index 7e5c93c..224bb11 100755
--- a/istream.sh
+++ b/istream.sh
@@ -33,7 +33,7 @@ then
 cd ram
 2> /dev/null rm "$PREFIX"*.ts
 
-2> /dev/null $FFPATH -i $STREAM -deinterlace -f mpegts -acodec libmp3lame -ab $ARATE -ac $ACHANNELS -s $XY -vcodec libx264 -b $VRATE -flags +loop \
+2> /dev/null $FFPATH -i "$STREAM" -deinterlace -f mpegts -acodec libmp3lame -ab $ARATE -ac $ACHANNELS -s $XY -vcodec libx264 -b $VRATE -flags +loop \
  -cmp \+chroma -partitions +parti4x4+partp8x8+partb8x8 -subq 5 -trellis 1 -refs 1 -coder 0 -me_range 16  -keyint_min 25 \
  -sc_threshold 40 -i_qfactor 0.71 -bt $VRATE -maxrate $VRATE -bufsize $VRATE -rc_eq 'blurCplx^(1-qComp)' -qcomp 0.6 \
  -qmin 10 -qmax 51 -qdiff 4 -level 30  -g 30 -async 2 -threads 4 - | \
diff --git a/logos/13EME RUE.png b/logos/13EME RUE.png
deleted file mode 100755
index cc27f3a..0000000
--- a/logos/13EME RUE.png
+++ /dev/null
diff --git a/logos/AB 1.png b/logos/AB 1.png
deleted file mode 100755
index 604d90f..0000000
--- a/logos/AB 1.png
+++ /dev/null
diff --git a/logos/AB MOTEURS.png b/logos/AB MOTEURS.png
deleted file mode 100755
index e780742..0000000
--- a/logos/AB MOTEURS.png
+++ /dev/null
diff --git a/logos/ACTION.png b/logos/ACTION.png
deleted file mode 100755
index 087e26c..0000000
--- a/logos/ACTION.png
+++ /dev/null
diff --git a/logos/AL JAZEERA ENG.png b/logos/AL JAZEERA ENG.png
deleted file mode 100755
index ffde7c0..0000000
--- a/logos/AL JAZEERA ENG.png
+++ /dev/null
diff --git a/logos/ANIMAUX.png b/logos/ANIMAUX.png
deleted file mode 100755
index cb8e782..0000000
--- a/logos/ANIMAUX.png
+++ /dev/null
diff --git a/logos/ARTE HD.png b/logos/ARTE HD.png
deleted file mode 100755
index ee74b7d..0000000
--- a/logos/ARTE HD.png
+++ /dev/null
diff --git a/logos/ARTE.png b/logos/ARTE.png
deleted file mode 100755
index 4058410..0000000
--- a/logos/ARTE.png
+++ /dev/null
diff --git a/logos/BABY TV.png b/logos/BABY TV.png
deleted file mode 100755
index 86d1226..0000000
--- a/logos/BABY TV.png
+++ /dev/null
diff --git a/logos/BBC PRIME.png b/logos/BBC PRIME.png
deleted file mode 100755
index 0aef568..0000000
--- a/logos/BBC PRIME.png
+++ /dev/null
diff --git a/logos/BBC WORLD.png b/logos/BBC WORLD.png
deleted file mode 100755
index a6c94d5..0000000
--- a/logos/BBC WORLD.png
+++ /dev/null
diff --git a/logos/BFM TV.png b/logos/BFM TV.png
deleted file mode 100755
index 632d350..0000000
--- a/logos/BFM TV.png
+++ /dev/null
diff --git a/logos/BLOOMBERG TV.png b/logos/BLOOMBERG TV.png
deleted file mode 100755
index 71082e3..0000000
--- a/logos/BLOOMBERG TV.png
+++ /dev/null
diff --git a/logos/BOOMERANG.png b/logos/BOOMERANG.png
deleted file mode 100755
index 1d55ced..0000000
--- a/logos/BOOMERANG.png
+++ /dev/null
diff --git a/logos/BravaHDTV.png b/logos/BravaHDTV.png
deleted file mode 100755
index 2089284..0000000
--- a/logos/BravaHDTV.png
+++ /dev/null
diff --git a/logos/C CINEMA CLASSIC.png b/logos/C CINEMA CLASSIC.png
deleted file mode 100755
index eefa688..0000000
--- a/logos/C CINEMA CLASSIC.png
+++ /dev/null
diff --git a/logos/C CINEMA CLUB.png b/logos/C CINEMA CLUB.png
deleted file mode 100755
index f1fb7ef..0000000
--- a/logos/C CINEMA CLUB.png
+++ /dev/null
diff --git a/logos/C CINEMA EMOTION.png b/logos/C CINEMA EMOTION.png
deleted file mode 100755
index 7f1f29b..0000000
--- a/logos/C CINEMA EMOTION.png
+++ /dev/null
diff --git a/logos/C CINEMA FAMIZ.png b/logos/C CINEMA FAMIZ.png
deleted file mode 100755
index fe04546..0000000
--- a/logos/C CINEMA FAMIZ.png
+++ /dev/null
diff --git a/logos/C CINEMA FRISSON.png b/logos/C CINEMA FRISSON.png
deleted file mode 100755
index 0c93aa2..0000000
--- a/logos/C CINEMA FRISSON.png
+++ /dev/null
diff --git a/logos/C CINEMA PREMIER.png b/logos/C CINEMA PREMIER.png
deleted file mode 100755
index 4a584a0..0000000
--- a/logos/C CINEMA PREMIER.png
+++ /dev/null
diff --git a/logos/C CINEMA STAR.png b/logos/C CINEMA STAR.png
deleted file mode 100755
index 7ce3619..0000000
--- a/logos/C CINEMA STAR.png
+++ /dev/null
diff --git a/logos/CANAL J.png b/logos/CANAL J.png
deleted file mode 100755
index 6d408f2..0000000
--- a/logos/CANAL J.png
+++ /dev/null
diff --git a/logos/CANAL+ CINEMA.png b/logos/CANAL+ CINEMA.png
deleted file mode 100755
index b6246cd..0000000
--- a/logos/CANAL+ CINEMA.png
+++ /dev/null
diff --git a/logos/CANAL+ DECALE.png b/logos/CANAL+ DECALE.png
deleted file mode 100755
index 16194cf..0000000
--- a/logos/CANAL+ DECALE.png
+++ /dev/null
diff --git a/logos/CANAL+ FAMILY.png b/logos/CANAL+ FAMILY.png
deleted file mode 100755
index 4dab0bf..0000000
--- a/logos/CANAL+ FAMILY.png
+++ /dev/null
diff --git a/logos/CANAL+ HD.png b/logos/CANAL+ HD.png
deleted file mode 100755
index 0921b25..0000000
--- a/logos/CANAL+ HD.png
+++ /dev/null
diff --git a/logos/CANAL+ SPORT.png b/logos/CANAL+ SPORT.png
deleted file mode 100755
index 87c8dfc..0000000
--- a/logos/CANAL+ SPORT.png
+++ /dev/null
diff --git a/logos/CANAL+.png b/logos/CANAL+.png
deleted file mode 100755
index 4851d93..0000000
--- a/logos/CANAL+.png
+++ /dev/null
diff --git a/logos/CARTOON NETWORK.png b/logos/CARTOON NETWORK.png
deleted file mode 100755
index 5756bc8..0000000
--- a/logos/CARTOON NETWORK.png
+++ /dev/null
diff --git a/logos/CHASSE ET PECHE.png b/logos/CHASSE ET PECHE.png
deleted file mode 100755
index 375f194..0000000
--- a/logos/CHASSE ET PECHE.png
+++ /dev/null
diff --git a/logos/CINE FX.png b/logos/CINE FX.png
deleted file mode 100755
index 8cd93f9..0000000
--- a/logos/CINE FX.png
+++ /dev/null
diff --git a/logos/CINE POLAR.png b/logos/CINE POLAR.png
deleted file mode 100755
index 863d904..0000000
--- a/logos/CINE POLAR.png
+++ /dev/null
diff --git a/logos/CNBC EUROPE.png b/logos/CNBC EUROPE.png
deleted file mode 100755
index 09d14bc..0000000
--- a/logos/CNBC EUROPE.png
+++ /dev/null
diff --git a/logos/CNN.png b/logos/CNN.png
deleted file mode 100755
index 54f0b37..0000000
--- a/logos/CNN.png
+++ /dev/null
diff --git a/logos/COMEDIE !.png b/logos/COMEDIE !.png
deleted file mode 100755
index 35878e6..0000000
--- a/logos/COMEDIE !.png
+++ /dev/null
diff --git a/logos/CUISINE TV.png b/logos/CUISINE TV.png
deleted file mode 100755
index b3d4358..0000000
--- a/logos/CUISINE TV.png
+++ /dev/null
diff --git a/logos/DIRECT 8.png b/logos/DIRECT 8.png
deleted file mode 100755
index b4ad4fd..0000000
--- a/logos/DIRECT 8.png
+++ /dev/null
diff --git a/logos/DISNEY CHANNEL+1.png b/logos/DISNEY CHANNEL+1.png
deleted file mode 100755
index ffc0fed..0000000
--- a/logos/DISNEY CHANNEL+1.png
+++ /dev/null
diff --git a/logos/DISNEY CHANNEL.png b/logos/DISNEY CHANNEL.png
deleted file mode 100755
index f41c27e..0000000
--- a/logos/DISNEY CHANNEL.png
+++ /dev/null
diff --git a/logos/DISNEY CINEMAGIC+1.png b/logos/DISNEY CINEMAGIC+1.png
deleted file mode 100755
index 191f699..0000000
--- a/logos/DISNEY CINEMAGIC+1.png
+++ /dev/null
diff --git a/logos/DISNEY CINEMAGIC.png b/logos/DISNEY CINEMAGIC.png
deleted file mode 100755
index 63e1175..0000000
--- a/logos/DISNEY CINEMAGIC.png
+++ /dev/null
diff --git a/logos/DISNEY MAGIC HD.png b/logos/DISNEY MAGIC HD.png
deleted file mode 100755
index 63e1175..0000000
--- a/logos/DISNEY MAGIC HD.png
+++ /dev/null
diff --git a/logos/E! ENTERTAINMENT.png b/logos/E! ENTERTAINMENT.png
deleted file mode 100755
index 6a6bf9d..0000000
--- a/logos/E! ENTERTAINMENT.png
+++ /dev/null
diff --git a/logos/ENCYCLOPEDIA.png b/logos/ENCYCLOPEDIA.png
deleted file mode 100755
index 6850169..0000000
--- a/logos/ENCYCLOPEDIA.png
+++ /dev/null
diff --git a/logos/ESCALES.png b/logos/ESCALES.png
deleted file mode 100755
index fd80ef7..0000000
--- a/logos/ESCALES.png
+++ /dev/null
diff --git a/logos/ESPN CLASSIC EUROPE.png b/logos/ESPN CLASSIC EUROPE.png
deleted file mode 100755
index e284e9b..0000000
--- a/logos/ESPN CLASSIC EUROPE.png
+++ /dev/null
diff --git a/logos/ESPN CLASSIC.png b/logos/ESPN CLASSIC.png
deleted file mode 100755
index e284e9b..0000000
--- a/logos/ESPN CLASSIC.png
+++ /dev/null
diff --git a/logos/EUREKA!.png b/logos/EUREKA!.png
deleted file mode 100755
index b826435..0000000
--- a/logos/EUREKA!.png
+++ /dev/null
diff --git a/logos/EURONEWS.png b/logos/EURONEWS.png
deleted file mode 100755
index d2d8d1f..0000000
--- a/logos/EURONEWS.png
+++ /dev/null
diff --git a/logos/EUROSPORT.png b/logos/EUROSPORT.png
deleted file mode 100755
index c97af71..0000000
--- a/logos/EUROSPORT.png
+++ /dev/null
diff --git a/logos/EXTREME SPORTS.png b/logos/EXTREME SPORTS.png
deleted file mode 100755
index 392c8cb..0000000
--- a/logos/EXTREME SPORTS.png
+++ /dev/null
diff --git a/logos/FILLES TV.png b/logos/FILLES TV.png
deleted file mode 100755
index cb1bbed..0000000
--- a/logos/FILLES TV.png
+++ /dev/null
diff --git a/logos/FIT.png b/logos/FIT.png
deleted file mode 100755
index ef49ae6..0000000
--- a/logos/FIT.png
+++ /dev/null
diff --git a/logos/FOOT+ 1.png b/logos/FOOT+ 1.png
deleted file mode 100755
index 277b93e..0000000
--- a/logos/FOOT+ 1.png
+++ /dev/null
diff --git a/logos/FOOT+ 2.png b/logos/FOOT+ 2.png
deleted file mode 100755
index 277b93e..0000000
--- a/logos/FOOT+ 2.png
+++ /dev/null
diff --git a/logos/FOOT+ 3.png b/logos/FOOT+ 3.png
deleted file mode 100755
index 277b93e..0000000
--- a/logos/FOOT+ 3.png
+++ /dev/null
diff --git a/logos/FOOT+ 4.png b/logos/FOOT+ 4.png
deleted file mode 100755
index 277b93e..0000000
--- a/logos/FOOT+ 4.png
+++ /dev/null
diff --git a/logos/FOOT+ 5.png b/logos/FOOT+ 5.png
deleted file mode 100755
index 277b93e..0000000
--- a/logos/FOOT+ 5.png
+++ /dev/null
diff --git a/logos/FOOT+ 6.png b/logos/FOOT+ 6.png
deleted file mode 100755
index 277b93e..0000000
--- a/logos/FOOT+ 6.png
+++ /dev/null
diff --git a/logos/FOOT+ 7.png b/logos/FOOT+ 7.png
deleted file mode 100755
index 277b93e..0000000
--- a/logos/FOOT+ 7.png
+++ /dev/null
diff --git a/logos/FOX LIFE.png b/logos/FOX LIFE.png
deleted file mode 100755
index 5a6b47c..0000000
--- a/logos/FOX LIFE.png
+++ /dev/null
diff --git a/logos/FRANCE 0.png b/logos/FRANCE 0.png
deleted file mode 100755
index 166bea3..0000000
--- a/logos/FRANCE 0.png
+++ /dev/null
diff --git a/logos/FRANCE 2 HD.png b/logos/FRANCE 2 HD.png
deleted file mode 100755
index c77d725..0000000
--- a/logos/FRANCE 2 HD.png
+++ /dev/null
diff --git a/logos/FRANCE 2.png b/logos/FRANCE 2.png
deleted file mode 100755
index c77d725..0000000
--- a/logos/FRANCE 2.png
+++ /dev/null
diff --git a/logos/FRANCE 24.png b/logos/FRANCE 24.png
deleted file mode 100755
index 8f611c0..0000000
--- a/logos/FRANCE 24.png
+++ /dev/null
diff --git a/logos/FRANCE 4.png b/logos/FRANCE 4.png
deleted file mode 100755
index f4f054d..0000000
--- a/logos/FRANCE 4.png
+++ /dev/null
diff --git a/logos/FRANCE 5.png b/logos/FRANCE 5.png
deleted file mode 100755
index c286b57..0000000
--- a/logos/FRANCE 5.png
+++ /dev/null
diff --git a/logos/FUN TV.png b/logos/FUN TV.png
deleted file mode 100755
index 8a55394..0000000
--- a/logos/FUN TV.png
+++ /dev/null
diff --git a/logos/France 3 SAT.png b/logos/France 3 SAT.png
deleted file mode 100755
index 8f20d16..0000000
--- a/logos/France 3 SAT.png
+++ /dev/null
diff --git a/logos/France 3.png b/logos/France 3.png
deleted file mode 100755
index 8f20d16..0000000
--- a/logos/France 3.png
+++ /dev/null
diff --git a/logos/GAME ONE.png b/logos/GAME ONE.png
deleted file mode 100755
index 56b3c5f..0000000
--- a/logos/GAME ONE.png
+++ /dev/null
diff --git a/logos/GULLI.png b/logos/GULLI.png
deleted file mode 100755
index 17713f5..0000000
--- a/logos/GULLI.png
+++ /dev/null
diff --git a/logos/HD1.png b/logos/HD1.png
deleted file mode 100755
index 216d2ef..0000000
--- a/logos/HD1.png
+++ /dev/null
diff --git a/logos/HISTOIRE.png b/logos/HISTOIRE.png
deleted file mode 100755
index 36be92e..0000000
--- a/logos/HISTOIRE.png
+++ /dev/null
diff --git a/logos/HUSTLER TV.png b/logos/HUSTLER TV.png
deleted file mode 100755
index e6cf9ae..0000000
--- a/logos/HUSTLER TV.png
+++ /dev/null
diff --git a/logos/I CONCERTS.png b/logos/I CONCERTS.png
deleted file mode 100755
index d0d05cb..0000000
--- a/logos/I CONCERTS.png
+++ /dev/null
diff --git a/logos/I TELEVISION.png b/logos/I TELEVISION.png
deleted file mode 100755
index e8d2aeb..0000000
--- a/logos/I TELEVISION.png
+++ /dev/null
diff --git a/logos/INFOSPORT.png b/logos/INFOSPORT.png
deleted file mode 100755
index 5cd185c..0000000
--- a/logos/INFOSPORT.png
+++ /dev/null
diff --git a/logos/JETIX.png b/logos/JETIX.png
deleted file mode 100755
index 658fe7c..0000000
--- a/logos/JETIX.png
+++ /dev/null
diff --git a/logos/JIMMY.png b/logos/JIMMY.png
deleted file mode 100755
index 5b07fbf..0000000
--- a/logos/JIMMY.png
+++ /dev/null
diff --git a/logos/KTO.png b/logos/KTO.png
deleted file mode 100755
index 2e16945..0000000
--- a/logos/KTO.png
+++ /dev/null
diff --git a/logos/L'EQUIPE TV.png b/logos/L'EQUIPE TV.png
deleted file mode 100755
index 0d84f26..0000000
--- a/logos/L'EQUIPE TV.png
+++ /dev/null
diff --git a/logos/LA CHAINE METEO.png b/logos/LA CHAINE METEO.png
deleted file mode 100755
index 482fcb9..0000000
--- a/logos/LA CHAINE METEO.png
+++ /dev/null
diff --git a/logos/LCI.png b/logos/LCI.png
deleted file mode 100755
index dc76259..0000000
--- a/logos/LCI.png
+++ /dev/null
diff --git a/logos/LUXE TV HD.png b/logos/LUXE TV HD.png
deleted file mode 100755
index 0bb78b8..0000000
--- a/logos/LUXE TV HD.png
+++ /dev/null
diff --git a/logos/Live 1.png b/logos/Live 1.png
deleted file mode 100755
index 937dee4..0000000
--- a/logos/Live 1.png
+++ /dev/null
diff --git a/logos/M6 BOUTIQUE LA CHAINE.png b/logos/M6 BOUTIQUE LA CHAINE.png
deleted file mode 100755
index cd72525..0000000
--- a/logos/M6 BOUTIQUE LA CHAINE.png
+++ /dev/null
diff --git a/logos/M6 HD.png b/logos/M6 HD.png
deleted file mode 100755
index a7a501d..0000000
--- a/logos/M6 HD.png
+++ /dev/null
diff --git a/logos/M6 MUSIC BLACK.png b/logos/M6 MUSIC BLACK.png
deleted file mode 100755
index 9a5e55d..0000000
--- a/logos/M6 MUSIC BLACK.png
+++ /dev/null
diff --git a/logos/M6 MUSIC HITS.png b/logos/M6 MUSIC HITS.png
deleted file mode 100755
index 586e2a1..0000000
--- a/logos/M6 MUSIC HITS.png
+++ /dev/null
diff --git a/logos/M6 MUSIC ROCK.png b/logos/M6 MUSIC ROCK.png
deleted file mode 100755
index a3d28e6..0000000
--- a/logos/M6 MUSIC ROCK.png
+++ /dev/null
diff --git a/logos/M6.png b/logos/M6.png
deleted file mode 100755
index 5a02503..0000000
--- a/logos/M6.png
+++ /dev/null
diff --git a/logos/MA CHAINE SPORT.png b/logos/MA CHAINE SPORT.png
deleted file mode 100755
index cc75af6..0000000
--- a/logos/MA CHAINE SPORT.png
+++ /dev/null
diff --git a/logos/MANGAS.png b/logos/MANGAS.png
deleted file mode 100755
index 5c3dca6..0000000
--- a/logos/MANGAS.png
+++ /dev/null
diff --git a/logos/MATCH TV.png b/logos/MATCH TV.png
deleted file mode 100755
index 09bbf52..0000000
--- a/logos/MATCH TV.png
+++ /dev/null
diff --git a/logos/MCM POP.png b/logos/MCM POP.png
deleted file mode 100755
index 7d6e8eb..0000000
--- a/logos/MCM POP.png
+++ /dev/null
diff --git a/logos/MCM TOP.png b/logos/MCM TOP.png
deleted file mode 100755
index c466781..0000000
--- a/logos/MCM TOP.png
+++ /dev/null
diff --git a/logos/MCM.png b/logos/MCM.png
deleted file mode 100755
index 38a8382..0000000
--- a/logos/MCM.png
+++ /dev/null
diff --git a/logos/MELODY ZEN HD.png b/logos/MELODY ZEN HD.png
deleted file mode 100755
index 68090d6..0000000
--- a/logos/MELODY ZEN HD.png
+++ /dev/null
diff --git a/logos/MOTORS TV.png b/logos/MOTORS TV.png
deleted file mode 100755
index e288d22..0000000
--- a/logos/MOTORS TV.png
+++ /dev/null
diff --git a/logos/MTV 2.png b/logos/MTV 2.png
deleted file mode 100755
index 4dbb1bf..0000000
--- a/logos/MTV 2.png
+++ /dev/null
diff --git a/logos/MTV BASE.png b/logos/MTV BASE.png
deleted file mode 100755
index fc6f509..0000000
--- a/logos/MTV BASE.png
+++ /dev/null
diff --git a/logos/MTV HD.png b/logos/MTV HD.png
deleted file mode 100755
index 3772733..0000000
--- a/logos/MTV HD.png
+++ /dev/null
diff --git a/logos/MTV HITS.png b/logos/MTV HITS.png
deleted file mode 100755
index 9b50918..0000000
--- a/logos/MTV HITS.png
+++ /dev/null
diff --git a/logos/MTV IDOL.png b/logos/MTV IDOL.png
deleted file mode 100755
index 5dbbd79..0000000
--- a/logos/MTV IDOL.png
+++ /dev/null
diff --git a/logos/MTV PULSE.png b/logos/MTV PULSE.png
deleted file mode 100755
index d20c300..0000000
--- a/logos/MTV PULSE.png
+++ /dev/null
diff --git a/logos/MTV.png b/logos/MTV.png
deleted file mode 100755
index 1ea1863..0000000
--- a/logos/MTV.png
+++ /dev/null
diff --git a/logos/MUSIQUE CLASSIQUE.png b/logos/MUSIQUE CLASSIQUE.png
deleted file mode 100755
index 49e8daa..0000000
--- a/logos/MUSIQUE CLASSIQUE.png
+++ /dev/null
diff --git a/logos/Mezzo.png b/logos/Mezzo.png
deleted file mode 100755
index 48aa979..0000000
--- a/logos/Mezzo.png
+++ /dev/null
diff --git a/logos/NATIONAL GEO HD.png b/logos/NATIONAL GEO HD.png
deleted file mode 100755
index 97eef82..0000000
--- a/logos/NATIONAL GEO HD.png
+++ /dev/null
diff --git a/logos/NATIONAL GEO.png b/logos/NATIONAL GEO.png
deleted file mode 100755
index 2c47950..0000000
--- a/logos/NATIONAL GEO.png
+++ /dev/null
diff --git a/logos/NBA+.png b/logos/NBA+.png
deleted file mode 100755
index b18c2ea..0000000
--- a/logos/NBA+.png
+++ /dev/null
diff --git a/logos/NICKELODEON.png b/logos/NICKELODEON.png
deleted file mode 100755
index e64bc7f..0000000
--- a/logos/NICKELODEON.png
+++ /dev/null
diff --git a/logos/NRJ 12 HD.png b/logos/NRJ 12 HD.png
deleted file mode 100755
index 2881ff8..0000000
--- a/logos/NRJ 12 HD.png
+++ /dev/null
diff --git a/logos/NRJ 12.png b/logos/NRJ 12.png
deleted file mode 100755
index 8e29c15..0000000
--- a/logos/NRJ 12.png
+++ /dev/null
diff --git a/logos/NT1.png b/logos/NT1.png
deleted file mode 100755
index 60f426d..0000000
--- a/logos/NT1.png
+++ /dev/null
diff --git a/logos/ODYSSEE.png b/logos/ODYSSEE.png
deleted file mode 100755
index 4a4b294..0000000
--- a/logos/ODYSSEE.png
+++ /dev/null
diff --git a/logos/OL TV.png b/logos/OL TV.png
deleted file mode 100755
index 5697bb7..0000000
--- a/logos/OL TV.png
+++ /dev/null
diff --git a/logos/OLTV.png b/logos/OLTV.png
deleted file mode 100755
index 5697bb7..0000000
--- a/logos/OLTV.png
+++ /dev/null
diff --git a/logos/OM TV.png b/logos/OM TV.png
deleted file mode 100755
index 9677ae6..0000000
--- a/logos/OM TV.png
+++ /dev/null
diff --git a/logos/OM'TV.png b/logos/OM'TV.png
deleted file mode 100755
index 9677ae6..0000000
--- a/logos/OM'TV.png
+++ /dev/null
diff --git a/logos/PARIS PREMIERE.png b/logos/PARIS PREMIERE.png
deleted file mode 100755
index ceda0af..0000000
--- a/logos/PARIS PREMIERE.png
+++ /dev/null
diff --git a/logos/PINK TV.png b/logos/PINK TV.png
deleted file mode 100755
index 56ff1f0..0000000
--- a/logos/PINK TV.png
+++ /dev/null
diff --git a/logos/PIWI.png b/logos/PIWI.png
deleted file mode 100755
index 8245cf8..0000000
--- a/logos/PIWI.png
+++ /dev/null
diff --git a/logos/PLANETE JUNIORS.png b/logos/PLANETE JUNIORS.png
deleted file mode 100755
index 1128c7d..0000000
--- a/logos/PLANETE JUNIORS.png
+++ /dev/null
diff --git a/logos/PLANETE JUSTICE.png b/logos/PLANETE JUSTICE.png
deleted file mode 100755
index 2fd9ca0..0000000
--- a/logos/PLANETE JUSTICE.png
+++ /dev/null
diff --git a/logos/PLANETE NO LIMIT.png b/logos/PLANETE NO LIMIT.png
deleted file mode 100755
index f2419e9..0000000
--- a/logos/PLANETE NO LIMIT.png
+++ /dev/null
diff --git a/logos/PLANETE THALASSA.png b/logos/PLANETE THALASSA.png
deleted file mode 100755
index d1db779..0000000
--- a/logos/PLANETE THALASSA.png
+++ /dev/null
diff --git a/logos/PLANETE.png b/logos/PLANETE.png
deleted file mode 100755
index 00ac961..0000000
--- a/logos/PLANETE.png
+++ /dev/null
diff --git a/logos/PLAYHOUSE DISNEY.png b/logos/PLAYHOUSE DISNEY.png
deleted file mode 100755
index adf7bb4..0000000
--- a/logos/PLAYHOUSE DISNEY.png
+++ /dev/null
diff --git a/logos/PLAYIN' TV.png b/logos/PLAYIN' TV.png
deleted file mode 100755
index cb398b1..0000000
--- a/logos/PLAYIN' TV.png
+++ /dev/null
diff --git a/logos/POKER CHANNEL.png b/logos/POKER CHANNEL.png
deleted file mode 100755
index 6731afc..0000000
--- a/logos/POKER CHANNEL.png
+++ /dev/null
diff --git a/logos/RAI 1.png b/logos/RAI 1.png
deleted file mode 100755
index a00bed5..0000000
--- a/logos/RAI 1.png
+++ /dev/null
diff --git a/logos/REAL TIME.png b/logos/REAL TIME.png
deleted file mode 100755
index 19209cf..0000000
--- a/logos/REAL TIME.png
+++ /dev/null
diff --git a/logos/RTL9.png b/logos/RTL9.png
deleted file mode 100755
index 12568bc..0000000
--- a/logos/RTL9.png
+++ /dev/null
diff --git a/logos/RTPI.png b/logos/RTPI.png
deleted file mode 100755
index 95a152d..0000000
--- a/logos/RTPI.png
+++ /dev/null
diff --git a/logos/SCI-FI.png b/logos/SCI-FI.png
deleted file mode 100755
index f008c7c..0000000
--- a/logos/SCI-FI.png
+++ /dev/null
diff --git a/logos/SEASONS.png b/logos/SEASONS.png
deleted file mode 100755
index 0829cec..0000000
--- a/logos/SEASONS.png
+++ /dev/null
diff --git a/logos/SERIE CLUB.png b/logos/SERIE CLUB.png
deleted file mode 100755
index f4f0878..0000000
--- a/logos/SERIE CLUB.png
+++ /dev/null
diff --git a/logos/SIC.png b/logos/SIC.png
deleted file mode 100755
index 961ff1b..0000000
--- a/logos/SIC.png
+++ /dev/null
diff --git a/logos/SPORT+.png b/logos/SPORT+.png
deleted file mode 100755
index 54daeba..0000000
--- a/logos/SPORT+.png
+++ /dev/null
diff --git a/logos/TCM.png b/logos/TCM.png
deleted file mode 100755
index 40bd7c0..0000000
--- a/logos/TCM.png
+++ /dev/null
diff --git a/logos/TELESSONNE.png b/logos/TELESSONNE.png
deleted file mode 100755
index d84b993..0000000
--- a/logos/TELESSONNE.png
+++ /dev/null
diff --git a/logos/TELETOON+1.png b/logos/TELETOON+1.png
deleted file mode 100755
index f6d1281..0000000
--- a/logos/TELETOON+1.png
+++ /dev/null
diff --git a/logos/TELETOON.png b/logos/TELETOON.png
deleted file mode 100755
index e431e3a..0000000
--- a/logos/TELETOON.png
+++ /dev/null
diff --git a/logos/TEVA.png b/logos/TEVA.png
deleted file mode 100755
index 0cd6796..0000000
--- a/logos/TEVA.png
+++ /dev/null
diff --git a/logos/TF1 HD.png b/logos/TF1 HD.png
deleted file mode 100755
index 6a35d2a..0000000
--- a/logos/TF1 HD.png
+++ /dev/null
diff --git a/logos/TF1.png b/logos/TF1.png
deleted file mode 100755
index 56b1a74..0000000
--- a/logos/TF1.png
+++ /dev/null
diff --git a/logos/TF6.png b/logos/TF6.png
deleted file mode 100755
index 1dfa6b7..0000000
--- a/logos/TF6.png
+++ /dev/null
diff --git a/logos/TFJ.png b/logos/TFJ.png
deleted file mode 100755
index 4dc5740..0000000
--- a/logos/TFJ.png
+++ /dev/null
diff --git a/logos/TIJI.png b/logos/TIJI.png
deleted file mode 100755
index 84ee4dc..0000000
--- a/logos/TIJI.png
+++ /dev/null
diff --git a/logos/TMC.png b/logos/TMC.png
deleted file mode 100755
index 8e958a3..0000000
--- a/logos/TMC.png
+++ /dev/null
diff --git a/logos/TPS STAR.png b/logos/TPS STAR.png
deleted file mode 100755
index afcf868..0000000
--- a/logos/TPS STAR.png
+++ /dev/null
diff --git a/logos/TRACE TV.png b/logos/TRACE TV.png
deleted file mode 100755
index 0bab9b2..0000000
--- a/logos/TRACE TV.png
+++ /dev/null
diff --git a/logos/TV BREIZH.png b/logos/TV BREIZH.png
deleted file mode 100755
index fcb86f5..0000000
--- a/logos/TV BREIZH.png
+++ /dev/null
diff --git a/logos/TV5.png b/logos/TV5.png
deleted file mode 100755
index a8dfa01..0000000
--- a/logos/TV5.png
+++ /dev/null
diff --git a/logos/VIRGIN 17.png b/logos/VIRGIN 17.png
deleted file mode 100755
index a0d4a6f..0000000
--- a/logos/VIRGIN 17.png
+++ /dev/null
diff --git a/logos/VOYAGE.png b/logos/VOYAGE.png
deleted file mode 100755
index d1c24fc..0000000
--- a/logos/VOYAGE.png
+++ /dev/null
diff --git a/logos/W9.png b/logos/W9.png
deleted file mode 100755
index 22a9be5..0000000
--- a/logos/W9.png
+++ /dev/null
diff --git a/logos/XXL.png b/logos/XXL.png
deleted file mode 100755
index c54797d..0000000
--- a/logos/XXL.png
+++ /dev/null
diff --git a/logos/ZDF.png b/logos/ZDF.png
deleted file mode 100755
index 2cf13c6..0000000
--- a/logos/ZDF.png
+++ /dev/null
diff --git a/logos/iConcertsHD_6Mbps.png b/logos/iConcertsHD_6Mbps.png
deleted file mode 100755
index d0d05cb..0000000
--- a/logos/iConcertsHD_6Mbps.png
+++ /dev/null