[vdr-plugin-epgsearch] 05/08: Imported Upstream version 1.0.1~beta6+git20150211
Tobias Grimm
tiber-guest at moszumanska.debian.org
Wed Feb 11 22:14:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository vdr-plugin-epgsearch.
commit 9ddfc0f70780762760788c99e0aaeeb3b5eed7c2
Author: etobi <git at e-tobi.net>
Date: Wed Feb 11 22:54:34 2015 +0100
Imported Upstream version 1.0.1~beta6+git20150211
---
.gitignore | 14 ++++++++++++++
MANUAL | 1 -
Makefile | 10 +++++++++-
README.DE | 1 -
blacklist.c | 2 +-
changrp.c | 2 +-
epgsearchext.c | 4 ++--
epgsearchtools.c | 2 +-
menu_favorites.c | 22 ++++++++++++++++++++++
menu_favorites.h | 4 ++++
menu_myedittimer.c | 2 +-
switchtimer.c | 2 +-
uservars.h | 4 ++++
13 files changed, 60 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d8fc760
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+/createcats
+/.dependencies
+/MANUAL
+/README.DE
+/doc/
+/html/
+/man/
+/po/epgsearch.pot
+/po/*.mo
+*.o
+*.so
+*.tgz
+*.tmp
+*~
diff --git a/MANUAL b/MANUAL
deleted file mode 120000
index 3631c85..0000000
--- a/MANUAL
+++ /dev/null
@@ -1 +0,0 @@
-./doc/en/epgsearch.4.txt
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 6bb1b96..2ded06a 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,9 @@ VERSION = $(shell grep 'static const char VERSION\[\] *=' $(PLUGIN).c | awk '{ p
### The directory environment:
# Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+#PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+
LIBDIR = $(call PKGCFG,libdir)
LOCDIR = $(call PKGCFG,locdir)
MANDIR = $(call PKGCFG,mandir)
@@ -72,6 +74,9 @@ BINDIR = $(call PKGCFG,bindir)
#
TMPDIR ?= /tmp
+PLGCFG = $(call PKGCFG,plgcfg)
+-include $(PLGCFG)
+
### The compiler options:
export CFLAGS = $(call PKGCFG,cflags)
@@ -90,6 +95,9 @@ ifeq ($(AUTOCONFIG),1)
ifeq (exists, $(shell test -e ../graphtft && echo exists))
USE_GRAPHTFT = 1
endif
+ ifeq (exists, $(shell test -e ../graphtftng && echo exists))
+ USE_GRAPHTFT = 1
+ endif
endif
### The version number of VDR's plugin API:
diff --git a/README.DE b/README.DE
deleted file mode 120000
index f25d9bf..0000000
--- a/README.DE
+++ /dev/null
@@ -1 +0,0 @@
-./doc/de/epgsearch.1.txt
\ No newline at end of file
diff --git a/blacklist.c b/blacklist.c
index c36f35d..f6fd471 100644
--- a/blacklist.c
+++ b/blacklist.c
@@ -329,7 +329,7 @@ bool cBlacklist::Parse(const char *s)
#else
char *channelMinbuffer = NULL;
char *channelMaxbuffer = NULL;
- int channels = sscanf(value, "%a[^|]|%a[^|]", &channelMinbuffer, &channelMaxbuffer);
+ int channels = sscanf(value, "%m[^|]|%m[^|]", &channelMinbuffer, &channelMaxbuffer);
#endif
channelMin = Channels.GetByChannelID(tChannelID::FromString(channelMinbuffer), true, true);
if (!channelMin)
diff --git a/changrp.c b/changrp.c
index 075f81a..66cd6a1 100644
--- a/changrp.c
+++ b/changrp.c
@@ -78,7 +78,7 @@ bool cChannelGroup::Parse(const char *s)
int numChannels = sscanf(value, "%31[^|]", channelbuffer);
#else
char *channelbuffer = NULL;
- int numChannels = sscanf(value, "%a[^|]", &channelbuffer);
+ int numChannels = sscanf(value, "%m[^|]", &channelbuffer);
#endif
if (numChannels == 1)
{
diff --git a/epgsearchext.c b/epgsearchext.c
index 9db9158..9d11c3b 100644
--- a/epgsearchext.c
+++ b/epgsearchext.c
@@ -478,7 +478,7 @@ bool cSearchExt::Parse(const char *s)
#else
char *channelMinbuffer = NULL;
char *channelMaxbuffer = NULL;
- int channels = sscanf(value, "%a[^|]|%a[^|]", &channelMinbuffer, &channelMaxbuffer);
+ int channels = sscanf(value, "%m[^|]|%m[^|]", &channelMinbuffer, &channelMaxbuffer);
#endif
channelMin = Channels.GetByChannelID(tChannelID::FromString(channelMinbuffer), true, true);
if (!channelMin)
@@ -1201,7 +1201,7 @@ void cSearchExt::CheckRepeatTimers(cSearchResults* pResults)
if (!pResultObjP->needsTimer) continue;
- if (EventsMatch(pEvent, pEventP, compareTitle, compareSubtitle, compareSummary, compareDate, catvaluesAvoidRepeat))
+ if (EventsMatch(pEvent, pEventP, compareTitle, compareSubtitle, compareSummary, compareDate, catvaluesAvoidRepeat, compareSummaryMatchInPercent))
{
if (!pFirstResultMatching) pFirstResultMatching = pResultObjP;
plannedTimers++;
diff --git a/epgsearchtools.c b/epgsearchtools.c
index 66c537f..6f7485a 100644
--- a/epgsearchtools.c
+++ b/epgsearchtools.c
@@ -506,7 +506,7 @@ bool DescriptionMatches(const char* eDescr, const char* rDescr, int matchLimit)
// last try with Levenshtein Distance, only compare the first 1000 chars
double fMatch = FuzzyMatch(eDescr, rDescr, 1000);
double tmp_matchlimit = matchLimit/100.0;
- if(maxLength - minLength < 5)
+ if(maxLength - minLength < 5 && matchLimit < 95)
{
tmp_matchlimit = 0.95;
LogFile.Log(2,"difference between both descriptions is < 5 setting matchlimit to: %.2f %%", tmp_matchlimit*100);
diff --git a/menu_favorites.c b/menu_favorites.c
index 4ff86d4..d2dce45 100644
--- a/menu_favorites.c
+++ b/menu_favorites.c
@@ -37,6 +37,28 @@ cMenuFavorites::cMenuFavorites()
BuildList();
}
+#ifdef USE_GRAPHTFT
+const char* cMenuFavorites::MenuKind()
+{
+ return "MenuEpgsFavorites";
+}
+
+void cMenuFavorites::Display(void)
+{
+ cOsdMenu::Display();
+
+ if (Count() > 0)
+ {
+ int i = 0;
+
+ for (cOsdItem *item = First(); item; item = Next(item))
+ cStatus::MsgOsdEventItem(!item->Selectable() ? 0 :
+ ((cMenuSearchResultsItem*)item)->event,
+ item->Text(), i++, Count());
+ }
+}
+#endif /* GRAPHTFT */
+
bool cMenuFavorites::BuildList()
{
Clear();
diff --git a/menu_favorites.h b/menu_favorites.h
index 91a25a7..5adf9f7 100644
--- a/menu_favorites.h
+++ b/menu_favorites.h
@@ -35,6 +35,10 @@ class cMenuFavorites : public cMenuSearchResults {
cMenuFavorites();
virtual eOSState ProcessKey(eKeys Key);
virtual void SetHelpKeys(bool Force=false);
+#ifdef USE_GRAPHTFT
+ virtual const char* MenuKind();
+ virtual void Display(void);
+#endif
};
diff --git a/menu_myedittimer.c b/menu_myedittimer.c
index becce85..a6529a4 100644
--- a/menu_myedittimer.c
+++ b/menu_myedittimer.c
@@ -128,7 +128,7 @@ void cMenuMyEditTimer::Set()
Add(new cMenuEditStrItem( tr("Directory"), directory, MaxFileName, tr(AllowedChars)));
Add(new cMenuEditBitItem( trVDR("Active"), &flags, tfActive));
#ifdef USE_PINPLUGIN
- if (cOsd::pinValid) Add(new cMenuEditChanItem(tr("Channel"), &channel));
+ if (cOsd::pinValid || !fskProtection) Add(new cMenuEditChanItem(tr("Channel"), &channel));
else {
cString buf = cString::sprintf("%s\t%s", tr("Channel"), Channels.GetByNumber(channel)->Name());
Add(new cOsdItem(buf));
diff --git a/switchtimer.c b/switchtimer.c
index 12dfac1..20c017b 100644
--- a/switchtimer.c
+++ b/switchtimer.c
@@ -157,7 +157,7 @@ bool cSwitchTimer::Save(FILE *f)
cSwitchTimer* cSwitchTimers::InSwitchList(const cEvent* event)
{
- if (!event) return false;
+ if (!event) return NULL;
cMutexLock SwitchTimersLock(this);
cSwitchTimer* switchTimer = SwitchTimers.First();
while (switchTimer)
diff --git a/uservars.h b/uservars.h
index f098750..9366af0 100644
--- a/uservars.h
+++ b/uservars.h
@@ -538,7 +538,11 @@ class cVideodirVar : public cInternalVar {
cVideodirVar() : cInternalVar("videodir") {}
string Evaluate(const cEvent*, bool escapeStrings = false)
{
+#if APIVERSNUM > 20101
+ return cVideoDirectory::Name();
+#else
return VideoDirectory;
+#endif
}
};
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-epgsearch.git
More information about the pkg-vdr-dvb-changes
mailing list