diff options
| author | Alib <aliboba@free.fr> | 2010-02-26 17:52:47 +0100 |
|---|---|---|
| committer | Alib <aliboba@free.fr> | 2010-02-26 17:52:47 +0100 |
| commit | 307dc9c35c0e2eb9481bb9fa9213773ab01f633b (patch) | |
| tree | 32fdc0a788e8173dd066e98601fbeac574edbbba | |
| parent | c717ff82b3d58a1dc43323b53f3e4a4c9bf8b4ec (diff) | |
| parent | c098143b66784a518de81bc3f639993ac1d6f3ec (diff) | |
| download | istreamdev-307dc9c35c0e2eb9481bb9fa9213773ab01f633b.tar.gz istreamdev-307dc9c35c0e2eb9481bb9fa9213773ab01f633b.tar.bz2 | |
Merge branch 'master' of projects.vdr-developer.org:istreamdev
| -rwxr-xr-x | includes/inc_files.php | 2 | ||||
| -rwxr-xr-x | includes/inc_stream.php | 12 | ||||
| -rwxr-xr-x | includes/inc_vdr.php | 5 |
3 files changed, 12 insertions, 7 deletions
diff --git a/includes/inc_files.php b/includes/inc_files.php index a13478c..a968dce 100755 --- a/includes/inc_files.php +++ b/includes/inc_files.php @@ -44,7 +44,7 @@ function mediagetinfostream($stream = "") if ($fileinfo['video']['resolution_y'] && $fileinfo['video']['resolution_x']) $resy = ($fileinfo['video']['resolution_y'] * 180) / $fileinfo['video']['resolution_x']; - exec("cp \"" .$file ."\" ram/stream-tb-tmp.jpg; " .$ffmpegpath ." -y -i ram/stream-tb-tmp.jpg -s 128x" .$resy ." ram/stream-tb.jpg"); + exec("cp \"" .$file ."\" ram/stream-tb-tmp.jpg; " .$ffmpegpath ." -y -i ram/stream-tb-tmp.jpg -s 180x" .$resy ." ram/stream-tb.jpg"); } else { diff --git a/includes/inc_stream.php b/includes/inc_stream.php index b98b132..d6297e0 100755 --- a/includes/inc_stream.php +++ b/includes/inc_stream.php @@ -25,12 +25,14 @@ if (infostreamexist()) switch ($type) { case 1: - $logopath = "logos/" .$realname .".png"; + $channoslash = preg_replace("$/$", " ", $realname); + $logopath = "logos/" .$channoslash .".png"; if (!file_exists($logopath)) $logopath = "logos/nologoTV.png"; break; case 2: - $logopath = "logos/" .$realname .".png"; + $channoslash = preg_replace("$/$", " ", $realname); + $logopath = "logos/" .$channslash .".png"; if (!file_exists($logopath)) $logopath = "logos/nologoREC.png"; break; @@ -129,12 +131,14 @@ else switch ($type) { case 1: - $logopath = "logos/" .$realname .".png"; + $channoslash = preg_replace("$/$", " ", $realname); + $logopath = "logos/" .$channoslash .".png"; if (!file_exists($logopath)) $logopath = "logos/nologoTV.png"; break; case 2: - $logopath = "logos/" .$realname .".png"; + $channoslash = preg_replace("$/$", " ", $realname); + $logopath = "logos/" .$channoslash .".png"; if (!file_exists($logopath)) $logopath = "logos/nologoREC.png"; break; diff --git a/includes/inc_vdr.php b/includes/inc_vdr.php index d8ebf93..ac6be1d 100755 --- a/includes/inc_vdr.php +++ b/includes/inc_vdr.php @@ -248,10 +248,11 @@ function vdrlistchannels($category = "NULL") print "<li class=\"withimage\">"; $chan2=addslashes($chan); print " <a class=\"noeffect\" href=\"javascript:sendForm('$chan2');\">\r\n"; - if (!file_exists('logos/'.$chan.'.png')) + $channoslash = preg_replace("$/$", " ", $chan); + if (!file_exists('logos/'.$channoslash.'.png')) print " <img src=\"logos/nologoTV.png\" />\r\n"; else - print " <img src=\"logos/{$chan}.png\" />\r\n"; + print " <img src=\"logos/{$channoslash}.png\" />\r\n"; print " <span class=\"name\">$chan</span>\r\n"; print " <span class=\"comment\">$epgtitle</span><span class=\"arrow\"></span></a>\r\n</li>\r\n"; print " <form name=\"$chan\" id=\"$chan\" method=\"post\" action=\"index.php\">"; |