summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY5
-rw-r--r--MANUAL5
-rw-r--r--config.c4
-rw-r--r--config.h3
-rw-r--r--menu.c4
-rw-r--r--po/ar.po5
-rw-r--r--po/ca_ES.po5
-rw-r--r--po/cs_CZ.po5
-rw-r--r--po/da_DK.po5
-rw-r--r--po/de_DE.po5
-rw-r--r--po/el_GR.po5
-rw-r--r--po/es_ES.po5
-rw-r--r--po/et_EE.po5
-rw-r--r--po/fi_FI.po3
-rw-r--r--po/fr_FR.po5
-rw-r--r--po/hr_HR.po5
-rw-r--r--po/hu_HU.po5
-rw-r--r--po/it_IT.po5
-rw-r--r--po/lt_LT.po5
-rw-r--r--po/mk_MK.po5
-rw-r--r--po/nl_NL.po5
-rw-r--r--po/nn_NO.po5
-rw-r--r--po/pl_PL.po5
-rw-r--r--po/pt_PT.po5
-rw-r--r--po/ro_RO.po5
-rw-r--r--po/ru_RU.po5
-rw-r--r--po/sk_SK.po5
-rw-r--r--po/sl_SI.po5
-rw-r--r--po/sr_SR.po5
-rw-r--r--po/sv_SE.po5
-rw-r--r--po/tr_TR.po5
-rw-r--r--po/uk_UA.po5
-rw-r--r--po/zh_CN.po5
-rw-r--r--timers.c47
35 files changed, 165 insertions, 42 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ec8163ed..202002f4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2741,6 +2741,7 @@ Francesco Saverio Schiavarelli <fschiava@libero.it>
Matti Lehtimki <matti.lehtimaki@gmail.com>
for implementing the setup option "Miscellaneous/Channels wrap"
for reporting a missing change from -O2 to -O3 in Make.config.template
+ for a patch that was used to implement instant recording of only the present event
Stephan Austermhle <au@hcsd.de>
for suggesting to flush the file in cSafeFile::Close()
diff --git a/HISTORY b/HISTORY
index d67c09e1..beab09b9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7235,9 +7235,12 @@ Video Disk Recorder Revision History
function in order to make use of this new feature. See, for instance, the function
cSkinClassicDisplayMenu::SetButtons() in skinclassic.c for details.
-2012-09-14: Version 1.7.31
+2012-09-15: Version 1.7.31
- If regenerating an index file fails and no data is written to the file, VDR now
reports this error and removes the empty index file.
- Fixed mapping the frame type bits when detecting independent frames in MPEG 4
video (reported by Reinhard Nissl).
+- The setup parameter "Recording/Instant rec. time (min)" can now be set to '0',
+ which means to record only the currently running event (based on a patch from Matti
+ Lehtimki).
diff --git a/MANUAL b/MANUAL
index 56a304df..fb28462b 100644
--- a/MANUAL
+++ b/MANUAL
@@ -837,6 +837,11 @@ Version 1.6
Default is 180 minutes (3 hours). The stop time of an
instant recording can be modified at any time by editing
the respective timer in the "Timers" menu.
+ If this parameter is set to 0 ("present event"), only the
+ currently running event will be recorded, using the stop
+ margin and VPS setting as configured.
+ Note that this parameter is also used when pausing live
+ video!
Max. video file size = 2000
The maximum size of a single recorded video file in MB.
diff --git a/config.c b/config.c
index 3fb4d6dc..383bb61f 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c 2.27 2012/09/09 12:58:23 kls Exp $
+ * $Id: config.c 2.28 2012/09/15 11:52:03 kls Exp $
*/
#include "config.h"
@@ -383,7 +383,7 @@ cSetup::cSetup(void)
MenuKeyCloses = 0;
MarkInstantRecord = 1;
strcpy(NameInstantRecord, "TITLE EPISODE");
- InstantRecordTime = 180;
+ InstantRecordTime = DEFINSTRECTIME;
LnbSLOF = 11700;
LnbFrequLo = 9750;
LnbFrequHi = 10600;
diff --git a/config.h b/config.h
index c0b69830..a07310ee 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 2.52 2012/09/13 11:12:07 kls Exp $
+ * $Id: config.h 2.53 2012/09/15 11:51:54 kls Exp $
*/
#ifndef __CONFIG_H
@@ -42,6 +42,7 @@
#define TRANSFERPRIORITY (LIVEPRIORITY - 1) // priority used for actual local Transfer Mode
#define IDLEPRIORITY (MINPRIORITY - 1) // priority of an idle device
#define MAXLIFETIME 99
+#define DEFINSTRECTIME 180 // default instant recording time (minutes)
#define MINOSDWIDTH 480
#define MAXOSDWIDTH 1920
diff --git a/menu.c b/menu.c
index 1b9346c3..cdd9d3ac 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 2.60 2012/09/09 12:23:00 kls Exp $
+ * $Id: menu.c 2.61 2012/09/15 11:45:28 kls Exp $
*/
#include "menu.h"
@@ -3118,7 +3118,7 @@ cMenuSetupRecord::cMenuSetupRecord(void)
Add(new cMenuEditIntItem( tr("Setup.Recording$VPS margin (s)"), &data.VpsMargin, 0));
Add(new cMenuEditBoolItem(tr("Setup.Recording$Mark instant recording"), &data.MarkInstantRecord));
Add(new cMenuEditStrItem( tr("Setup.Recording$Name instant recording"), data.NameInstantRecord, sizeof(data.NameInstantRecord)));
- Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"), &data.InstantRecordTime, 1, MAXINSTANTRECTIME));
+ Add(new cMenuEditIntItem( tr("Setup.Recording$Instant rec. time (min)"), &data.InstantRecordTime, 0, MAXINSTANTRECTIME, tr("Setup.Recording$present event")));
Add(new cMenuEditIntItem( tr("Setup.Recording$Max. video file size (MB)"), &data.MaxVideoFileSize, MINVIDEOFILESIZE, MAXVIDEOFILESIZETS));
Add(new cMenuEditBoolItem(tr("Setup.Recording$Split edited files"), &data.SplitEditedFiles));
Add(new cMenuEditStraItem(tr("Setup.Recording$Delete timeshift recording"),&data.DelTimeshiftRec, 3, delTimeshiftRecTexts));
diff --git a/po/ar.po b/po/ar.po
index 7282e0a5..14e8126b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2008-10-16 11:16-0400\n"
"Last-Translator: Osama Alrawab <alrawab@hotmail.com>\n"
"Language-Team: Arabic <ar@li.org>\n"
@@ -1102,6 +1102,9 @@ msgstr "اسم التسجيل الفورى"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "مدة التسجيل الفورى بالدقيقة"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "اقصى حجم لملف الفيديو ب م ب"
diff --git a/po/ca_ES.po b/po/ca_ES.po
index a66c9a71..c67265b1 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Catalan <vdr@linuxtv.org>\n"
@@ -1080,6 +1080,9 @@ msgstr "Anomenar gravacions instantnies"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Temps de gravaci instantnia (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Mida mxima de l'arxiu (MB)"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index baadee4e..55053f95 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.14\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2010-05-06 11:00+0200\n"
"Last-Translator: Radek Šťastný <dedkus@gmail.com>\n"
"Language-Team: Czech <vdr@linuxtv.org>\n"
@@ -1079,6 +1079,9 @@ msgstr "Pojmenovat okamžité nahrávky"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Délka okamžitého nahrávání (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maximální velikost nahrávky (MB)"
diff --git a/po/da_DK.po b/po/da_DK.po
index 3283eba2..fac58003 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: Danish <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Navngiv direkte optagelse"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Lngde af direkte optagelse (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Max. video filstrrelse (MB)"
diff --git a/po/de_DE.po b/po/de_DE.po
index f58128f6..a321b501 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2010-01-16 16:46+0100\n"
"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
"Language-Team: German <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Direktaufzeichnung benennen"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Dauer der Direktaufzeichnung (min)"
+msgid "Setup.Recording$present event"
+msgstr "laufende Sendung"
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Max. Videodateigre (MB)"
diff --git a/po/el_GR.po b/po/el_GR.po
index 27959caa..8936408c 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: Greek <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr " "
msgid "Setup.Recording$Instant rec. time (min)"
msgstr " ()"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr " (MB)"
diff --git a/po/es_ES.po b/po/es_ES.po
index 98ab6346..bc80a117 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2008-03-02 19:02+0100\n"
"Last-Translator: Luca Olivetti <luca@ventoso.org>\n"
"Language-Team: Spanish <vdr@linuxtv.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "Nombrar grabaciones inmediatas"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Tiempo de grabacin inmediata (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Tamao mximo de fichero (MB)"
diff --git a/po/et_EE.po b/po/et_EE.po
index 73feafd1..0dea9992 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Arthur Konovalov <artlov@gmail.com>\n"
"Language-Team: Estonian <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Kiirsalvestuse nimi"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Kiirsalvestuse kestus (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maks. failisuurus (MB)"
diff --git a/po/fi_FI.po b/po/fi_FI.po
index f6f85643..daad22ae 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1080,6 +1080,9 @@ msgstr "Nimeä pikatallenne"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Pikatallennuksen kesto (min)"
+msgid "Setup.Recording$present event"
+msgstr "nykyinen tapahtuma"
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Suurin tiedostokoko (Mt)"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index abdf1a7f..3ca3c06f 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2008-02-27 18:14+0100\n"
"Last-Translator: Jean-Claude Repetto <jc@repetto.org>\n"
"Language-Team: French <vdr@linuxtv.org>\n"
@@ -1083,6 +1083,9 @@ msgstr "Noms enregistr. immdiats"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Dure enregistr. immdiat (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Taille maxi des fichiers (Mo)"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index d81d2421..dcb1a217 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2008-03-17 19:00+0100\n"
"Last-Translator: Adrian Caval <anrxc@sysphere.org>\n"
"Language-Team: Croatian <vdr@linuxtv.org>\n"
@@ -1079,6 +1079,9 @@ msgstr "Imenuj direktno snimanje"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Trajanje direktnog snimanja (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maksimalna veliina datoteke (MB)"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index c4e6db03..c391b67e 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2012-01-02 11:54+0200\n"
"Last-Translator: Istvn Fley <ifuley@tigercomp.ro>\n"
"Language-Team: Hungarian <vdr@linuxtv.org>\n"
@@ -1081,6 +1081,9 @@ msgstr "Direktfelvtel megnevezse"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Direktfelvtel idtartama (perc)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Max. video file mret (MB)"
diff --git a/po/it_IT.po b/po/it_IT.po
index 46f1f500..b63d93d8 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2012-06-06 22:50+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: Italian <vdr@linuxtv.org>\n"
@@ -1084,6 +1084,9 @@ msgstr "Nome reg. immediata"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Durata reg. immediata (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Dim. massima file video (MB)"
diff --git a/po/lt_LT.po b/po/lt_LT.po
index 264eb6d6..95f8e831 100644
--- a/po/lt_LT.po
+++ b/po/lt_LT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.16\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2010-10-30 11:55+0200\n"
"Last-Translator: Valdemaras Pipiras <varas@ambernet.lt>\n"
"Language-Team: Lithuanian <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Rankiniu būdu vykdomų įrašų įvardinimo schama"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Rankiniu būdu vykdomo įrašo laikas (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maks. video failo dydis (MB)"
diff --git a/po/mk_MK.po b/po/mk_MK.po
index 7f54c87b..fd16ec88 100644
--- a/po/mk_MK.po
+++ b/po/mk_MK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR-1.7.14\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2010-03-11 00:54+0100\n"
"Last-Translator: Dimitar Petrovski <dimeptr@gmail.com>\n"
"Language-Team: Macedonian <en@li.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "Име на директно снимање"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Траење на директно снимање (мин)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Максимална големина на датотека (MB)"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 26d569a3..6c3825d9 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2008-02-26 17:20+0100\n"
"Last-Translator: Johan Schuring <johan.schuring@vetteblei.nl>\n"
"Language-Team: Dutch <vdr@linuxtv.org>\n"
@@ -1081,6 +1081,9 @@ msgstr "Naam direkt-opname"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Duur van de directe opname (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maximale omvang video file (MB)"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index a4413868..41ce5c30 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2007-08-12 14:17+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: Norwegian Nynorsk <vdr@linuxtv.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "Navngi direkteopptak"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr ""
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maksimal strrelse p videofiler (MB)"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 3b17abe8..f4c18761 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2008-03-09 12:59+0100\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: Polish <vdr@linuxtv.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "Nazywaj natychm. nagrywanie"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Czas natychm. nagrywania (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maksymalny rozmiar pliku (MB)"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 2026fb84..5cfc2037 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.15\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2010-03-28 22:49+0100\n"
"Last-Translator: Cris Silva <hudokkow@gmail.com>\n"
"Language-Team: Portuguese <vdr@linuxtv.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "Nome da gravao instantnea"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Validade da gravao instantnea (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Tamanho mximo do ficheiro de vdeo (MB)"
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 048c1146..cd638dcd 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.12\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2011-03-10 23:52+0100\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: Romanian <vdr@linuxtv.org>\n"
@@ -1080,6 +1080,9 @@ msgstr "Nume nregistrare imediat"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Timpul de nregistare imediat (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Dimensiune maxim a fiierului video (MB)"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 7a71e604..d8e1e8e1 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2008-12-15 14:37+0100\n"
"Last-Translator: Oleg Roitburd <oleg@roitburd.de>\n"
"Language-Team: Russian <vdr@linuxtv.org>\n"
@@ -1078,6 +1078,9 @@ msgstr " "
msgid "Setup.Recording$Instant rec. time (min)"
msgstr " ()"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr ". ()"
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 3a479cf6..0de2d061 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.16\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2011-02-15 16:29+0100\n"
"Last-Translator: Milan Hrala <hrala.milan@gmail.com>\n"
"Language-Team: Slovak <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Premenova okamit nahrvky"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Dka okamitho nahrvania (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maximlna vekos nahrvky (MB)"
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 5c888f6d..95568682 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2008-02-28 19:44+0100\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: Slovenian <vdr@linuxtv.org>\n"
@@ -1078,6 +1078,9 @@ msgstr "Ime za direktno snemanje"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "as direktnega snemanja (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Najveja velikost datoteke (MB)"
diff --git a/po/sr_SR.po b/po/sr_SR.po
index 7b4e8180..c4149dda 100644
--- a/po/sr_SR.po
+++ b/po/sr_SR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.1\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2011-01-09 15:57+0100\n"
"Last-Translator: Milan Cvijanovi <elcom_cvijo@hotmail.com>\n"
"Language-Team: Serbian <vdr@linuxtv.org>\n"
@@ -1100,6 +1100,9 @@ msgstr "Imenuj trenutno snimanje"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Trajanje trenutnog snimanja (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maks. veliina datoteke (MB)"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index e54b0375..951dd044 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2008-03-12 18:25+0100\n"
"Last-Translator: Magnus Andersson <svankan@bahnhof.se>\n"
"Language-Team: Swedish <vdr@linuxtv.org>\n"
@@ -1080,6 +1080,9 @@ msgstr "Namnge direktinspelning"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Direktinspelning lngd (min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maximal filstorlek fr inspelning (MB)"
diff --git a/po/tr_TR.po b/po/tr_TR.po
index 23598e7a..8b161b3f 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2008-02-28 00:33+0100\n"
"Last-Translator: Oktay Yolgeen <oktay_73@yahoo.de>\n"
"Language-Team: Turkish <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Derhal ekimi isimlendir"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Derhal ekim sresi (dak)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maksimum Video ktk byklg (MB)"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 33db2a0e..45e57ee5 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.7.7\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2010-04-25 16:35+0200\n"
"Last-Translator: Yarema aka Knedlyk <yupadmin@gmail.com>\n"
"Language-Team: Ukrainian <vdr@linuxtv.org>\n"
@@ -1077,6 +1077,9 @@ msgstr "Схема найменувань ручних записів"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Протяжність ручного запису (хв)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Макс. размір відеофайлу (Мб)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d4d97195..4e2b951f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.6.0\n"
"Report-Msgid-Bugs-To: <vdr-bugs@tvdr.de>\n"
-"POT-Creation-Date: 2012-09-13 13:15+0200\n"
+"POT-Creation-Date: 2012-09-15 14:04+0200\n"
"PO-Revision-Date: 2009-09-23 23:50+0800\n"
"Last-Translator: Nan Feng <nfgx@21cn.com>\n"
"Language-Team: Chinese (simplified) <vdr@linuxtv.org>\n"
@@ -1080,6 +1080,9 @@ msgstr "名字直接记录"
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "直接录像时间(min)"
+msgid "Setup.Recording$present event"
+msgstr ""
+
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "最大的视频文件容量 (MB)"
diff --git a/timers.c b/timers.c
index c4f4f7af..7d4c70b1 100644
--- a/timers.c
+++ b/timers.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: timers.c 2.11 2012/06/09 14:37:24 kls Exp $
+ * $Id: timers.c 2.12 2012/09/15 13:34:03 kls Exp $
*/
#include "timers.h"
@@ -32,6 +32,9 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
deferred = 0;
recording = pending = inVpsMargin = false;
flags = tfNone;
+ *file = 0;
+ aux = NULL;
+ event = NULL;
if (Instant)
SetFlags(tfActive | tfInstant);
channel = Channel ? Channel : Channels.GetByNumber(cDevice::CurrentChannel());
@@ -41,15 +44,40 @@ cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
day = SetTime(t, 0);
weekdays = 0;
start = now->tm_hour * 100 + now->tm_min;
- stop = now->tm_hour * 60 + now->tm_min + Setup.InstantRecordTime;
- stop = (stop / 60) * 100 + (stop % 60);
+ stop = 0;
+ if (!Setup.InstantRecordTime && channel) {
+ cSchedulesLock SchedulesLock;
+ if (const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock)) {
+ if (const cSchedule *Schedule = Schedules->GetSchedule(channel)) {
+ if (const cEvent *Event = Schedule->GetPresentEvent()) {
+ time_t tstart = Event->StartTime();
+ time_t tstop = Event->EndTime();
+ if (Event->Vps() && Setup.UseVps) {
+ SetFlags(tfVps);
+ tstart = Event->Vps();
+ }
+ else {
+ tstop += Setup.MarginStop * 60;
+ tstart -= Setup.MarginStart * 60;
+ }
+ day = SetTime(tstart, 0);
+ struct tm *time = localtime_r(&tstart, &tm_r);
+ start = time->tm_hour * 100 + time->tm_min;
+ time = localtime_r(&tstop, &tm_r);
+ stop = time->tm_hour * 100 + time->tm_min;
+ SetEvent(Event);
+ }
+ }
+ }
+ }
+ if (!stop) {
+ stop = now->tm_hour * 60 + now->tm_min + (Setup.InstantRecordTime ? Setup.InstantRecordTime : DEFINSTRECTIME);
+ stop = (stop / 60) * 100 + (stop % 60);
+ }
if (stop >= 2400)
stop -= 2400;
priority = Pause ? Setup.PausePriority : Setup.DefaultPriority;
lifetime = Pause ? Setup.PauseLifetime : Setup.DefaultLifetime;
- *file = 0;
- aux = NULL;
- event = NULL;
if (Instant && channel)
snprintf(file, sizeof(file), "%s%s", Setup.MarkInstantRecord ? "@" : "", *Setup.NameInstantRecord ? Setup.NameInstantRecord : channel->Name());
if (VfatFileSystem && (Utf8StrLen(file) > VFAT_MAX_FILENAME)) {
@@ -66,6 +94,9 @@ cTimer::cTimer(const cEvent *Event)
deferred = 0;
recording = pending = inVpsMargin = false;
flags = tfActive;
+ *file = 0;
+ aux = NULL;
+ event = NULL;
if (Event->Vps() && Setup.UseVps)
SetFlags(tfVps);
channel = Channels.GetByChannelID(Event->ChannelID(), true);
@@ -86,7 +117,6 @@ cTimer::cTimer(const cEvent *Event)
stop -= 2400;
priority = Setup.DefaultPriority;
lifetime = Setup.DefaultLifetime;
- *file = 0;
const char *Title = Event->Title();
if (!isempty(Title))
Utf8Strn0Cpy(file, Event->Title(), sizeof(file));
@@ -95,8 +125,7 @@ cTimer::cTimer(const cEvent *Event)
file[Utf8SymChars(file, VFAT_MAX_FILENAME)] = 0;
dsyslog("timer file name truncated to '%s'", file);
}
- aux = NULL;
- event = NULL; // let SetEvent() be called to get a log message
+ SetEvent(Event);
}
cTimer::cTimer(const cTimer &Timer)
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 09:02:19 +0000