From 3aeb4f5cb42acb961b6c128ec4cbf23f397ae2f8 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 16 Dec 2007 14:39:19 +0000
Subject: * MUSIC: remove proxy from playlist building, use proxy only to
 playing files * EPG: rename VPS to PDC, Programme Delivery Control

---
 skins/deltab/display.tmpl         |  4 ++--
 skins/deltab/global.js            | 11 ++++-------
 skins/deltab/mlist.tmpl           | 12 ++++++------
 skins/deltab/now.tmpl             |  4 ++--
 skins/deltab/program.tmpl         |  4 ++--
 skins/deltab/search.tmpl          |  4 ++--
 skins/deltab/tlist.tmpl           |  4 ++--
 skins/deltab/widgets/remote.tmpl  |  4 ++--
 skins/stone/display.tmpl          |  4 ++--
 skins/stone/global.js             | 12 ++++--------
 skins/stone/mlist.tmpl            | 12 ++++++------
 skins/stone/now.tmpl              |  4 ++--
 skins/stone/program.tmpl          |  4 ++--
 skins/stone/search.tmpl           |  4 ++--
 skins/stone/tlist.tmpl            |  6 +++---
 skins/stone/widgets/remote.tmpl   |  4 ++--
 skins/stone_flat/display.tmpl     |  4 ++--
 skins/stone_flat/global.js        | 12 ++++--------
 skins/stone_flat/mlist.tmpl       | 10 +++++-----
 skins/stone_flat/now.tmpl         |  4 ++--
 skins/stone_flat/program.tmpl     |  4 ++--
 skins/stone_flat/search.tmpl      |  4 ++--
 skins/stone_flat/tlist.tmpl       |  4 ++--
 skins/xstyle/display.tmpl         |  2 +-
 skins/xstyle/javascript/global.js |  7 ++-----
 skins/xstyle/mlist.tmpl           |  4 ++--
 skins/xstyle/tlist.tmpl           |  4 ++--
 skins/xstyle/widgets/remote.tmpl  |  4 ++--
 skins/xstyle/widgets/start.tmpl   |  4 ----
 29 files changed, 73 insertions(+), 91 deletions(-)

diff --git a/skins/deltab/display.tmpl b/skins/deltab/display.tmpl
index be62e9f..24c9075 100644
--- a/skins/deltab/display.tmpl
+++ b/skins/deltab/display.tmpl
@@ -16,7 +16,7 @@
   d = data.last.8;
   video = data.last.9;
   audio = data.last.10;
-  vps = data.last.11;
+  pdc = data.last.11;
 %?>
 <?% ######################################################################## %?>
 <div id="body">
@@ -54,7 +54,7 @@ END %?>
 	    <?% END %?>
 			        &nbsp;&nbsp;&nbsp;<?% date.format(start,"%A, %x",locale) %?>&nbsp;
               &nbsp;&nbsp;&nbsp;<?% date.format(start,"%H:%M",locale) %?>&nbsp;-&nbsp;<?% date.format(stopp,"%H:%M",locale) %?>
-              <?% IF vps && vps != start %?>&nbsp;(<?% gettext("VPS") %?>&nbsp;<?% date.format(vps,"%H:%M",locale) %?>) <?% END %?>
+              <?% IF pdc && pdc != start %?>&nbsp;(<?% gettext("PDC") %?>&nbsp;<?% date.format(pdc,"%H:%M",locale) %?>) <?% END %?>
 
               &nbsp;&nbsp;&nbsp;<?% PROCESS printduration %?>
 			        &nbsp;<?% PROCESS dur %?>
diff --git a/skins/deltab/global.js b/skins/deltab/global.js
index 66046fd..ddc707c 100644
--- a/skins/deltab/global.js
+++ b/skins/deltab/global.js
@@ -122,15 +122,12 @@ function reverse(form) {
     }
 }
 
-function PlayMusic(ids,proxy) {
-    var url = "";
-    if(proxy != "")
-        url = proxy;
-    url = url + '?cmd=mplaylist&data=' + ids + '&binary=1';
+function PlayMusic(ids) {
+    var url = '?cmd=mplaylist&data=' + ids;
     location.href = url;
 }
 
-function Play(warnmsg,form,proxy) {
+function Play(warnmsg,form) {
 // test on checked Boxes
     x = 0;
     ok = new Array;
@@ -143,7 +140,7 @@ function Play(warnmsg,form,proxy) {
         }
     }
     if(x > 0) {
-        PlayMusic(ok.join('_'),proxy);
+        PlayMusic(ok.join('_'));
     } else {
         alert(warnmsg);
     }
diff --git a/skins/deltab/mlist.tmpl b/skins/deltab/mlist.tmpl
index 22a99e3..c2a7686 100644
--- a/skins/deltab/mlist.tmpl
+++ b/skins/deltab/mlist.tmpl
@@ -53,15 +53,15 @@
          </td>
          <td style="white-space: nowrap">
           <?% IF allow('mgetfile') %?>
-            <a title="<?% gettext("Store selected song") %?>" href="?cmd=mgetfile&amp;data=<?% id %?>&amp;__binary=1">
+            <a title="<?% gettext("Store selected song") %?>" href="?cmd=mgetfile&amp;data=<?% id %?>">
                 <img src="images/file.<?% global.imagetyp %?>" alt="" title="<?% gettext("Store selected song") %?>" />
             </a>
           <?% END %?>
             <?% IF allow('mplay') %?>
-            <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>','<?% param.proxy %?>')">
+            <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>')">
               <img class="push" src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
             </a>
-            <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>','<?% param.proxy %?>')">
+            <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>')">
             <?% END %?>
             <?% playtime %?>
             <?% IF track != "" %?>&nbsp;(<?% track %?>)<?% END %?>
@@ -73,7 +73,7 @@
 <?% ######################################################################## %?>
 <?% BLOCK titleline %?>
   <a class="title" title="<?% gettext("Search") %?>" href="?cmd=ml&amp;data=album:<?% url(album) %?>">
-  <img class="cover" src="?cmd=mcoverimage&amp;data=<?% id %?>&amp;__binary=1" alt="<?% album %?>" />
+  <img class="cover" src="?cmd=mcoverimage&amp;data=<?% id %?>" alt="<?% album %?>" />
   </a>
 	<?% headlist = [];
 		smallist = [];
@@ -190,10 +190,10 @@
       <a href="javascript:selAll(document.mlist,0)"><?% gettext("Unselect all",20) %?></a><br />
       <a href="javascript:reverse(document.mlist)"><img src="images/invers.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
       <a href="javascript:reverse(document.mlist)"><?% gettext("Reverse select",20) %?></a><br />
-        <a href="javascript:Play('<?% gettext("Nothing selected!") %?>',document.mlist,'<?% param.proxy %?>')">
+        <a href="javascript:Play('<?% gettext("Nothing selected!") %?>',document.mlist)">
             <img src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
         </a>&nbsp;
-        <a href="javascript:Play('<?% gettext("Nothing selected!") %?>',document.mlist,'<?% param.proxy %?>')">
+        <a href="javascript:Play('<?% gettext("Nothing selected!") %?>',document.mlist)">
             <?% gettext("Play selected songs",20) %?>
         </a>
     </p>
diff --git a/skins/deltab/now.tmpl b/skins/deltab/now.tmpl
index 8dbcc6d..234996b 100644
--- a/skins/deltab/now.tmpl
+++ b/skins/deltab/now.tmpl
@@ -52,7 +52,7 @@
     </td>
     <td>
         <?% start %?>&nbsp;-&nbsp;<?% stop %?>
-        <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+        <?% IF pdc && pdc != start %?> (<?% gettext("PDC") %?>:<?% PDC %?>) <?% END %?>
     </td>
     <td class="push">
         <?% INCLUDE widgets/tooltip.inc cmd="display"  eventid=id linkid=id ttp_offset=-400 %?>
@@ -104,7 +104,7 @@
 <?% FOREACH zeile = data %?>
     <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
     <tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;description=zeile.8;duration=zeile.9;vps=zeile.10 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;description=zeile.8;duration=zeile.9;pdc=zeile.10 %?>
         <?% IF old.defined && group != old %?>
     </tr>
 </table>
diff --git a/skins/deltab/program.tmpl b/skins/deltab/program.tmpl
index 86489fc..711febf 100644
--- a/skins/deltab/program.tmpl
+++ b/skins/deltab/program.tmpl
@@ -38,7 +38,7 @@
     </td>
     <td>
         <?% start %?>&nbsp;-&nbsp;<?% stop %?>
-        <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+        <?% IF pdc && pdc != start %?> (<?% gettext("PDC") %?>:<?% pdc %?>) <?% END %?>
     </td>
     <td class="push">
         <?% INCLUDE widgets/tooltip.inc cmd="display"  eventid=id linkid=id ttp_offset=-400 %?>
@@ -78,7 +78,7 @@
 
 	<?% FOREACH zeile = data %?>
     <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;description=zeile.6;video=zeile.7;audio=zeile.8;vps=zeile.9 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;description=zeile.6;video=zeile.7;audio=zeile.8;pdc=zeile.9 %?>
         <?% day = date.format(zeile.5, "%A, %x", locale) %?>
 		<?% IF old.defined && day != old %?>
   		<tr>
diff --git a/skins/deltab/search.tmpl b/skins/deltab/search.tmpl
index dad6d81..78e5761 100644
--- a/skins/deltab/search.tmpl
+++ b/skins/deltab/search.tmpl
@@ -43,7 +43,7 @@
     </td>
     <td>
         <?% start %?>&nbsp;-&nbsp;<?% stop %?>
-        <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+        <?% IF pdc && pdc != start %?> (<?% gettext("PDC") %?>:<?% pdc %?>) <?% END %?>
     </td>
     <td class="push">
         <?% INCLUDE widgets/tooltip.inc cmd="display" eventid=id linkid=id ttp_offset=-400 %?>
@@ -76,7 +76,7 @@
     </tr>
 	<?% FOREACH zeile = data %?>
      <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;vps=zeile.9 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;pdc=zeile.9 %?>
         <?% day = date.format(zeile.7, "%A, %x", locale) %?>
 		<?% IF old.defined && day != old %?>
    		  <tr>
diff --git a/skins/deltab/tlist.tmpl b/skins/deltab/tlist.tmpl
index a59aaaf..22443b0 100644
--- a/skins/deltab/tlist.tmpl
+++ b/skins/deltab/tlist.tmpl
@@ -97,7 +97,7 @@
     </td>
     <td<?% IF state != "" %?> class="<?% state %?>"<?% END %?>>
         <?% start %?>-<?% stop %?>
-        <?% vps ? '&nbsp;(VPS)' : '' %?>
+        <?% IF pdc;'&nbsp;(';gettext("PDC");')';END %?>
     </td>
     <td class="push<?% IF state != "";" ";state;END %?>">
         <?% INCLUDE widgets/tooltip.inc cmd="display" linkid=eventid ttp_offset=-400 %?>
@@ -158,7 +158,7 @@
           duration=zeile.13;
           description=zeile.14;
           t = zeile.7.split('&#x7e;');IF t.size > 1;subtitle = t.pop;ELSE;subtitle="";END;title=t.join('&#x7e;');
-          vps= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
+          pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
 	    	  day = date.format(zeile.9, "%A, %x", locale) %?>
 		<?% IF old.defined && day != old %?>
   		<tr>
diff --git a/skins/deltab/widgets/remote.tmpl b/skins/deltab/widgets/remote.tmpl
index f9e7f8c..2ea9d22 100644
--- a/skins/deltab/widgets/remote.tmpl
+++ b/skins/deltab/widgets/remote.tmpl
@@ -25,7 +25,7 @@ function remote(key) {
 function grab() {
     if(document.remoteform.grabinterval.value > 0) {
         Now = new Date();
-    	document.livepicture.src = '?cmd=gdisplay&binary=1&laber=' + Now.getTime();
+    	document.livepicture.src = '?cmd=gdisplay&random=' + Now.getTime();
     }
     last = Date.UTC();
 }
@@ -237,7 +237,7 @@ aktiv = window.setInterval("grab()", inter);
             <table summary="">
                 <tr>
                     <td valign="middle" align="center">
-                        <img alt="<?% date.now %?>" src="?cmd=gdisplay&amp;binary=1&amp;laber=<?% date.now %?>" width="<?% width %?>" height="<?% height %?>" name="livepicture" />
+                        <img alt="<?% date.now %?>" src="?cmd=gdisplay&amp;random=<?% date.now %?>" width="<?% width %?>" height="<?% height %?>" name="livepicture" />
                     </td>
                 </tr>
             </table>
diff --git a/skins/stone/display.tmpl b/skins/stone/display.tmpl
index 2668d79..7f42d39 100644
--- a/skins/stone/display.tmpl
+++ b/skins/stone/display.tmpl
@@ -20,7 +20,7 @@
   d = data.last.8;
   video = data.last.9;
   audio = data.last.10;
-  vps = data.last.11;
+  pdc = data.last.11;
 %?>
 <?% ######################################################################## %?>
 <?% BLOCK dur %?>
@@ -101,7 +101,7 @@ END %?>
 			          <?% date.format(start,"%A, %x",locale) %?>
                 <br />
                 <?% date.format(start,"%H:%M",locale) %?>&nbsp;-&nbsp;<?% date.format(stopp,"%H:%M",locale) %?>
-                <?% IF vps && vps != start %?>&nbsp;&nbsp;&nbsp;(<?% gettext("VPS") %?>&nbsp;<?% date.format(vps,"%H:%M",locale) %?>) <?% END %?>
+                <?% IF pdc && pdc != start %?>&nbsp;&nbsp;&nbsp;(<?% gettext("PDC") %?>&nbsp;<?% date.format(pdc,"%H:%M",locale) %?>) <?% END %?>
                 &nbsp;&nbsp;&nbsp;<?% PROCESS printduration %?>
 
             </div>
diff --git a/skins/stone/global.js b/skins/stone/global.js
index fecb217..a843a69 100644
--- a/skins/stone/global.js
+++ b/skins/stone/global.js
@@ -245,16 +245,12 @@ function selfield(id,checkbox)
   }
 }
 
-function PlayMusic(ids,proxy) {
-    /*popupwindow('?cmd=mplay&data=' + ids,620,670,0);*/
-    var url = "";
-    if(proxy != "")
-        url = proxy;
-    url = url + '?cmd=mplaylist&data=' + ids + '&binary=1';
+function PlayMusic(ids) {
+    var url = '?cmd=mplaylist&data=' + ids;
     location.href = url;
 }
 
-function Play(warnmsg,form,proxy) {
+function Play(warnmsg,form) {
 // test on checked Boxes
     x = 0;
     ok = new Array;
@@ -267,7 +263,7 @@ function Play(warnmsg,form,proxy) {
         }
     }
     if(x > 0) {
-        PlayMusic(ok.join('_'),proxy);
+        PlayMusic(ok.join('_'));
     } else {
         alert(warnmsg);
     }
diff --git a/skins/stone/mlist.tmpl b/skins/stone/mlist.tmpl
index 18227c7..a2fa6c3 100644
--- a/skins/stone/mlist.tmpl
+++ b/skins/stone/mlist.tmpl
@@ -60,7 +60,7 @@
                         <font class="description">
                             <?% IF allow('mplay') %?>
                             <input class="push" type="checkbox" value="<?% id %?>" />
-                                <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>','<?% param.proxy %?>')">
+                                <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>')">
                             <?% END %?>
                                     <?% playtime %?>
                                     <?% IF track != "" %?>&nbsp;(<?% track %?>)<?% END %?>
@@ -71,12 +71,12 @@
                     </td>
                     <td class="push">
     <?% IF allow('mgetfile') %?>
-                        <a title="<?% gettext("Store selected song") %?>" href="?cmd=mgetfile&amp;data=<?% id %?>&amp;__binary=1">
+                        <a title="<?% gettext("Store selected song") %?>" href="?cmd=mgetfile&amp;data=<?% id %?>">
                             <img src="images/file.<?% global.imagetyp %?>" alt="" title="<?% gettext("Store selected song") %?>" />
                         </a>
     <?% END %?>
     <?% IF allow('mplay') %?>
-                        <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>','<?% param.proxy %?>')">
+                        <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>')">
                             <img src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
                         </a>
     <?% END %?>
@@ -132,7 +132,7 @@
           <tr>
             <td class="fieldtext" align="center">
                 <a title="<?% gettext("Search") %?>" href="?cmd=ml&amp;data=album:<?% url(album) %?>">
-                    <img class="cover" src="?cmd=mcoverimage&amp;data=<?% id %?>&amp;__binary=1" alt="<?% album %?>" />
+                    <img class="cover" src="?cmd=mcoverimage&amp;data=<?% id %?>" alt="<?% album %?>" />
                 </a>
             </td>
           </tr>
@@ -235,10 +235,10 @@
         <a href="javascript:selAll(document.mlist,0)"><?% gettext("Unselect all",20) %?></a><br />
         <a href="javascript:reverse(document.mlist)"><img src="images/invers.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
         <a href="javascript:reverse(document.mlist)"><?% gettext("Reverse select",20) %?></a><br />
-        <a href="javascript:Play('<?% gettext("Nothing selected!") %?>',document.mlist,'<?% param.proxy %?>')">
+        <a href="javascript:Play('<?% gettext("Nothing selected!") %?>',document.mlist)">
             <img src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
         </a>&nbsp;
-        <a href="javascript:Play('<?% gettext("Nothing selected!") %?>',document.mlist,'<?% param.proxy %?>')">
+        <a href="javascript:Play('<?% gettext("Nothing selected!") %?>',document.mlist)">
             <?% gettext("Play selected songs",20)  %?>
         </a>
     </td>
diff --git a/skins/stone/now.tmpl b/skins/stone/now.tmpl
index f96b6d2..15b8bff 100644
--- a/skins/stone/now.tmpl
+++ b/skins/stone/now.tmpl
@@ -82,7 +82,7 @@
                 <tr>
                     <td class="fieldinline description<?% IF state != "";" ";state;END %?>" style="white-space: nowrap">
                         <?% start %?>&nbsp;-&nbsp;<?% stop %?>
-                        <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+                        <?% IF pdc && pdc != start %?> (<?% gettext("PDC") %?>:<?% pdc %?>) <?% END %?>
                         <br />
                         <?% PROCESS dur d=duration %?>
                     </td>
@@ -126,7 +126,7 @@
 <?% fields = data.shift %?>
     <?% FOREACH zeile = data %?>
         <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;description=zeile.8;duration=zeile.9;vps=zeile.10 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;description=zeile.8;duration=zeile.9;pdc=zeile.10 %?>
         <?% IF old.defined && group != old %?>
 <div class="areaclose"></div>
 <h2><?% group %?></h2>
diff --git a/skins/stone/program.tmpl b/skins/stone/program.tmpl
index d8f7881..f06a6fc 100644
--- a/skins/stone/program.tmpl
+++ b/skins/stone/program.tmpl
@@ -75,7 +75,7 @@
                     <td class="fieldinline" style="white-space: nowrap">
                         <font class="description<?% IF state != "";" ";state;END %?>">
                         <?% start %?>&nbsp;-&nbsp;<?% stop %?>
-                        <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+                        <?% IF pdc && pdc != start %?> (<?% gettext("PDC") %?>:<?% pdc %?>) <?% END %?>
                         <br />
                         </font>
                     </td>
@@ -119,7 +119,7 @@
 <h1><?% gettext("Program guide for") %?>&nbsp;<?% channel %?> - <?% date.format(data.first.5, "%A, %x", locale) %?></h1>
     <?% FOREACH zeile = data %?>
         <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;description=zeile.6;video=zeile.7;audio=zeile.8;vps=zeile.9 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;description=zeile.6;video=zeile.7;audio=zeile.8;pdc=zeile.9 %?>
         <?% day = date.format(zeile.5, "%A, %x", locale) %?>
         <?% IF old.defined && day != old %?>
 <div class="areaclose"></div>
diff --git a/skins/stone/search.tmpl b/skins/stone/search.tmpl
index 148f1c9..698b061 100644
--- a/skins/stone/search.tmpl
+++ b/skins/stone/search.tmpl
@@ -66,7 +66,7 @@
                     <td class="fieldinline" style="white-space: nowrap">
                        <font class="description<?% IF state != "";" ";state;END %?>">
                        <?% start %?>&nbsp;-&nbsp;<?% stop %?>
-                       <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+                       <?% IF pdc && pdc != start %?> (<?% gettext("PDC") %?>:<?% pdc %?>) <?% END %?>
                        </font>
                     </td>
                     <td class="fieldinline push">
@@ -91,7 +91,7 @@
 <h1><?% gettext("Search text") %?> : <?% cgi.param('data') %?> - <?% date.format(data.first.7, "%A, %x", locale) %?></h1>
     <?% FOREACH zeile = data %?>
         <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;vps=zeile.9 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;pdc=zeile.9 %?>
         <?% day = date.format(zeile.7, "%A, %x", locale) %?>
         <?% IF old.defined && day != old %?>
 <div class="areaclose"></div>
diff --git a/skins/stone/tlist.tmpl b/skins/stone/tlist.tmpl
index 780f516..da220a7 100644
--- a/skins/stone/tlist.tmpl
+++ b/skins/stone/tlist.tmpl
@@ -21,7 +21,7 @@
     min  = total div 60 mod 60;
     hour = total div 3600;
 %?>
-<?% IF hour > 0 %?><?% hour FILTER format('%02d') %?>:<?% END %?><?% min FILTER format('%02d') %?>
+<?% IF hour >= 0 %?><?% hour FILTER format('%02d') %?>:<?% END %?><?% min FILTER format('%02d') %?>
 <?% END %?>
 </p>
 <?% END %?>
@@ -136,7 +136,7 @@
                     <td>
                       <font class="fieldinline<?% IF state != "";" ";state;END %?>">
                       <?% start %?>-<?% stop %?>
-                      <?% "&nbsp;(V)" IF vps %?>
+<!--                  <?% IF pdc;"(";gettext("PDC");")";END %?> -->
                       </font>
                     </td>
                     <td class="push">
@@ -177,7 +177,7 @@
           duration=zeile.13;
           description=zeile.14;
           t = zeile.7.split('&#x7e;');IF t.size > 1;subtitle = t.pop;ELSE;subtitle="";END;title=t.join('&#x7e;');
-          vps= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
+          pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
 	    	  day = date.format(zeile.9, "%A, %x", locale) %?>
 			<?% IF old.defined && day != old %?>
           <div class="areaclose"></div>
diff --git a/skins/stone/widgets/remote.tmpl b/skins/stone/widgets/remote.tmpl
index 271ba40..ab164fe 100644
--- a/skins/stone/widgets/remote.tmpl
+++ b/skins/stone/widgets/remote.tmpl
@@ -27,7 +27,7 @@ function remote(key) {
 function grab() {
     if(document.remoteform.grabinterval.value > 0) {
         Now = new Date();
-    	document.livepicture.src = '?cmd=gdisplay&binary=1&laber=' + Now.getTime();
+    	document.livepicture.src = '?cmd=gdisplay&random=' + Now.getTime();
     }
     last = Date.UTC();
 }
@@ -57,7 +57,7 @@ aktiv = window.setInterval("grab()", inter);
             <table class="areainline" summary="">
                 <tr>
                     <td class="areainline" valign="middle" align="center">
-                        <img alt="<?% date.now %?>" src="?cmd=gdisplay&amp;binary=1&amp;laber=<?% date.now %?>" width="<?% width %?>" height="<?% height %?>" name="livepicture" />
+                        <img alt="<?% date.now %?>" src="?cmd=gdisplay&amp;random=<?% date.now %?>" width="<?% width %?>" height="<?% height %?>" name="livepicture" />
                     </td>
                 </tr>
             </table>
diff --git a/skins/stone_flat/display.tmpl b/skins/stone_flat/display.tmpl
index 506601b..7d0a0c4 100644
--- a/skins/stone_flat/display.tmpl
+++ b/skins/stone_flat/display.tmpl
@@ -20,7 +20,7 @@
   d = data.last.8;
   video = data.last.9;
   audio = data.last.10;
-  vps = data.last.11;
+  pdc = data.last.11;
 %?>
 <?% ######################################################################## %?>
 <?% BLOCK dur %?>
@@ -100,7 +100,7 @@ END %?>
 			          <?% date.format(start,"%A, %x",locale) %?>
                 <br />
                 <?% date.format(start,"%H:%M",locale) %?>&nbsp;-&nbsp;<?% date.format(stopp,"%H:%M",locale) %?>
-                <?% IF vps && vps != start %?>&nbsp;&nbsp;&nbsp;(<?% gettext("VPS") %?>&nbsp;<?% date.format(vps,"%H:%M",locale) %?>) <?% END %?>
+                <?% IF pdc && pdc != start %?>&nbsp;&nbsp;&nbsp;(<?% gettext("PDC") %?>&nbsp;<?% date.format(pdc,"%H:%M",locale) %?>) <?% END %?>
                 &nbsp;&nbsp;&nbsp;<?% PROCESS printduration %?>
             </div>
 			    </td>
diff --git a/skins/stone_flat/global.js b/skins/stone_flat/global.js
index ad297e9..cc96429 100644
--- a/skins/stone_flat/global.js
+++ b/skins/stone_flat/global.js
@@ -250,16 +250,12 @@ function selfield(id,checkbox)
   }
 }
 
-function PlayMusic(ids,proxy) {
-    /*popupwindow('?cmd=mplay&data=' + ids,620,670,0);*/
-    var url = "";
-    if(proxy != "")
-        url = proxy;
-    url = url + '?cmd=mplaylist&data=' + ids + '&binary=1';
+function PlayMusic(ids) {
+    var url = '?cmd=mplaylist&data=' + ids;
     location.href = url;
 }
 
-function Play(warnmsg,form,proxy) {
+function Play(warnmsg,form) {
 // test on checked Boxes
     x = 0;
     ok = new Array;
@@ -272,7 +268,7 @@ function Play(warnmsg,form,proxy) {
         }
     }
     if(x > 0) {
-        PlayMusic(ok.join('_'),proxy);
+        PlayMusic(ok.join('_'));
     } else {
         alert(warnmsg);
     }
diff --git a/skins/stone_flat/mlist.tmpl b/skins/stone_flat/mlist.tmpl
index 3fc0495..b2cdeff 100644
--- a/skins/stone_flat/mlist.tmpl
+++ b/skins/stone_flat/mlist.tmpl
@@ -50,12 +50,12 @@
             <?% playtime %?>
             <?% IF track != "" %?>&nbsp;(<?% track %?>)<?% END %?>
     <?% IF allow('mgetfile') %?>
-            <a title="<?% gettext("Store selected song") %?>" href="?cmd=mgetfile&amp;data=<?% id %?>&amp;__binary=1">
+            <a title="<?% gettext("Store selected song") %?>" href="?cmd=mgetfile&amp;data=<?% id %?>">
                 <img src="images/file.<?% global.imagetyp %?>" alt="" title="<?% gettext("Store selected song") %?>" />
             </a>
     <?% END %?>
     <?% IF allow('mplay') %?>
-            <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>','<?% param.proxy %?>')">
+            <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>')">
               <img src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
             </a>
     <?% END %?>
@@ -114,7 +114,7 @@
             <tr>
             <td align="right" colspan="3">
                 <a class="title" title="<?% gettext("Search") %?>" href="?cmd=ml&amp;data=album:<?% url(album) %?>">
-                   <img class="cover" src="?cmd=mcoverimage&amp;data=<?% id %?>&amp;__binary=1" alt="<?% album %?>" />
+                   <img class="cover" src="?cmd=mcoverimage&amp;data=<?% id %?>" alt="<?% album %?>" />
                 </a>
             </td>
             </tr>
@@ -201,10 +201,10 @@
         <a href="javascript:selAll(document.mlist,0)"><?% gettext("Unselect all",20) %?></a><br />
         <a href="javascript:reverse(document.mlist)"><img src="images/invers.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
         <a href="javascript:reverse(document.mlist)"><?% gettext("Reverse select",20) %?></a><br />
-        <a href="javascript:Play('<?% gettext("Nothing selected!") %?>',document.mlist,'<?% param.proxy %?>')">
+        <a href="javascript:Play('<?% gettext("Nothing selected!") %?>',document.mlist)">
             <img src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
         </a>&nbsp;
-        <a href="javascript:Play('<?% gettext("Nothing selected!") %?>',document.mlist,'<?% param.proxy %?>')">
+        <a href="javascript:Play('<?% gettext("Nothing selected!") %?>',document.mlist)">
             <?% gettext("Play selected songs",20)  %?>
         </a>
     </td>
diff --git a/skins/stone_flat/now.tmpl b/skins/stone_flat/now.tmpl
index d6a8a19..a8c27be 100644
--- a/skins/stone_flat/now.tmpl
+++ b/skins/stone_flat/now.tmpl
@@ -60,7 +60,7 @@
 				  </a>
             </td>
             <td class="fieldinline<?% IF state != "";" ";state;END %?>" style="text-align:right">
-            <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+            <?% IF pdc && pdc != start %?> (<?% gettext("PDC") %?>:<?% pdc %?>) <?% END %?>
             <?% start %?>&nbsp;-&nbsp;<?% stop %?>
             </td>
             <td class="fieldinline" style="white-space: nowrap"><?% PROCESS dur d=duration %?></td>
@@ -121,7 +121,7 @@
                         <tr><th width="150"></th><th></th><th width="140"></th><th width="110"></th><th width="40"></th></tr>
     <?% FOREACH zeile = data %?>
         <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;description=zeile.8;duration=zeile.9;vps=zeile.10 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;description=zeile.8;duration=zeile.9;pdc=zeile.10 %?>
         <?% IF old.defined && group != old %?>
                         </table>
                         </td>
diff --git a/skins/stone_flat/program.tmpl b/skins/stone_flat/program.tmpl
index c602efd..a6c26ed 100644
--- a/skins/stone_flat/program.tmpl
+++ b/skins/stone_flat/program.tmpl
@@ -45,7 +45,7 @@
       <?% PROCESS SetState %?>
         <tr<?% ' class="two"' IF z mod 2 == 0 %?>>
             <td class="fieldinline<?% IF state != "";" ";state;END %?>"><?% start %?>&nbsp;-&nbsp;<?% stop %?>
-            <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+            <?% IF pdc && pdc != start %?> (<?% gettext("PDC") %?>:<?% pdc %?>) <?% END %?>
             </td>
             <td class="fieldinline">
                   <a id="E<?% id %?>" href="javascript:popup('display','<?% id %?>',620,670,0)" class="fieldinline">
@@ -94,7 +94,7 @@
     <?% z = 0 %?>
     <?% FOREACH zeile = data %?>
         <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;description=zeile.6;video=zeile.7;audio=zeile.8;vps=zeile.9 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;description=zeile.6;video=zeile.7;audio=zeile.8;pdc=zeile.9 %?>
         <?% day = date.format(zeile.5, "%A, %x", locale) %?>
         <?% IF !old.defined || day != old %?>
             <?% IF old.defined  %?>
diff --git a/skins/stone_flat/search.tmpl b/skins/stone_flat/search.tmpl
index a7cb928..6d8685f 100644
--- a/skins/stone_flat/search.tmpl
+++ b/skins/stone_flat/search.tmpl
@@ -46,7 +46,7 @@
 				  </a>
             </td>
             <td class="fieldinline<?% IF state != "";" ";state;END %?>" style="white-space: nowrap; text-align: right;">                        
-            <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+            <?% IF pdc && pdc != start %?> (<?% gettext("PDC") %?>:<?% pdc %?>) <?% END %?>
             <?% start %?>&nbsp;-&nbsp;<?% stop %?>
             </td>
             <td class="fieldinline push">
@@ -71,7 +71,7 @@
 <?% fields = data.shift %?>
     <?% FOREACH zeile = data %?>
         <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
-        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;vps=zeile.9 %?>
+        <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;pdc=zeile.9 %?>
         <?% day = date.format(zeile.7, "%A, %x", locale) %?>
         <?% IF !old.defined || day != old %?>
             <?% IF old.defined  %?>
diff --git a/skins/stone_flat/tlist.tmpl b/skins/stone_flat/tlist.tmpl
index 359993f..5201246 100644
--- a/skins/stone_flat/tlist.tmpl
+++ b/skins/stone_flat/tlist.tmpl
@@ -107,7 +107,7 @@
 	             <?% END %?>
                  <font class="description<?% IF state != "";" ";state;END %?>">
                  <?% start %?>-<?% stop %?>
-                 <?% "(VPS)" IF vps %?>
+                 <?% IF pdc;"(";gettext("PDC");")";END %?>
                  </font>
             </td>
             <td class="fieldinline">
@@ -159,7 +159,7 @@
           duration=zeile.13;
           description=zeile.14;
           t = zeile.7.split('&#x7e;');IF t.size > 1;subtitle = t.pop;ELSE;subtitle="";END;title=t.join('&#x7e;');
-          vps= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
+          pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
 	    	  day = date.format(zeile.9, "%A, %x", locale) %?>
         <?% IF !old.defined || day != old %?>
             <?% IF old.defined  %?>
diff --git a/skins/xstyle/display.tmpl b/skins/xstyle/display.tmpl
index 7299457..fe915a8 100644
--- a/skins/xstyle/display.tmpl
+++ b/skins/xstyle/display.tmpl
@@ -71,7 +71,7 @@
             <td>
 			          <?% date.format(data.first.$c,"%A, %x",locale) %?>&nbsp;
                 <?% date.format(data.first.$c,"%H:%M",locale) %?>
-                <?% IF data.first.11 && data.first.11 != data.first.$c %?>&nbsp;(<?% gettext("VPS") %?>&nbsp;<?% date.format(data.first.11,"%H:%M",locale) %?>) <?% END %?>
+                <?% IF data.first.11 && data.first.11 != data.first.$c %?>&nbsp;(<?% gettext("PDC") %?>&nbsp;<?% date.format(data.first.11,"%H:%M",locale) %?>) <?% END %?>
             </td>
         <?% ELSIF field == gettext('Stop') %?>
             <td>
diff --git a/skins/xstyle/javascript/global.js b/skins/xstyle/javascript/global.js
index 73a8f42..9d69317 100644
--- a/skins/xstyle/javascript/global.js
+++ b/skins/xstyle/javascript/global.js
@@ -113,7 +113,7 @@ function reverse(form) {
     }
 }
 
-function Play(warnmsg,form,proxy) {
+function Play(warnmsg,form) {
 // test on checked Boxes
     ok = new Array;
     x = 0;
@@ -126,10 +126,7 @@ function Play(warnmsg,form,proxy) {
         }
     }
     if(x > 0) {
-          var url = "";
-          if(proxy != 0)
-            url = proxy;
-          url = url + '?cmd=mplaylist&data=' + ok.join('_') + '&binary=1';
+          var url = '?cmd=mplaylist&data=' + ok.join('_');
           location.href = url;
     } else {
         alert(warnmsg);
diff --git a/skins/xstyle/mlist.tmpl b/skins/xstyle/mlist.tmpl
index ae58760..0644052 100644
--- a/skins/xstyle/mlist.tmpl
+++ b/skins/xstyle/mlist.tmpl
@@ -52,7 +52,7 @@
 
 <div id="navcontainer">
 <ul id="navlist">
-    <li><a href="#" onClick="Play('<?% gettext("Nothing selected!") %?>',document.musicform,'<?% param.proxy %?>')">
+    <li><a href="#" onClick="Play('<?% gettext("Nothing selected!") %?>',document.musicform)">
     <?% gettext("Play selected songs") %?>
     </a></li>
     <li><a href="?cmd=mrefresh"><?% gettext("Update Music Database") %?></a></li>
@@ -74,7 +74,7 @@
         <?% IF !oldalbum.defined || zeile.2 != oldalbum %?>
         <tr>
         <td colspan=<?% zeile.size %?>>
-            <img class="cover" src="?cmd=mcoverimage&amp;data=<?% zeile.0 %?>&amp;__binary=1" alt="<?% zeile.2 %?>" align="right" />&nbsp;
+            <img class="cover" src="?cmd=mcoverimage&amp;data=<?% zeile.0 %?>" alt="<?% zeile.2 %?>" align="right" />&nbsp;
             <?% albummark = "Album"+loop.count %?>
             <h1>Album: <?% zeile.2 %?>&nbsp;<font size=2><a href="#" onClick="selSwitch(document.musicform, '<?% albummark %?>')">[<?% gettext("Selection") %?> album]</a></font></h1>
             <h3>
diff --git a/skins/xstyle/tlist.tmpl b/skins/xstyle/tlist.tmpl
index 52aa0b5..c2e499b 100644
--- a/skins/xstyle/tlist.tmpl
+++ b/skins/xstyle/tlist.tmpl
@@ -45,7 +45,7 @@
         </tr>
         <?% FOREACH zeile = data %?>
             <?% aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 );
-                vps= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
+                pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 );
                 day = date.format(zeile.9, "%A, %x", locale);
                 IF aktiv; rest = rest - zeile.13; END;
             %?>
@@ -96,7 +96,7 @@
     <?% END %?>
 <!--
     <?% INCLUDE 'bloecke/stars.tmpl' eventid=zeile.11 umbruch='<br/>' %?>
-    <?% IF vps %?>
+    <?% IF pdc %?>
                             <img src='images/vps.png' /><br/>
     <?% END %?>
     <?% IF rest <= 0 %?>
diff --git a/skins/xstyle/widgets/remote.tmpl b/skins/xstyle/widgets/remote.tmpl
index a9e7cee..4acb00f 100644
--- a/skins/xstyle/widgets/remote.tmpl
+++ b/skins/xstyle/widgets/remote.tmpl
@@ -28,7 +28,7 @@ function switch_channel(url) {
 function grab() {
     if(document.remoteform.grabinterval.value > 0) {
         Now = new Date();
-    	document.livepicture.src = '?cmd=gdisplay&binary=1&laber=' + Now.getTime();
+    	document.livepicture.src = '?cmd=gdisplay&random=' + Now.getTime();
     }
     last = Date.UTC();
 }
@@ -58,7 +58,7 @@ aktiv = window.setInterval("grab()", inter);
 <tr>
 <?% IF monitor %?>
   <td rowspan="12">
-    <img src="?cmd=gdisplay&binary=1&laber=<?% date.now %?>" width="<?% param.width %?>" height="<?% param.height %?>" name="livepicture">
+    <img src="?cmd=gdisplay&random=<?% date.now %?>" width="<?% param.width %?>" height="<?% param.height %?>" name="livepicture">
   </td>
 <?% END %?>
   <td colspan="2" align="left"><nobr><input type="button" onclick="self.location.href='?cmd=r&monitor=<?% monitor ? 0 : 1 %?>'" name="monitor" value="<?% gettext("Monitor") %?>"></td>
diff --git a/skins/xstyle/widgets/start.tmpl b/skins/xstyle/widgets/start.tmpl
index 8f2b07b..62b407f 100644
--- a/skins/xstyle/widgets/start.tmpl
+++ b/skins/xstyle/widgets/start.tmpl
@@ -23,10 +23,6 @@
     <script type="text/javascript" src="javascript/tooltip.js"></script>
 </head>
 <body>
-<script language="javascript" type="text/javascript">
-    var proxy = '<?% proxy %?>';
-</SCRIPT>
-
 
 <?% INCLUDE 'skin.cfg' %?>
 <?% INCLUDE 'help.tmpl' %?>
-- 
cgit v1.2.3