added setup option to use the new filename for epg images (ChannelID_EventID)

5 files changed, 15 insertions, 5 deletions

diff --git a/config.c b/config.c
index ef1ff81..239bf5b 100644
--- a/config.c
+++ b/config.c
@@ -22,6 +22,7 @@ cSkinPearlHDConfig::cSkinPearlHDConfig(void)
    RecTitleInfo = 0;
    *EpgImagesDir = NULL;
    EpgDirSet = false;
+   EpgNewFilename = 1;
 }
 
 cSkinPearlHDConfig::~cSkinPearlHDConfig()
@@ -47,6 +48,7 @@ bool cSkinPearlHDConfig::SetupParse(const char *Name, const char *Value)
    else if (strcmp(Name, "ChannelInfoPadding") == 0)           ChannelInfoPadding = atoi(Value);
    else if (strcmp(Name, "RecTitleInfoHead") == 0)             RecTitleInfoHead = atoi(Value);
    else if (strcmp(Name, "RecTitleInfo") == 0)                 RecTitleInfo = atoi(Value);
+   else if (strcmp(Name, "EpgNewFilename") == 0)               EpgNewFilename = atoi(Value);
    else return false;
    return true;
 }
diff --git a/config.h b/config.h
index ebbddc0..e9f631f 100644
--- a/config.h
+++ b/config.h
@@ -33,6 +33,7 @@ public:
    int RecTitleInfo;
    char EpgImagesDir[100];
    bool EpgDirSet;
+   int EpgNewFilename;
 };
 
 extern cSkinPearlHDConfig PearlHDConfig;
diff --git a/pearlhd.c b/pearlhd.c
index 117df58..1b5e7e3 100644
--- a/pearlhd.c
+++ b/pearlhd.c
@@ -1094,7 +1094,7 @@ void cSkinPearlHDDisplayMenu::SetEvent(const cEvent *Event)
   
   osd->DrawRectangle(x1Menu, y1Menu+117, x2Menu-360, y2Menu, Theme.Color(clrMainLight));
   osd->DrawRectangle(x2Menu-360, y1Menu+117, x2Menu-1, y2Menu, Theme.Color(clrMainSolid));
-  
+
   if(PearlHDConfig.DisplayEpgImages)
   {
     char logoFormat[4];
@@ -1115,9 +1115,12 @@ void cSkinPearlHDDisplayMenu::SetEvent(const cEvent *Event)
       epgPath << PearlHDConfig.EpgImagesDir;
 	else
 	{
-      epgPath << "/var/cache/vdr/epgimages";
+	  epgPath << "/var/cache/vdr/epgimages";
 	}
-	epgPath << "/" << Event->EventID() << "." << logoFormat;
+	epgPath << "/";
+	if (PearlHDConfig.EpgNewFilename)
+	  epgPath << *Event->ChannelID().ToString() << "_";
+	epgPath << Event->EventID() << "." << logoFormat;
 
 	#if VDRVERSNUM > 10716
 	if (bpp > 8)
diff --git a/po/de_DE.po b/po/de_DE.po
index f871996..3a03e05 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.7.17\n"
 "Report-Msgid-Bugs-To: <see README>\n"
-"POT-Creation-Date: 2011-05-10 18:12+0200\n"
+"POT-Creation-Date: 2012-09-03 21:59+0200\n"
 "PO-Revision-Date: 2010-10-10 10:10+0300\n"
 "Last-Translator: a\n"
 "Language-Team: German\n"
@@ -97,7 +97,7 @@ msgstr "Lautstärke"
 msgid "Mute"
 msgstr "Stumm"
 
-msgid "PearlHD"
+msgid "PearlHD(native)"
 msgstr ""
 
 msgid "General"
@@ -121,6 +121,9 @@ msgstr "Uhrzeit im Aufnahme/Timer Menü anzeigen"
 msgid "Display epg images"
 msgstr "EPG-Bilder anzeigen"
 
+msgid "Use new epg images filename format"
+msgstr "Neue EPG-Bilder Dateinamen nutzen"
+
 msgid "Epg images format"
 msgstr "EPG-Bildformat"
 
diff --git a/setup.c b/setup.c
index bed7b06..b91d325 100644
--- a/setup.c
+++ b/setup.c
@@ -47,6 +47,7 @@ void cSkinPearlHDSetupMenu::Setup(void)
   Add(new cMenuEditBoolItem(tr("Display oClock text"), &tmpconfig->oClockText));
   Add(new cMenuEditBoolItem(tr("Display clock in Recordings/Timer menu"), &tmpconfig->RecShowClock));
   Add(new cMenuEditBoolItem(tr("Display epg images"), &tmpconfig->DisplayEpgImages));
+  Add(new cMenuEditBoolItem(tr("Use new epg images filename format"), &tmpconfig->EpgNewFilename));
   Add(new cMenuEditStraItem(tr("Epg images format"), &tmpconfig->EpgImagesFormat, 2, EpgImagesFormatItems));
   Add(new cMenuEditIntItem(tr("Padding sides"), &tmpconfig->MenuPaddingWidth));
   Add(new cMenuEditIntItem(tr("Padding top/bottom"), &tmpconfig->MenuPaddingHeight));