From patchwork Sat Dec 8 16:34:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Rohdewald X-Patchwork-Id: 15802 Received: from localhost ([127.0.0.1] helo=www.linuxtv.org) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1ThNMl-00035h-BG; Sat, 08 Dec 2012 17:35:03 +0100 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1ThNMM-00035L-Fp for vdr@linuxtv.org; Sat, 08 Dec 2012 17:35:02 +0100 X-tubIT-Incoming-IP: 81.169.146.162 Received: from mo-p00-ob.rzone.de ([81.169.146.162]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtps [TLSv1:AES256-SHA:256] for id 1ThNMM-0002ig-Dd; Sat, 08 Dec 2012 17:34:38 +0100 X-RZG-AUTH: :O2MIc0epdfgAjoV+frHI3UhxNCLBO5P+YS73lHhJYRD2uAuzaM+5N8MToOrpKnal X-RZG-CLASS-ID: mo00 Received: from i5.rohdewald.de (p5B3E03DB.dip0.t-ipconnect.de [91.62.3.219]) by smtp.strato.de (jored mo11) (RZmta 31.7 DYNA|AUTH) with ESMTPA id 007204oB8FTmoR ; Sat, 8 Dec 2012 17:34:37 +0100 (CET) Received: from i5.localnet (localhost.localdomain [127.0.0.1]) by i5.rohdewald.de (Postfix) with ESMTP id 46C715E08C2; Sat, 8 Dec 2012 17:34:38 +0100 (CET) From: Wolfgang Rohdewald To: vdr@linuxtv.org Date: Sat, 08 Dec 2012 17:34:38 +0100 Message-ID: <1534139.vJxI3qJYgp@i5> User-Agent: KMail/4.9.4 (Linux/3.5.0-19-generic; KDE/4.9.4; x86_64; ; ) In-Reply-To: <50C326B6.3090008@tvdr.de> References: <50C326B6.3090008@tvdr.de> MIME-Version: 1.0 X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY shortcircuit=no autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on i5 X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.12.8.143318 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' RCVD_FROM_IP_DATE 0.1, HTML_00_01 0.05, HTML_00_10 0.05, MIME_TEXT_ONLY_MP_MIXED 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_5000_5999 0, BODY_SIZE_7000_LESS 0, INVALID_MSGID_NO_FQDN 0, NO_URI_FOUND 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CT 0, __CTE 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __HAS_FROM 0, __HAS_MSGID 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __USER_AGENT 0' X-LSpam-Score: -1.1 (-) X-LSpam-Report: No, score=-1.1 required=5.0 tests=BAYES_00=-1.9, RDNS_NONE=0.793 autolearn=no Subject: Re: [vdr] [ANNOUNCE] VDR developer version 1.7.33 X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: vdr-bounces@linuxtv.org Errors-To: vdr-bounces@linuxtv.org On Saturday 08 December 2012 12:38:30 Klaus Schmidinger wrote: > The changes since version 1.7.32: one more change relevant for plugins, missing in the changelog: the signature of Matches and GetMatch in timers.h appending a patch for epgsearch needed for this change. diff --git a/epgsearchsvdrp.c b/epgsearchsvdrp.c index 4edc640..59c4d1c 100644 --- a/epgsearchsvdrp.c +++ b/epgsearchsvdrp.c @@ -560,7 +560,7 @@ cString cPluginEpgsearch::SVDRPCommand(const char *Command, const char *Option, strftime(bufStart, sizeof(bufStart), "%H%M", localtime_r(&start, &tm_r)); strftime(bufEnd, sizeof(bufEnd), "%H%M", localtime_r(&stop, &tm_r)); - int timerMatch; + eTimerMatch timerMatch; bool hasTimer = false; if (Timers.GetMatch(pEvent, &timerMatch)) hasTimer = (timerMatch == tmFull); diff --git a/mail.c b/mail.c index 0738fae..0cb9934 100644 --- a/mail.c +++ b/mail.c @@ -49,7 +49,7 @@ string cMailTimerNotification::Format(const string& templ) const const cEvent* pEvent = GetEvent(); if (!pEvent) return ""; - int TimerMatch = tmNone; + eTimerMatch TimerMatch = tmNone; cTimer* pTimer = Timers.GetMatch(pEvent, &TimerMatch); if (!pTimer) return ""; diff --git a/menu_commands.c b/menu_commands.c index 9d33863..309aef5 100644 --- a/menu_commands.c +++ b/menu_commands.c @@ -121,7 +121,7 @@ eOSState cMenuSearchCommands::Record(void) { if (!event) return osContinue; - int timerMatch = tmNone; + eTimerMatch timerMatch = tmNone; cTimer* timer = Timers.GetMatch(event, &timerMatch); if (timerMatch == tmFull) { diff --git a/menu_event.c b/menu_event.c index b1e8880..a51f56e 100644 --- a/menu_event.c +++ b/menu_event.c @@ -95,7 +95,7 @@ void cMenuEventSearch::Set() cEventObj* eventObjPrev = GetPrev(event); cEventObj* eventObjNext = GetNext(event); - int timerMatch = tmNone; + eTimerMatch timerMatch = tmNone; Timers.GetMatch(event, &timerMatch); const char* szRed = trVDR("Button$Record"); if (timerMatch == tmFull) diff --git a/menu_main.c b/menu_main.c index 830f43a..a38e640 100644 --- a/menu_main.c +++ b/menu_main.c @@ -184,7 +184,7 @@ eOSState cMenuSearchMain::Record(void) if (item) { if (item->timerMatch == tmFull) { - int tm = tmNone; + eTimerMatch tm = tmNone; cTimer *timer = Timers.GetMatch(item->event, &tm); if (timer) { diff --git a/menu_searchresults.c b/menu_searchresults.c index b6511b9..6c7c261 100644 --- a/menu_searchresults.c +++ b/menu_searchresults.c @@ -77,7 +77,7 @@ bool cMenuSearchResultsItem::Update(bool Force) bool result = false; - int OldTimerMatch = timerMatch; + eTimerMatch OldTimerMatch = timerMatch; bool OldInSwitchList = inSwitchList; bool hasMatch = false; cTimer* timer = NULL; @@ -176,7 +176,7 @@ cMenuSearchResultsItem::cMenuSearchResultsItem(cRecording *Recording) previewTimer = false; episodeOnly = false; menuTemplate = NULL; - timerMatch = 0; + timerMatch = tmNone; inSwitchList = false; event = NULL; search = NULL; @@ -228,7 +228,7 @@ eOSState cMenuSearchResults::Record(void) if (item) { if (item->timerMatch == tmFull) { - int tm = tmNone; + eTimerMatch tm = tmNone; cTimer *timer = Timers.GetMatch(item->event, &tm); if (timer) { diff --git a/menu_searchresults.h b/menu_searchresults.h index fef2055..61634db 100644 --- a/menu_searchresults.h +++ b/menu_searchresults.h @@ -50,7 +50,7 @@ class cMenuSearchResultsItem : public cOsdItem { bool episodeOnly; cMenuTemplate* menuTemplate; public: - int timerMatch; + eTimerMatch timerMatch; bool inSwitchList; const cEvent *event; const cSearchExt* search; diff --git a/menu_whatson.c b/menu_whatson.c index e411b81..d380f13 100644 --- a/menu_whatson.c +++ b/menu_whatson.c @@ -77,7 +77,7 @@ bool cMenuMyScheduleItem::Update(bool Force) bool result = false; - int OldTimerMatch = timerMatch; + eTimerMatch OldTimerMatch = timerMatch; bool OldInSwitchList = inSwitchList; bool hasMatch = false; cTimer* timer = NULL; @@ -520,7 +520,7 @@ eOSState cMenuWhatsOnSearch::Record(void) { if (item->timerMatch == tmFull) { - int tm = tmNone; + eTimerMatch tm = tmNone; cTimer *timer = Timers.GetMatch(item->event, &tm); if (timer) { diff --git a/menu_whatson.h b/menu_whatson.h index bc65a7c..fa0f3ec 100644 --- a/menu_whatson.h +++ b/menu_whatson.h @@ -35,7 +35,7 @@ public: const cEvent *event; cChannel *channel; showMode mode; - int timerMatch; + eTimerMatch timerMatch; bool inSwitchList; cMenuTemplate* menuTemplate; diff --git a/services.c b/services.c index 985763c..71ecc22 100644 --- a/services.c +++ b/services.c @@ -143,7 +143,7 @@ std::list cEpgsearchServiceHandler::TranslateResults(cSearchResults strftime(bufStart, sizeof(bufStart), "%H%M", localtime_r(&start, &tm_r)); strftime(bufEnd, sizeof(bufEnd), "%H%M", localtime_r(&stop, &tm_r)); - int timerMatch; + eTimerMatch timerMatch; bool hasTimer = false; if (Timers.GetMatch(pEvent, &timerMatch)) hasTimer = (timerMatch == tmFull);