r4818 - in /vdr/vdr-plugin-epgsearch/trunk/debian: changelog patches/00list patches/01_debian-defaults.dpatch patches/91_epgsearch-1.5.0.dpatch patches/92_epgsearch-0.9.23-beta1.dpatch
tom-guest at users.alioth.debian.org
tom-guest at users.alioth.debian.org
Wed Jun 27 23:40:14 UTC 2007
Author: tom-guest
Date: Wed Jun 27 23:40:13 2007
New Revision: 4818
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=4818
Log:
Release for vdrdevel 1.5.5
Added:
vdr/vdr-plugin-epgsearch/trunk/debian/patches/92_epgsearch-0.9.23-beta1.dpatch
Removed:
vdr/vdr-plugin-epgsearch/trunk/debian/patches/91_epgsearch-1.5.0.dpatch
Modified:
vdr/vdr-plugin-epgsearch/trunk/debian/changelog
vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list
vdr/vdr-plugin-epgsearch/trunk/debian/patches/01_debian-defaults.dpatch (props changed)
Modified: vdr/vdr-plugin-epgsearch/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/changelog?rev=4818&op=diff
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/changelog Wed Jun 27 23:40:13 2007
@@ -1,3 +1,10 @@
+vdr-plugin-epgsearch (0.9.22-2) unstable; urgency=low
+
+ * Release for vdrdevel 1.5.5
+ * Added 92_epgsearch-0.9.23-beta1.dpatch
+
+ -- Thomas Günther <tom at toms-cafe.de> Wed, 27 Jun 2007 23:29:15 +0200
+
vdr-plugin-epgsearch (0.9.22-1) unstable; urgency=low
* New upstream release
Modified: vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list?rev=4818&op=diff
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/patches/00list Wed Jun 27 23:40:13 2007
@@ -1,4 +1,3 @@
01_debian-defaults
-# Intentionally disabled, seems not to be required by VDR 1.5.x
-# 91_epgsearch-1.5.0
+92_epgsearch-0.9.23-beta1
Propchange: vdr/vdr-plugin-epgsearch/trunk/debian/patches/01_debian-defaults.dpatch
('svn:executable' removed)
Added: vdr/vdr-plugin-epgsearch/trunk/debian/patches/92_epgsearch-0.9.23-beta1.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-epgsearch/trunk/debian/patches/92_epgsearch-0.9.23-beta1.dpatch?rev=4818&op=file
==============================================================================
--- vdr/vdr-plugin-epgsearch/trunk/debian/patches/92_epgsearch-0.9.23-beta1.dpatch (added)
+++ vdr/vdr-plugin-epgsearch/trunk/debian/patches/92_epgsearch-0.9.23-beta1.dpatch Wed Jun 27 23:40:13 2007
@@ -1,0 +1,249 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 92_epgsearch-0.9.23-beta1.dpatch by Christian Wieninger <cwieninger at gmx.de>
+##
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes for VDR >= 1.5.3.
+
+ at DPATCH@
+diff -Naur -xdoc -xman -xMANUAL -xREADME -xREADME.DE epgsearch-0.9.22/epgsearch.c epgsearch-0.9.23-beta1/epgsearch.c
+--- epgsearch-0.9.22/epgsearch.c 2007-05-27 08:27:33.000000000 +0200
++++ epgsearch-0.9.23-beta1/epgsearch.c 2007-06-10 17:27:00.000000000 +0200
+@@ -43,7 +43,7 @@
+ #include "menu_quicksearch.h"
+ #include "menu_announcelist.h"
+
+-static const char VERSION[] = "0.9.22";
++static const char VERSION[] = "0.9.23-beta1";
+ static const char DESCRIPTION[] = "search the EPG for repeats and more";
+
+ // globals
+diff -Naur -xdoc -xman -xMANUAL -xREADME -xREADME.DE epgsearch-0.9.22/epgsearchsvdrp.c epgsearch-0.9.23-beta1/epgsearchsvdrp.c
+--- epgsearch-0.9.22/epgsearchsvdrp.c 2007-04-27 23:27:47.000000000 +0200
++++ epgsearch-0.9.23-beta1/epgsearchsvdrp.c 2007-06-10 20:17:04.000000000 +0200
+@@ -398,7 +398,11 @@
+ asprintf(&cmdbuf, "NEWT %d:%d:%s:%s:%s:%d:%d:%s:%s",
+ Flags,
+ Timer->Channel()->Number(),
++#if VDRVERSNUM < 10503
+ *Timer->PrintDay(start, Timer->WeekDays()),
++#else
++ *Timer->PrintDay(start, Timer->WeekDays(), true),
++#endif
+ bufStart,
+ bufEnd,
+ search->Priority,
+diff -Naur -xdoc -xman -xMANUAL -xREADME -xREADME.DE epgsearch-0.9.22/epgsearchtools.c epgsearch-0.9.23-beta1/epgsearchtools.c
+--- epgsearch-0.9.22/epgsearchtools.c 2007-05-06 10:09:25.000000000 +0200
++++ epgsearch-0.9.23-beta1/epgsearchtools.c 2007-06-10 20:15:53.000000000 +0200
+@@ -56,6 +56,7 @@
+ // based on Nordlicht's EPG-Plugin
+ void PatchFont(eDvbFont DvbFont)
+ {
++#if VDRVERSNUM < 10503
+ const cFont *font = cFont::GetFont(DvbFont);
+ int num_rows_global = font->Height();
+ int num_rows = num_rows_global+2;
+@@ -267,8 +268,10 @@
+ }
+
+ cFont::SetFont(DvbFont, font_data);
++#endif
+ }
+
++
+ bool MatchesSearchMode(const char* szTest, const char* searchText, int mode, const char* delim, int tolerance)
+ {
+ if (strlen(szTest) > 0)
+diff -Naur -xdoc -xman -xMANUAL -xREADME -xREADME.DE epgsearch-0.9.22/HISTORY epgsearch-0.9.23-beta1/HISTORY
+--- epgsearch-0.9.22/HISTORY 2007-05-27 20:37:15.000000000 +0200
++++ epgsearch-0.9.23-beta1/HISTORY 2007-06-10 17:26:59.000000000 +0200
+@@ -1,5 +1,12 @@
+ VDR Plugin 'epgsearch' Revision History
+ ---------------------------------------
++
++2007-xx-xx: Version 0.9.23
++fixes:
++- fixed a bug in timer creation after navigating through the summary menu,
++ thanks to Rolf Ahrenberg for reporting
++- Label "Record" or "Timer" in menu summary fixed with respect to existing timer.
++
+ 2007-05-27: Version 0.9.22
+ new:
+ - new option in timer conflict check "When a recording starts":
+diff -Naur -xdoc -xman -xMANUAL -xREADME -xREADME.DE epgsearch-0.9.22/HISTORY.DE epgsearch-0.9.23-beta1/HISTORY.DE
+--- epgsearch-0.9.22/HISTORY.DE 2007-05-27 20:36:43.000000000 +0200
++++ epgsearch-0.9.23-beta1/HISTORY.DE 2007-06-10 17:26:59.000000000 +0200
+@@ -1,5 +1,12 @@
+ VDR Plugin 'epgsearch' Revision History
+ ---------------------------------------
++2007-xx-xx: Version 0.9.23
++fixes:
++- Fehler beim Anlegen eines Timers korrigiert, nachdem man durch die Inhalts-
++ angabe navigiert hat, danke an Rolf Ahrenberg für den Hinweis.
++- Beschriftung "Aufnehmen" bzw. "Timer" im Menü Inhaltsangabe je nach vorhandenem
++ Timer korrigiert.
++
+ 2007-05-27: Version 0.9.22
+ neu:
+ - neue Option in der Timerkonflikt-Prüfung "Beim Beginn einer Aufnahme":
+diff -Naur -xdoc -xman -xMANUAL -xREADME -xREADME.DE epgsearch-0.9.22/menu_event.c epgsearch-0.9.23-beta1/menu_event.c
+--- epgsearch-0.9.22/menu_event.c 2007-05-27 20:05:36.000000000 +0200
++++ epgsearch-0.9.23-beta1/menu_event.c 2007-06-10 17:27:00.000000000 +0200
+@@ -77,13 +77,19 @@
+ cEventObj* eventObjPrev = GetPrev(event);
+ cEventObj* eventObjNext = GetNext(event);
+
++ int timerMatch = tmNone;
++ Timers.GetMatch(event, &timerMatch);
++ const char* szRed = tr("Button$Record");
++ if (timerMatch == tmFull)
++ szRed = tr("Button$Timer");
++
+ if (surfMode == SurfModeUnknown)
+- SetHelp(tr("Button$Record"), eventObjPrev ? "<<":NULL, eventObjNext ? ">>":NULL, canSwitch ? tr("Button$Switch") : NULL);
++ SetHelp(szRed, eventObjPrev ? "<<":NULL, eventObjNext ? ">>":NULL, canSwitch ? tr("Button$Switch") : NULL);
+ else if (surfMode == SurfModeTime)
+ {
+ if (eventObjPrev && eventObjPrev->Event()) szGreen = strdup(GETTIMESTRING(eventObjPrev->Event()));
+ if (eventObjNext && eventObjNext->Event()) szYellow = strdup(GETTIMESTRING(eventObjNext->Event()));
+- SetHelp(tr("Button$Record"), szGreen, szYellow, canSwitch ? tr("Button$Switch") : NULL);
++ SetHelp(szRed, szGreen, szYellow, canSwitch ? tr("Button$Switch") : NULL);
+ }
+ else if (surfMode == SurfModeChannel)
+ {
+@@ -91,7 +97,7 @@
+ szGreen = strdup(CHANNELNAME(Channels.GetByChannelID(eventObjPrev->Event()->ChannelID(), true, true)));
+ if (eventObjNext && eventObjNext->Event())
+ szYellow = strdup(CHANNELNAME(Channels.GetByChannelID(eventObjNext->Event()->ChannelID(), true, true)));
+- SetHelp(tr("Button$Record"), szGreen, szYellow, canSwitch ? tr("Button$Switch") : NULL);
++ SetHelp(szRed, szGreen, szYellow, canSwitch ? tr("Button$Switch") : NULL);
+ }
+ }
+ }
+diff -Naur -xdoc -xman -xMANUAL -xREADME -xREADME.DE epgsearch-0.9.22/menu_main.c epgsearch-0.9.23-beta1/menu_main.c
+--- epgsearch-0.9.22/menu_main.c 2007-05-21 20:17:21.000000000 +0200
++++ epgsearch-0.9.23-beta1/menu_main.c 2007-06-10 17:27:00.000000000 +0200
+@@ -260,6 +260,21 @@
+ return osContinue;
+ }
+
++void cMenuSearchMain::UpdateCurrent()
++{
++ // navigation in summary could have changed current item, so update it
++ cEventObj* cureventObj = eventObjects.GetCurrent();
++ if (cureventObj && cureventObj->Event())
++ for (cMenuMyScheduleItem *item = (cMenuMyScheduleItem *)First(); item; item = (cMenuMyScheduleItem *)Next(item))
++ if (item->event == cureventObj->Event())
++ {
++ cureventObj->Select(false);
++ SetCurrent(item);
++ Display();
++ break;
++ }
++}
++
+ eOSState cMenuSearchMain::ProcessKey(eKeys Key)
+ {
+ bool HadSubMenu = HasSubMenu();
+@@ -272,6 +287,7 @@
+ }
+
+ if (!HasSubMenu() && HadSubMenu)
++ UpdateCurrent();
+ {
+ // navigation in summary could have changed current item, so update it
+ cEventObj* cureventObj = eventObjects.GetCurrent();
+@@ -313,8 +329,9 @@
+ case kRecord:
+ case kRed:
+ if(HasSubMenu()) {
+- state = Record();
+- break;
++ UpdateCurrent();
++ state = Record();
++ break;
+ }
+ if (Count())
+ {
+@@ -427,8 +444,11 @@
+ }
+ break;
+ case kBlue:
+- if (HasSubMenu())
+- return Switch();
++ if (HasSubMenu())
++ {
++ UpdateCurrent();
++ return Switch();
++ }
+ if (EPGSearchConfig.bluekeymode==toggleKeys)
+ return Switch();
+ else
+diff -Naur -xdoc -xman -xMANUAL -xREADME -xREADME.DE epgsearch-0.9.22/menu_main.h epgsearch-0.9.23-beta1/menu_main.h
+--- epgsearch-0.9.22/menu_main.h 2007-05-18 23:14:13.000000000 +0200
++++ epgsearch-0.9.23-beta1/menu_main.h 2007-06-10 17:27:00.000000000 +0200
+@@ -30,6 +30,7 @@
+ eOSState Shift(int iMinutes);
+ eOSState ShowSummary();
+ bool Update(void);
++ void UpdateCurrent();
+ };
+
+ #endif
+diff -Naur -xdoc -xman -xMANUAL -xREADME -xREADME.DE epgsearch-0.9.22/menu_myedittimer.c epgsearch-0.9.23-beta1/menu_myedittimer.c
+--- epgsearch-0.9.22/menu_myedittimer.c 2007-03-28 20:43:21.000000000 +0200
++++ epgsearch-0.9.23-beta1/menu_myedittimer.c 2007-06-10 20:18:45.000000000 +0200
+@@ -336,7 +336,11 @@
+ asprintf(&cmdbuf, "NEWT %d:%d:%s:%04d:%04d:%d:%d:%s%s%s:%s",
+ flags,
+ ch->Number(),
+- PRINTDAY(day, weekdays),
++#if VDRVERSNUM < 10503
++ PRINTDAY(day, weekdays),
++#else
++ PRINTDAY(day, weekdays, true),
++#endif
+ start,
+ stop,
+ priority,
+@@ -350,7 +354,11 @@
+ timer->Index()+1,
+ flags,
+ ch->Number(),
+- PRINTDAY(day, weekdays),
++#if VDRVERSNUM < 10503
++ PRINTDAY(day, weekdays),
++#else
++ PRINTDAY(day, weekdays, true),
++#endif
+ start,
+ stop,
+ priority,
+diff -Naur -xdoc -xman -xMANUAL -xREADME -xREADME.DE epgsearch-0.9.22/searchtimer_thread.c epgsearch-0.9.23-beta1/searchtimer_thread.c
+--- epgsearch-0.9.22/searchtimer_thread.c 2007-03-27 19:51:09.000000000 +0200
++++ epgsearch-0.9.23-beta1/searchtimer_thread.c 2007-06-10 20:20:40.000000000 +0200
+@@ -584,7 +584,11 @@
+ asprintf(&cmdbuf, "NEWT %d:%d:%s:%s:%s:%d:%d:%s:%s",
+ Flags,
+ Timer->Channel()->Number(),
++#if VDRVERSNUM < 10503
+ *Timer->PrintDay(start, Timer->WeekDays()),
++#else
++ *Timer->PrintDay(start, Timer->WeekDays(), true),
++#endif
+ bufStart,
+ bufEnd,
+ Prio,
+@@ -596,7 +600,11 @@
+ index,
+ Flags,
+ Timer->Channel()->Number(),
++#if VDRVERSNUM < 10503
+ *Timer->PrintDay(start, Timer->WeekDays()),
++#else
++ *Timer->PrintDay(start, Timer->WeekDays(), true),
++#endif
+ bufStart,
+ bufEnd,
+ Prio,
More information about the pkg-vdr-dvb-changes
mailing list