summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhorchi <vdr@jwendel.de>2018-02-26 17:21:06 (GMT)
committerhorchi <vdr@jwendel.de>2018-02-26 17:21:06 (GMT)
commitd9d90f03128c531cd0b93cebca2af5660c2d4322 (patch)
treeefa68187a912357db99534afd35649e8d3453454
parent5a7781abf60c473e975674c9479006005c77d7d3 (diff)
downloadvdr-plugin-epg2vdr-d9d90f03128c531cd0b93cebca2af5660c2d4322.tar.gz
vdr-plugin-epg2vdr-d9d90f03128c531cd0b93cebca2af5660c2d4322.tar.bz2
2018-02-26 version 1.1.91 (horchi)\n - change: backward compatibility to vdr 2.2.0 - another step\n\n1.1.91vdr-2-2
-rw-r--r--HISTORY.h7
-rw-r--r--lib/common.h1
-rw-r--r--po/de_DE.po6
-rw-r--r--po/it_IT.po6
-rw-r--r--timer.c24
5 files changed, 28 insertions, 16 deletions
diff --git a/HISTORY.h b/HISTORY.h
index 160c0b7..c1b5d76 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
*
*/
-#define _VERSION "1.1.90"
-#define VERSION_DATE "24.02.2018"
+#define _VERSION "1.1.91"
+#define VERSION_DATE "26.02.2018"
#define DB_API 6
@@ -19,6 +19,9 @@
/*
* ------------------------------------
+2018-02-26 version 1.1.91 (horchi)
+ - change: backward compatibility to vdr 2.2.0 - another step
+
2018-02-23 version 1.1.90 (horchi)
- change: improved timer cleanup
diff --git a/lib/common.h b/lib/common.h
index 3d0aa95..c7faf81 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -33,6 +33,7 @@
#ifdef VDR_PLUGIN
# include <vdr/tools.h>
+# include <vdr/thread.h>
#endif
class MemoryStruct;
diff --git a/po/de_DE.po b/po/de_DE.po
index 272c71e..8f572df 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: <vdr@jwendel.de>\n"
-"POT-Creation-Date: 2018-02-22 19:07+0100\n"
+"POT-Creation-Date: 2018-02-26 08:20+0100\n"
"PO-Revision-Date: 2009-08-27 21:40+0200\n"
"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -332,6 +332,10 @@ msgid "Timer still recording - really delete?"
msgstr "Timer zeichnet auf, dennoch löschen?"
#, c-format
+msgid "Switching in %ld seconds to '%s'"
+msgstr ""
+
+#, c-format
msgid "Skipping '%s' request, epgd busy. Trying again later"
msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index 72444e3..15b2d55 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: <vdr@jwendel.de>\n"
-"POT-Creation-Date: 2018-02-22 19:07+0100\n"
+"POT-Creation-Date: 2018-02-26 08:20+0100\n"
"PO-Revision-Date: 2009-08-27 21:45+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -337,6 +337,10 @@ msgid "Timer still recording - really delete?"
msgstr ""
#, c-format
+msgid "Switching in %ld seconds to '%s'"
+msgstr ""
+
+#, c-format
msgid "Skipping '%s' request, epgd busy. Trying again later"
msgstr ""
diff --git a/timer.c b/timer.c
index d73f60a..f22af8f 100644
--- a/timer.c
+++ b/timer.c
@@ -24,13 +24,24 @@ int cUpdate::checkSwitchTimer()
for (auto it = switchTimers.begin(); it != switchTimers.end(); )
{
SwitchTimer* swTimer = &(it->second);
+ tChannelID channelId = tChannelID::FromString(swTimer->channelId.c_str());
+
+#if APIVERSNUM >= 20301
+ LOCK_CHANNELS_READ;
+ const cChannels* channels = Channels;
+ const cChannel* channel = channels->GetByChannelID(channelId, true);
+#else
+ cChannels* channels = &Channels;
+ cChannel* channel = channels->GetByChannelID(channelId, true);
+#endif
if (time(0) < swTimer->start)
{
if (!swTimer->notified && Epg2VdrConfig.switchTimerNotifyTime && time(0) >= swTimer->start - Epg2VdrConfig.switchTimerNotifyTime)
{
char* buf;
- asprintf(&buf, "Switching in %ld seconds to '%s'", swTimer->start-time(0), swTimer->channelId.c_str());
+ asprintf(&buf, tr("Switching in %ld seconds to '%s'"), swTimer->start-time(0),
+ channel ? channel->Name() : swTimer->channelId.c_str());
Skins.QueueMessage(mtInfo, buf);
free(buf);
swTimer->notified = yes;
@@ -40,17 +51,6 @@ int cUpdate::checkSwitchTimer()
continue;
}
- tChannelID channelId = tChannelID::FromString(swTimer->channelId.c_str());
-
-#if APIVERSNUM >= 20301
- LOCK_CHANNELS_READ;
- const cChannels* channels = Channels;
- const cChannel* channel = channels->GetByChannelID(channelId, true);
-#else
- cChannels* channels = &Channels;
- cChannel* channel = channels->GetByChannelID(channelId, true);
-#endif
-
if (!channel)
{
tell(0, "Switching to channel '%s' failed, channel not found!", swTimer->channelId.c_str());