frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Implemented instant recording of only the present event

Browse Source
This commit is contained in:
Klaus Schmidinger 2012-09-15 13:57:39 +02:00
parent c9ac6f5196
commit 050b7cdebf
35 changed files with 165 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -2741,6 +2741,7 @@ Francesco Saverio Schiavarelli <fschiava@libero.it>
Matti Lehtimäki <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 Austermühle <au@hcsd.de>
for suggesting to flush the file in cSafeFile::Close()

5
HISTORY
View File

@ -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
Lehtimäki).

5
MANUAL
View File

@ -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.

4
config.c
View File

@ -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;

3
config.h
View File

@ -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

4
menu.c
View File

@ -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));

5
po/ar.po
View File

@ -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 "اقصى حجم لملف الفيديو ب م ب"

5
po/ca_ES.po
View File

@ -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 instant
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Temps de gravació instantània (min)"
msgid "Setup.Recording$present event"
msgstr ""
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Mida màxima de l'arxiu (MB)"

5
po/cs_CZ.po
View File

@ -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)"

5
po/da_DK.po
View File

@ -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 "Længde af direkte optagelse (min)"
msgid "Setup.Recording$present event"
msgstr ""
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Max. video filstørrelse (MB)"

5
po/de_DE.po
View File

@ -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. Videodateigröße (MB)"

5
po/el_GR.po
View File

@ -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)"

5
po/es_ES.po
View File

@ -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 grabación inmediata (min)"
msgid "Setup.Recording$present event"
msgstr ""
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Tamaño máximo de fichero (MB)"

5
po/et_EE.po
View File

@ -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)"

3
po/fi_FI.po
View File

@ -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)"

5
po/fr_FR.po
View File

@ -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. imm
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Durée enregistr. immédiat (min)"
msgid "Setup.Recording$present event"
msgstr ""
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Taille maxi des fichiers (Mo)"

5
po/hr_HR.po
View File

@ -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 velièina datoteke (MB)"

5
po/hu_HU.po
View File

@ -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: István Füley <ifuley@tigercomp.ro>\n"
"Language-Team: Hungarian <vdr@linuxtv.org>\n"
@ -1081,6 +1081,9 @@ msgstr "Direktfelv
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Direktfelvétel idõtartama (perc)"
msgid "Setup.Recording$present event"
msgstr ""
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Max. video file méret (MB)"

5
po/it_IT.po
View File

@ -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)"

5
po/lt_LT.po
View File

@ -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)"

5
po/mk_MK.po
View File

@ -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)"

5
po/nl_NL.po
View File

@ -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)"

5
po/nn_NO.po
View File

@ -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 størrelse på videofiler (MB)"

5
po/pl_PL.po
View File

@ -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)"

5
po/pt_PT.po
View File

@ -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 grava
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Validade da gravação instantânea (min)"
msgid "Setup.Recording$present event"
msgstr ""
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Tamanho máximo do ficheiro de vídeo (MB)"

5
po/ro_RO.po
View File

@ -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
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 fiºierului video (MB)"

5
po/ru_RU.po
View File

@ -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 "¼ÐÚá. àÐ×ÜÕà ÒØÔÕÞäÐÙÛÐ (¼Ñ)"

5
po/sk_SK.po
View File

@ -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
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Då¾ka okam¾itého nahrávania (min)"
msgid "Setup.Recording$present event"
msgstr ""
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maximálna veµkos» nahrávky (MB)"

5
po/sl_SI.po
View File

@ -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 "Najveèja velikost datoteke (MB)"

5
po/sr_SR.po
View File

@ -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. velièina datoteke (MB)"

5
po/sv_SE.po
View File

@ -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 längd (min)"
msgid "Setup.Recording$present event"
msgstr ""
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maximal filstorlek för inspelning (MB)"

5
po/tr_TR.po
View File

@ -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 Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: Turkish <vdr@linuxtv.org>\n"
@ -1077,6 +1077,9 @@ msgstr "Derhal
msgid "Setup.Recording$Instant rec. time (min)"
msgstr "Derhal çekim süresi (dak)"
msgid "Setup.Recording$present event"
msgstr ""
msgid "Setup.Recording$Max. video file size (MB)"
msgstr "Maksimum Video kütük büyüklügü (MB)"

5
po/uk_UA.po
View File

@ -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 "Макс. размір відеофайлу (Мб)"

5
po/zh_CN.po
View File

@ -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)"

47
timers.c
View File

@ -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)