Project

General

Profile

Feature #1913 » epgsearch-inactive-records-v1.diff

lhanisch, 01/10/2015 05:10 PM

View differences:

epgsearchext.c
return;
LogFile.Log(2,"analysing repeats for search timer '%s'...", search);
if (action != searchTimerActionRecord)
if ((action != searchTimerActionRecord) && (action != searchTimerActionInactiveRecord))
{
LogFile.Log(3,"search timer not set to 'record', so skip all");
return;
......
cSearchResult* pResultObj = NULL;
for (pResultObj = pResults->First(); pResultObj; pResultObj = pResults->Next(pResultObj))
{
if (action != searchTimerActionRecord) // only announce if there is no timer for the event
if ((action != searchTimerActionRecord) && (action != searchTimerActionInactiveRecord)) // only announce if there is no timer for the event
{
pResultObj->needsTimer = false;
continue;
epgsearchext.h
searchTimerActionAnnounceViaOSD,
searchTimerActionSwitchOnly,
searchTimerActionAnnounceAndSwitch,
searchTimerActionAnnounceViaMail
searchTimerActionAnnounceViaMail,
searchTimerActionInactiveRecord
} searchTimerAction;
class cSearchExt;
menu_searchedit.c
SearchTimerModes[2] = strdup(tr("Switch only"));
SearchTimerModes[3] = strdup(tr("Announce and switch"));
SearchTimerModes[4] = strdup(tr("Announce by mail"));
SearchTimerModes[5] = strdup(tr("Inactive record"));
BlacklistModes[0] = strdup(tr("only globals"));
BlacklistModes[1] = strdup(tr("Selection"));
......
Add(new cMenuEditStraItem( tr("Use as search timer"), &data.useAsSearchTimer, 3, SearchActiveModes));
if (data.useAsSearchTimer)
{
Add(new cMenuEditStraItem(IndentMenuItem(tr("Action")), &data.action, 5, SearchTimerModes));
Add(new cMenuEditStraItem(IndentMenuItem(tr("Action")), &data.action, 6, SearchTimerModes));
if (data.action == searchTimerActionSwitchOnly)
{
Add(new cMenuEditIntItem(IndentMenuItem(tr("Switch ... minutes before start")), &data.switchMinsBefore, 0, 99));
......
Add(new cMenuEditIntItem(IndentMenuItem(tr("Ask ... minutes before start")), &data.switchMinsBefore, 0, 99));
Add(new cMenuEditBoolItem(IndentMenuItem(tr("Unmute sound")), &data.unmuteSoundOnSwitch, trVDR("no"), trVDR("yes")));
}
if (data.action == searchTimerActionRecord)
if ((data.action == searchTimerActionRecord) || (data.action == searchTimerActionInactiveRecord))
{
Add(new cMenuEditBoolItem( tr(" Series recording"), &data.useEpisode, trVDR("no"), trVDR("yes")));
Add(new cMenuEditStrItem(IndentMenuItem(tr("Directory")), data.directory, sizeof(data.directory), tr(AllowedChars)));
......
Add(new cMenuEditIntItem(IndentMenuItem(trVDR("Setup.Recording$Margin at stop (min)")), &data.MarginStop, -INT_MAX, INT_MAX));
Add(new cMenuEditBoolItem(IndentMenuItem(tr("VPS")), &data.useVPS, trVDR("no"), trVDR("yes")));
}
if (data.action == searchTimerActionRecord)
if ((data.action == searchTimerActionRecord) || (data.action == searchTimerActionInactiveRecord))
{
Add(new cMenuEditStraItem(IndentMenuItem(tr("Auto delete")), &data.delMode, 3, DelModes));
if (data.delMode == 1)
......
free(SearchModes[i]);
for(i=0; i<=7; i++)
free(DaysOfWeek[i]);
for(i=0; i<=2; i++)
for(i=0; i<=3; i++)
free(UseChannelSel[i]);
for(i=0; i<=2; i++)
for(i=0; i<=5; i++)
free(SearchTimerModes[i]);
for(i=0; i<=3; i++)
free(BlacklistModes[i]);
menu_searchedit.h
char *SearchModes[6];
char *DaysOfWeek[8];
char *UseChannelSel[4];
char *SearchTimerModes[5];
char *SearchTimerModes[6];
char *BlacklistModes[4];
char *DelModes[3];
char *SearchActiveModes[3];
po/ca_ES.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
"Language-Team: Catalan <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/cs_CZ.po
msgstr ""
"Project-Id-Version: VDR 1.7.21\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2011-10-31 20:21+0200\n"
"Last-Translator: Radek Stastny <dedkus@gmail.com>\n"
"Language-Team: Czech <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr "Informovat mailem"
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr "globální"
po/da_DK.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: Danish <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/de_DE.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
"Language-Team: German <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr "per Mail ankündigen"
msgid "Inactive record"
msgstr "inaktive Aufnahme"
msgid "only globals"
msgstr "nur globale"
po/el_GR.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: Greek <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/es_ES.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-11-18 20:09+0200\n"
"Last-Translator: bittor from open7x0.org <bittor7x0 _at_ gmail.com>\n"
"Language-Team: Spanish <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr "Sólo avisar"
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/et_EE.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
"Language-Team: Estonian <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/fi_FI.po
msgstr ""
"Project-Id-Version: EPGSearch 0.9.25\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2011-01-04 21:07+0200\n"
"Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
"Language-Team: Finnish <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr "muistutus sähköpostitse"
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr "vain globaalit"
po/fr_FR.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2008-04-30 08:36+0200\n"
"Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n"
"Language-Team: French <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr "Annoncer seulement début d'une programme"
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/hr_HR.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
"Language-Team: Croatian <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/hu_HU.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
"Language-Team: Hungarian <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/it_IT.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2011-07-17 17:46+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr "Annuncia tramite email"
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr "solo globali"
po/lt_LT.po
msgstr ""
"Project-Id-Version: VDR 1.7.10\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
"Language-Team: Lithuanian <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr "Perspėti per emailą"
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/nl_NL.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
"Language-Team: Dutch <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr "Alleen aankondigen (geen timer)"
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/nn_NO.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/pl_PL.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: Polish <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/pt_PT.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
"Language-Team: Portuguese <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/ro_RO.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: Romanian <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/ru_RU.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
"Language-Team: Russian <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/sk_SK.po
msgstr ""
"Project-Id-Version: epgsearch\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2009-11-02 09:40+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: Slovak <hrala.milan@gmail.com>\n"
......
msgid "Announce by mail"
msgstr "Iba oznámiť"
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/sl_SI.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: Slovenian <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/sv_SE.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
"Language-Team: Swedish <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
po/tr_TR.po
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <see README>\n"
"POT-Creation-Date: 2013-03-05 20:24+0100\n"
"POT-Creation-Date: 2015-01-10 16:38+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: Turkish <vdr@linuxtv.org>\n"
......
msgid "Announce by mail"
msgstr ""
msgid "Inactive record"
msgstr ""
msgid "only globals"
msgstr ""
searchtimer_thread.c
continue;
// ignore manual timers if this search could modify them
if (searchExt->action == searchTimerActionRecord && TriggeredFromSearchTimerID(ti) == -1) // manual timer
if ((searchExt->action == searchTimerActionRecord || searchExt->action == searchTimerActionInactiveRecord) && TriggeredFromSearchTimerID(ti) == -1) // manual timer
continue;
if (UseVPS && ti->HasFlags(tfVps))
......
else
Flags = 1; // don't use VPS, if not set in this search
if (searchExt->action == searchTimerActionInactiveRecord)
Flags &= ~tfActive;
// already done the same timer?
if (!EPGSearchConfig.TimerProgRepeat && index == 0 && TimersDone.InList(start, stop, pEvent, -1))
{
(1-1/2)