summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Eskola <timo@tolleri.net>2015-09-08 12:54:54 +0300
committerTimo Eskola <timo@tolleri.net>2015-09-08 12:54:54 +0300
commit7edba06d8a957de3d99843cc52cb50c1eff7e758 (patch)
tree4be6cf91651a0f0314a33ace750bef0fdbf2181e
parent554759de812beb5dcfdc423b1225e5e15ef80713 (diff)
downloadvdr-plugin-duplicates-7edba06d8a957de3d99843cc52cb50c1eff7e758.tar.gz
vdr-plugin-duplicates-7edba06d8a957de3d99843cc52cb50c1eff7e758.tar.bz2
Version 0.0.5:
- Fixed compilation with VDR 1.7.28, thanks to Matti Lehtimäki and Joerg Bornkessel
-rw-r--r--HISTORY4
-rw-r--r--Makefile2
-rw-r--r--README2
-rw-r--r--duplicates.c2
-rw-r--r--menu.c15
5 files changed, 21 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index dc91674..72783e8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,10 @@
VDR Plugin 'duplicates' Revision History
----------------------------------------
+2012-12-13: Version 0.0.5
+
+- Fixed compilation with VDR 1.7.28, thanks to Matti Lehtimäki and Joerg Bornkessel
+
2011-12-20: Version 0.0.4
- Added configuration option for title comparison.
diff --git a/Makefile b/Makefile
index a5ff4cd..2eef0b0 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ TMPDIR = /tmp
### Make sure that necessary options are included:
-include $(VDRDIR)/Make.global
+-include $(VDRDIR)/Make.global
### Allow user defined options to overwrite defaults:
diff --git a/README b/README
index 2261995..95a87b2 100644
--- a/README
+++ b/README
@@ -24,7 +24,7 @@ Recordings without a description or a short description are not
included in the comparison and are shown at the botton of the
duplicate recordings list.
-Recorings are not considered duplicate if title comparison is
+Recordings are not considered duplicate if title comparison is
active and shorter title in not included in the other title.
The short description and the description are concatenated to a
diff --git a/duplicates.c b/duplicates.c
index 7294506..d2f0fb9 100644
--- a/duplicates.c
+++ b/duplicates.c
@@ -11,7 +11,7 @@
#include "config.h"
#include "menu.h"
-static const char *VERSION = "0.0.4";
+static const char *VERSION = "0.0.5";
static const char *DESCRIPTION = trNOOP("Shows duplicate recordings");
static const char *MAINMENUENTRY = trNOOP("Duplicate recordings");
diff --git a/menu.c b/menu.c
index f597e03..2d8c0e6 100644
--- a/menu.c
+++ b/menu.c
@@ -55,6 +55,9 @@ public:
cMenuDuplicate::cMenuDuplicate(const cRecording *Recording)
:cOsdMenu(trVDR("Recording info"))
{
+#if VDRVERSNUM >= 10728
+ SetMenuCategory(mcRecording);
+#endif
recording = Recording;
SetHelp(trVDR("Button$Play"));
}
@@ -207,12 +210,15 @@ bool cDuplicateRecording::IsDuplicate(const cDuplicateRecording *DuplicateRecord
// --- cMenuDuplicates -------------------------------------------------------
cMenuDuplicates::cMenuDuplicates()
-#ifdef LIEMIKUUTIO
+#if defined LIEMIKUUTIO || VDRVERSNUM >= 10721
:cOsdMenu(tr("Duplicate recordings"), 9, 7, 7)
#else
:cOsdMenu(tr("Duplicate recordings"), 9, 7)
#endif
{
+#if VDRVERSNUM >= 10728
+ SetMenuCategory(mcRecording);
+#endif
Recordings.StateChanged(recordingsState); // just to get the current state
helpKeys = -1;
Set();
@@ -386,7 +392,11 @@ eOSState cMenuDuplicates::Play(void)
if (ri) {
cRecording *recording = GetRecording(ri);
if (recording) {
+#if VDRVERSNUM >= 10728
+ cDuplicatesReplayControl::SetRecording(recording->FileName());
+#else
cDuplicatesReplayControl::SetRecording(recording->FileName(), recording->Title());
+#endif
cControl::Shutdown();
cControl::Launch(new cDuplicatesReplayControl);
return osEnd;
@@ -447,6 +457,9 @@ eOSState cMenuDuplicates::ProcessKey(eKeys Key)
cMenuSetupDuplicates::cMenuSetupDuplicates(cMenuDuplicates *MenuDuplicates)
{
+#if VDRVERSNUM >= 10728
+ SetMenuCategory(mcSetup);
+#endif
menuDuplicates = MenuDuplicates;
Add(new cMenuEditBoolItem(tr("Compare title"), &dc.title));
}