diff options
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | HISTORY.DE | 5 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | epgsearchext.c | 4 | ||||
| -rw-r--r-- | epgsearchtools.h | 4 | ||||
| -rw-r--r-- | menu_main.c | 2 | ||||
| -rw-r--r-- | menu_whatson.c | 2 |
7 files changed, 30 insertions, 3 deletions
@@ -3,6 +3,10 @@ VDR Plugin 'epgsearch' Revision History 2011-xx-xx; Version 1.0.1 new: +- when channel seperators are displayed the filling '-' can cause problems in the output + of graphtft. Set PLUGIN_EPGSEARCH_SEPP_ITEMS=--- in your Make.config to avoid this. Most + skins (except classic, st:tng) will translate '---' into a single line anyway + (Feature #857, thanks to 'KeineAhnung' for providing a patch) - search timers are now processed by their descending timer priority. Search timers with the same priority are sorted by their search term. Thanks to Anonym for providing a patch - new bugtracker at http://projects.vdr-developer.org/projects/plg-epgsearch - thanks to Tobias Grimm @@ -3,6 +3,11 @@ VDR Plugin 'epgsearch' Revision History 2011-xx-xx: Version 1.0.1 neu: +- Wenn Kanalseparatoren angezeigt werden, kann das in der Ausgabe von graphtft Probleme + machen. Um das zu vermeiden, bitte PLUGIN_EPGSEARCH_SEPP_ITEMS=--- in der Make.config + setzen. Die meisten Skins (ausser classic, st:tng) ersetzen '---' ohnehin in eine durch- + gehende Linie. + (Feature #857, Danke an 'KeineAhnung' für den Patch) - Suchtimer werden jetzt anhand absteigender Timer-Priorität abgearbeitet. Bei gleicher Priorität wird nach dem Suchbegriff sortiert. Danke an Anonym für den Patch. - Neuer Bugtracker unter http://projects.vdr-developer.org/projects/plg-epgsearch - Danke an Tobias Grimm @@ -159,6 +159,18 @@ ifdef DEBUG_CONFL DEFINES += -DDEBUG_CONFL endif +ifdef PLUGIN_EPGSEARCH_MAX_SUBTITLE_LENGTH +DEFINES += -DMAX_SUBTITLE_LENGTH='$(PLUGIN_EPGSEARCH_MAX_SUBTITLE_LENGTH)' +endif + +### length of the filling '-' in the channel separators, defaults to +### "----------------------------------------" +### overwrite this with PLUGIN_EPGSEARCH_SEPP_ITEMS=--- in your Make.config +### to avoid problems with graphtft +ifdef PLUGIN_EPGSEARCH_SEPP_ITEMS +DEFINES += -DMENU_SEPPERATOR_ITEMS='"$(PLUGIN_EPGSEARCH_SEPP_ITEMS)"' +endif + OBJS2 = mainmenushortcut.o epgsearchonly.o LIBS2 = diff --git a/epgsearchext.c b/epgsearchext.c index ba58b3b..b1ecb56 100644 --- a/epgsearchext.c +++ b/epgsearchext.c @@ -42,7 +42,9 @@ The project's page is at http://winni.vdr-developer.org/epgsearch cSearchExts SearchExts; cSearchExts SearchTemplates; -#define MAX_SUBTITLE_LENGTH 40 +#ifndef MAX_SUBTITLE_LENGTH + #define MAX_SUBTITLE_LENGTH 40 +#endif // -- cSearchExt ----------------------------------------------------------------- char *cSearchExt::buffer = NULL; diff --git a/epgsearchtools.h b/epgsearchtools.h index 2ad1d35..14af7a5 100644 --- a/epgsearchtools.h +++ b/epgsearchtools.h @@ -74,6 +74,10 @@ using std::string; #define ISRADIO(x) ((x)->Vpid()==0||(x)->Vpid()==1||(x)->Vpid()==0x1fff) +#ifndef MENU_SEPPERATOR_ITEMS + #define MENU_SEPPERATOR_ITEMS "----------------------------------------" +#endif + #define UPDS_WITH_OSD (1<<1) #define UPDS_WITH_EPGSCAN (1<<2) diff --git a/menu_main.c b/menu_main.c index 869efdc..e131b00 100644 --- a/menu_main.c +++ b/menu_main.c @@ -141,7 +141,7 @@ void cMenuSearchMain::PrepareSchedule(cChannel *Channel) struct tm *t_lastevent = localtime_r(&lastEventDate, &tm_rLastEvent); if (t_event->tm_mday != t_lastevent->tm_mday) { - cString szSep = cString::sprintf("----------------------------------\t %s ----------------------------------------------------------------------------------------------", GETDATESTRING(Event)); + cString szSep = cString::sprintf("%s\t %s %s", MENU_SEPPERATOR_ITEMS, GETDATESTRING(Event), MENU_SEPPERATOR_ITEMS); cOsdItem* pSepItem = new cOsdItem(szSep); pSepItem->SetSelectable(false); Add(pSepItem); diff --git a/menu_whatson.c b/menu_whatson.c index 99a26ac..05af12d 100644 --- a/menu_whatson.c +++ b/menu_whatson.c @@ -414,7 +414,7 @@ void cMenuWhatsOnSearch::LoadSchedules() { if (EPGSearchConfig.showChannelGroups && strlen(Channel->Name())) { - cString szGroup = cString::sprintf("----------------------------------------\t %s ----------------------------------------------------------------------------------------------", Channel->Name()); + cString szGroup = cString::sprintf("%s\t %s %s", MENU_SEPPERATOR_ITEMS, Channel->Name(), MENU_SEPPERATOR_ITEMS); cOsdItem* pGroupItem = new cOsdItem(szGroup); pGroupItem->SetSelectable(false); Add(pGroupItem); |