summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Wieninger <cwieninger (at) gmx (dot) de>2008-04-22 19:28:16 +0200
committerChristian Wieninger <cwieninger (at) gmx (dot) de>2008-04-22 19:28:16 +0200
commit11dbe2c560259f37f0f477426996a472b41d26be (patch)
tree327d8340eeffc66589f2af186d87bea718046006
parent8804e930a66ed601bda30ffce5dca650fd88cec5 (diff)
downloadvdr-plugin-epgsearch-11dbe2c560259f37f0f477426996a472b41d26be.tar.gz
vdr-plugin-epgsearch-11dbe2c560259f37f0f477426996a472b41d26be.tar.bz2
compiles now with gcc-2.95, 0.9.24.rc1
Diffstat
-rw-r--r--confdloader.c2
-rw-r--r--epgsearch.c4
-rw-r--r--epgsearchtools.h13
-rw-r--r--menu_searchresults.c3
-rw-r--r--menu_whatson.c6
-rw-r--r--po/ca_ES.po2
-rw-r--r--po/cs_CZ.po2
-rw-r--r--po/da_DK.po2
-rw-r--r--po/de_DE.po2
-rw-r--r--po/el_GR.po2
-rw-r--r--po/es_ES.po4
-rw-r--r--po/et_EE.po2
-rw-r--r--po/fi_FI.po4
-rw-r--r--po/fr_FR.po2
-rw-r--r--po/hr_HR.po2
-rw-r--r--po/hu_HU.po2
-rw-r--r--po/it_IT.po4
-rw-r--r--po/nl_NL.po4
-rw-r--r--po/nn_NO.po2
-rw-r--r--po/pl_PL.po2
-rw-r--r--po/pt_PT.po2
-rw-r--r--po/ro_RO.po2
-rw-r--r--po/ru_RU.po2
-rw-r--r--po/sl_SI.po2
-rw-r--r--po/sv_SE.po2
-rw-r--r--po/tr_TR.po2
26 files changed, 45 insertions, 33 deletions
diff --git a/confdloader.c b/confdloader.c
index 5bb444b..24732bd 100644
--- a/confdloader.c
+++ b/confdloader.c
@@ -21,6 +21,7 @@ The author can be reached at cwieninger@gmx.de
The project's page is at http://winni.vdr-developer.org/epgsearch
*/
+#include <string>
#include <vdr/plugin.h>
#include "confdloader.h"
#include "log.h"
@@ -29,6 +30,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include "templatefile.h"
#include "epgsearchcats.h"
+using std::string;
// ---------------------------
// Loads all files in the conf.d subdirectory of <plugin-config-directory> and
diff --git a/epgsearch.c b/epgsearch.c
index 9207644..a502abd 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -66,7 +66,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include "menu_announcelist.h"
#include "confdloader.h"
-static const char VERSION[] = "0.9.24.beta27";
+static const char VERSION[] = "0.9.24.rc1";
static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more");
// globals
@@ -464,6 +464,7 @@ bool cPluginEpgsearch::Start(void)
void cPluginEpgsearch::CheckUTF8()
{
+#if APIVERSNUM >= 10503
// Taken from VDR's vdr.c
char *CodeSet = NULL;
if (setlocale(LC_CTYPE, ""))
@@ -479,6 +480,7 @@ void cPluginEpgsearch::CheckUTF8()
if (CodeSet && strcasestr(CodeSet, "UTF-8") != 0)
isUTF8=true;
+#endif
}
void cPluginEpgsearch::Stop(void)
diff --git a/epgsearchtools.h b/epgsearchtools.h
index 5a271e0..44d202b 100644
--- a/epgsearchtools.h
+++ b/epgsearchtools.h
@@ -77,6 +77,7 @@ using std::string;
#define ISRADIO(x) ((x)->Vpid()==0||(x)->Vpid()==1||(x)->Vpid()==0x1fff)
// Icons used in VDRSymbols-Font
+
#define ICON_REC 0x8B
#define ICON_RUNNING 0x92
#define ICON_CLOCK 0x8C
@@ -87,7 +88,8 @@ using std::string;
#define ICON_BAR_CLOSE 0x8A
#define ICON_VPS 0x93
-/* previous WAREAGLE icons
+/*
+// previous WAREAGLE icons
#define ICON_REC 0xF9
#define ICON_RUNNING 0xFB
#define ICON_CLOCK 0xFD
@@ -192,8 +194,13 @@ public:
// --- icstring ------------------------------------------
// a case-insensitive string class
-
-struct ignorecase_traits : public std::char_traits<char> {
+struct ignorecase_traits : public std::
+#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 96
+string_char_traits<char>
+#else
+char_traits<char>
+#endif
+{
// return whether c1 and c2 are equal
static bool eq(const char& c1, const char& c2) {
return (c1==c2 || std::toupper(c1)==std::toupper(c2));
diff --git a/menu_searchresults.c b/menu_searchresults.c
index d0b7b90..10ea447 100644
--- a/menu_searchresults.c
+++ b/menu_searchresults.c
@@ -91,9 +91,12 @@ bool cMenuSearchResultsItem::Update(bool Force)
}
else
{
+#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 96
+#else
sprintf(t, "%s", (event && hasMatch ? (timerMatch == tmFull) ? ((timer && timer->Recording())?ICON_REC_UTF8:ICON_CLOCK_UTF8) : ICON_CLOCK_HALF_UTF8 : " "));
sprintf(v, "%s", event && event->Vps() && (event->Vps() - event->StartTime()) ? ICON_VPS_UTF8 : " ");
sprintf(r, "%s", (event && event->IsRunning() ? ICON_RUNNING_UTF8 : " "));
+#endif
}
}
else
diff --git a/menu_whatson.c b/menu_whatson.c
index fb12ec0..41d3ae5 100644
--- a/menu_whatson.c
+++ b/menu_whatson.c
@@ -125,6 +125,8 @@ bool cMenuMyScheduleItem::Update(bool Force)
}
else
{
+#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 96
+#else
std::stringstream buffer;
buffer << ICON_BAR_OPEN_UTF8;
for(int i=0;i<8;i++) buffer << (i<frac?ICON_BAR_FULL_UTF8:ICON_BAR_EMPTY_UTF8);
@@ -132,6 +134,7 @@ bool cMenuMyScheduleItem::Update(bool Force)
char* temp = strdup(buffer.str().c_str());
sprintf(szProgressPart, "%s", temp);
free(temp);
+#endif
}
}
else
@@ -158,9 +161,12 @@ bool cMenuMyScheduleItem::Update(bool Force)
}
else
{
+#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 96
+#else
sprintf(t, "%s", (event && hasMatch ? (timerMatch == tmFull) ? ((timer && timer->Recording())?ICON_REC_UTF8:ICON_CLOCK_UTF8) : ICON_CLOCK_HALF_UTF8 : " "));
sprintf(v, "%s", event && event->Vps() && (event->Vps() - event->StartTime()) ? ICON_VPS_UTF8 : " ");
sprintf(r, "%s", (event && event->IsRunning() ? ICON_RUNNING_UTF8 : " "));
+#endif
}
}
else
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 79aec41..e8dc17a 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 7404fdb..9b5c50d 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/da_DK.po b/po/da_DK.po
index d42c154..b94e4c6 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index 8ac4dfb..9714ab2 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/el_GR.po b/po/el_GR.po
index ad1449d..ae4ddf9 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 766c4e1..4731e9b 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-11-18 20:09+0200\n"
"Last-Translator: bittor from open7x0.org <bittor7x0 _at_ gmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -1197,5 +1197,3 @@ msgstr "en %02ldh"
msgid "in %02ldm"
msgstr "en %02ldm"
-#~ msgid "Timer still recording - really delete?"
-#~ msgstr "Todavía está grabando - ¿borrar realmente?"
diff --git a/po/et_EE.po b/po/et_EE.po
index 3f3dac7..eded03d 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 62dcae6..152f3a6 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -1201,5 +1201,3 @@ msgstr "%02ldh"
msgid "in %02ldm"
msgstr "%02ldm"
-#~ msgid "Timer still recording - really delete?"
-#~ msgstr "Ajastettu tallennus käynnissä - poistetaanko silti?"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 2d3c35a..af6cf2d 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Nicolas Huillard <nhuillard@e-dition.fr>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 739aee2..c906ee3 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 2315c1f..19a40be 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/it_IT.po b/po/it_IT.po
index 934f214..9086294 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-12-30 04:09+0100\n"
"Last-Translator: Gringo <vdr-italian@tiscali.it>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -1199,5 +1199,3 @@ msgstr "in %02ldh"
msgid "in %02ldm"
msgstr "in %02ldm"
-#~ msgid "Timer still recording - really delete?"
-#~ msgstr "Timer in registrazione - sicuro di cancellarlo?"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 94e7e79..052f976 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -1192,5 +1192,3 @@ msgstr "in %02ldh"
msgid "in %02ldm"
msgstr "in %02ldm"
-#~ msgid "Timer still recording - really delete?"
-#~ msgstr "Timer neemt nog op - werkelijk verwijderen?"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index f6941e6..c39dabf 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index bf3d41a..b1cfb4e 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index bdd4f52..ea3e912 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index fa9a120..9bf7f31 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 318ea8b..c6a75ab 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 6e3b4ed..344798a 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index d81c32e..59638dd 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
"Language-Team: <vdr@linuxtv.org>\n"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 8c2d7b6..310c7a3 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-03-22 08:54+0100\n"
+"POT-Creation-Date: 2008-04-17 18:22+0200\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-23 22:19:59 +0000