diff mbox

[ANNOUNCE] Patch for NordlichtsEPG_8a (DaLiMan)

Message ID 442D0F15.7020105@daliman.de
State New
Headers

Commit Message

vdr@daliman.de March 31, 2006, 11:14 a.m. UTC 
  Ich bin gebeten worden diesen Patch von "Cocky" einzusenden.
Dieser Patch zeigt die WarEagleIcons an und behebt einen Fehler in der 
Channelsdarstellung.
channels->Name() wird statt channels->ShortName(true) angezeigt, da 
dieser trotz des Namens
kürzer ist. Voraussetzung ist der WarEaglePatch oder der BiGPatch. Das 
ist nur eine
Zwischenlösung bis der Author seinen Fehler korrigiert hat.

(Sorry, but i´m my own translation bot and my english is terrible!)

I´m pleased to announce this patch from "Cocky". I dont know his real name.
This patch swows the wareagleicons and korrekt the channellist.
channels->Name() instead of channels->ShortName(true) is shown.
You need the WarEagle- or BigPatch.

Comments

Martin Prochnow March 31, 2006, 11:39 a.m. UTC | #1 
Hi,

Klaus also use cChannels.ShotName() in the schedule menu of VDR so I 
wonder why it should be a wrong to use it.

The plugin patches the font at run time. So there is no need for the 
WarEagle-Icon-patch. The patch you provide adds icons to mark a channel 
as tv or radio channel. I don't have in mind to add this informations.

So I don't see this two issues as mistakes.

Greets,
Martin
(the author of Nordlicht's EPG-Plugin ;-) )


vdr@daliman.de schrieb:

> Ich bin gebeten worden diesen Patch von "Cocky" einzusenden.
> Dieser Patch zeigt die WarEagleIcons an und behebt einen Fehler in der 
> Channelsdarstellung.
> channels->Name() wird statt channels->ShortName(true) angezeigt, da 
> dieser trotz des Namens
> kürzer ist. Voraussetzung ist der WarEaglePatch oder der BiGPatch. Das 
> ist nur eine
> Zwischenlösung bis der Author seinen Fehler korrigiert hat.
>
> (Sorry, but i´m my own translation bot and my english is terrible!)
>
> I´m pleased to announce this patch from "Cocky". I dont know his real 
> name.
> This patch swows the wareagleicons and korrekt the channellist.
> channels->Name() instead of channels->ShortName(true) is shown.
> You need the WarEagle- or BigPatch.
diff mbox

Patch

--- mywhatsonitem.c.org	2006-03-20 23:00:22.000000000 +0100
+++ mywhatsonitem.c	2006-03-31 12:43:59.000000000 +0200
@@ -3,6 +3,7 @@ 
  */
 
 #include <math.h>
+#include <vdr/iconpatch.h>
 #include "mywhatsonitem.h"
 
 myWhatsOnItem::myWhatsOnItem(const cEvent *Event,cChannel *Channel,bool Next)
@@ -33,6 +34,7 @@ 
   }
  }
 
+
  if(event)
  {
   // calculate progress bar
@@ -45,38 +47,54 @@ 
     progress=10;
 
   // assemble menu item text
-  if(enigmatheme)
-  {
-   for(i=1;i<progress-1;i++)ProgressBar[i]='|';
-   if(showchannelnumbers)
-    asprintf(&buffer,"%c\t%d\t%-10s \t%s\t %s",m,channel->Number(),channel->ShortName(true),(!(event->RunningStatus()==4)&&next)?*event->GetTimeString():ProgressBar,event->Title());
-   else
-    asprintf(&buffer,"%c\t%-10s \t%s\t %s",m,channel->ShortName(true),(!(event->RunningStatus()==4)&&next)?*event->GetTimeString():ProgressBar,event->Title());
+  // CockyPatch
+  if(enigmatheme) {
+    for(i=1;i<progress-1;i++)ProgressBar[i]='|';
+    if(showchannelnumbers)
+	asprintf(&buffer,"%c\t%d\t%-10s \t%s\t %s",m,channel->Number(),channel->Name(),(!(event->RunningStatus()==4)&&next)?*event->GetTimeString():ProgressBar,event->Title());
+    else
+	asprintf(&buffer,"%c\t%-10s \t%s\t %s",m,channel->Name(),(!(event->RunningStatus()==4)&&next)?*event->GetTimeString():ProgressBar,event->Title());
   }
   else
   {
-   for(i=0;i<progress;i++)ProgressBar[i]=127;
-   if(showchannelnumbers)
-    asprintf(&buffer,"%c\t%d\t%-10s\t %s\t%s",m,channel->Number(),channel->ShortName(true),(!(event->RunningStatus()==4)&&next)?*event->GetTimeString():ProgressBar,event->Title());
-   else
-    asprintf(&buffer,"%c\t%-10s\t %s\t%s",m,channel->ShortName(true),(!(event->RunningStatus()==4)&&next)?*event->GetTimeString():ProgressBar,event->Title());
-  }
- }
+    for(i=0;i<progress;i++)ProgressBar[i]=127;
+    if (channel->Vpid() != 0 ) {
+	if(showchannelnumbers)
+    	    asprintf(&buffer,"%c\t%d\t%c %-10s\t %s\t%s",m,channel->Number(),ICON_TV,channel->Name(),(!(event->RunningStatus()==4)&&next)?*event->GetTimeString():ProgressBar,event->Title());
+        else
+    	    asprintf(&buffer,"%c%c \t%-10s\t %s\t%s",m,ICON_TV,channel->Name(),(!(event->RunningStatus()==4)&&next)?*event->GetTimeString():ProgressBar,event->Title());
+    } 
+    else
+    {
+	if(showchannelnumbers) 
+    	    asprintf(&buffer,"%c\t%d\t%c %-10s\t %s\t%s",m,channel->Number(),ICON_RADIO,channel->Name(),next?*event->GetTimeString():ProgressBar,event->Title());
+	else
+	    asprintf(&buffer,"%c%c \t%-10s\t %s\t%s",m,ICON_RADIO,channel->Name(),(!(event->RunningStatus()==4)&&next)?*event->GetTimeString():ProgressBar,event->Title());
+    }
+}
+}
  else
  {
   if(enigmatheme)
   {
    if(showchannelnumbers)
-    asprintf(&buffer,"%c\t%d\t%-10s\t \t (%s)",m,channel->Number(),channel->ShortName(true),tr("no info"));
+    asprintf(&buffer,"%c\t%d\t%-10s\t \t (%s)",m,channel->Number(),channel->Name(),tr("no info"));
    else
-    asprintf(&buffer,"%c\t%-10s\t \t (%s)",m,channel->ShortName(true),tr("no info"));
+    asprintf(&buffer,"%c\t%-10s\t \t (%s)",m,channel->Name(),tr("no info"));
   }
   else
   {
+   if (channel->Vpid() != 0 ) {
    if(showchannelnumbers)
-    asprintf(&buffer,"%c\t%d\t%-10s\t \t(%s)",m,channel->Number(),channel->ShortName(true),tr("no info"));
+    asprintf(&buffer,"%c\t%d\t%c %-10s\t \t(%s)",m,channel->Number(),ICON_TV,channel->Name(),tr("no info"));
+   else
+    asprintf(&buffer,"%c\t%-10s\t \t(%s)",m,channel->Name(),tr("no info"));
+   } else {
+      if(showchannelnumbers)
+   	asprintf(&buffer,"%c\t%d\t%c %-10s\t \t(%s)",m,channel->Number(),ICON_RADIO,channel->Name(),tr("no info"));
    else
-    asprintf(&buffer,"%c\t%-10s\t \t(%s)",m,channel->ShortName(true),tr("no info"));
+    asprintf(&buffer,"%c\t%-10s\t \t(%s)",m,channel->Name(),tr("no info"));
+}
   }
  }