diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 15b4ebf3..99e3cc02 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2341,6 +2341,7 @@ Diego Pierotto Timo Eskola for implementing sending all frames to devices that can handle them in fast forward trick speeds + for implementing the setup option "Recording/Pause key handling" Elias Luttinen for improving the description of where logging goes in the INSTALL file diff --git a/HISTORY b/HISTORY index 36a3da0e..ac5118ca 100644 --- a/HISTORY +++ b/HISTORY @@ -6075,7 +6075,7 @@ Video Disk Recorder Revision History - cFrameDetector::Analyze() now syncs on the TS packet sync bytes (thanks to Oliver Endriss for reporting broken index generation after a buffer overflow). -2009-05-17: Version 1.7.8 +2009-05-21: Version 1.7.8 - Fixed a typo in aspect ratio 2.21:1 (reported by Reinhard Nissl). - The name of the function cDevice::GetVideoSize() wasn't very well chosen @@ -6103,3 +6103,6 @@ Video Disk Recorder Revision History (suggested by Christoph Haubrich). - Added a note about the meaning of PERCENTAGEDELTA in cRingBuffer::UpdatePercentage() (thanks to Rolf Ahrenberg). +- The new setup option "Recording/Pause key handling" can be used to define + what happens if the Pause key on the remote control is pressed during + live tv (thanks to Timo Eskola). diff --git a/MANUAL b/MANUAL index ebf89fd4..e4f6284f 100644 --- a/MANUAL +++ b/MANUAL @@ -748,6 +748,13 @@ Version 1.6 Pause priority = 10 The Priority and Lifetime values used when pausing live Pause lifetime = 1 video. + Pause key handling = 3 Defines what happens if the Pause key on the remote control + is pressed during live tv. + 0 = do not pause live video + 1 = confirm pause live video + 2 = pause live video + The default is 2. + Use episode name = yes Repeating timers use the EPG's 'Episode name' information to create recording file names in a hierarchical structure (for instance to gather all episodes of a series in a diff --git a/config.c b/config.c index 1516e15a..fe083ea9 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.3 2009/05/09 10:41:50 kls Exp $ + * $Id: config.c 2.4 2009/05/21 11:10:38 kls Exp $ */ #include "config.h" @@ -250,6 +250,7 @@ cSetup::cSetup(void) PrimaryLimit = 0; DefaultPriority = 50; DefaultLifetime = 99; + PauseKeyHandling = 2; PausePriority = 10; PauseLifetime = 1; UseSubtitle = 1; @@ -436,6 +437,7 @@ bool cSetup::Parse(const char *Name, const char *Value) else if (!strcasecmp(Name, "PrimaryLimit")) PrimaryLimit = atoi(Value); else if (!strcasecmp(Name, "DefaultPriority")) DefaultPriority = atoi(Value); else if (!strcasecmp(Name, "DefaultLifetime")) DefaultLifetime = atoi(Value); + else if (!strcasecmp(Name, "PauseKeyHandling")) PauseKeyHandling = atoi(Value); else if (!strcasecmp(Name, "PausePriority")) PausePriority = atoi(Value); else if (!strcasecmp(Name, "PauseLifetime")) PauseLifetime = atoi(Value); else if (!strcasecmp(Name, "UseSubtitle")) UseSubtitle = atoi(Value); @@ -527,6 +529,7 @@ bool cSetup::Save(void) Store("PrimaryLimit", PrimaryLimit); Store("DefaultPriority", DefaultPriority); Store("DefaultLifetime", DefaultLifetime); + Store("PauseKeyHandling", PauseKeyHandling); Store("PausePriority", PausePriority); Store("PauseLifetime", PauseLifetime); Store("UseSubtitle", UseSubtitle); diff --git a/config.h b/config.h index bd1e3f58..7a41d401 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.12 2009/05/09 10:40:04 kls Exp $ + * $Id: config.h 2.13 2009/05/21 11:11:32 kls Exp $ */ #ifndef __CONFIG_H @@ -234,6 +234,7 @@ public: int PrimaryLimit; int DefaultPriority, DefaultLifetime; int PausePriority, PauseLifetime; + int PauseKeyHandling; int UseSubtitle; int UseVps; int VpsMargin; diff --git a/menu.c b/menu.c index 423f6f2a..cd1b30a6 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.7 2009/05/03 13:30:13 kls Exp $ + * $Id: menu.c 2.8 2009/05/21 11:10:38 kls Exp $ */ #include "menu.h" @@ -2672,18 +2672,24 @@ eOSState cMenuSetupCAM::ProcessKey(eKeys Key) // --- cMenuSetupRecord ------------------------------------------------------ class cMenuSetupRecord : public cMenuSetupBase { +private: + const char *pauseKeyHandlingTexts[3]; public: cMenuSetupRecord(void); }; cMenuSetupRecord::cMenuSetupRecord(void) { + pauseKeyHandlingTexts[0] = tr("do not pause live video"); + pauseKeyHandlingTexts[1] = tr("confirm pause live video"); + pauseKeyHandlingTexts[2] = tr("pause live video"); SetSection(tr("Recording")); Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at start (min)"), &data.MarginStart)); Add(new cMenuEditIntItem( tr("Setup.Recording$Margin at stop (min)"), &data.MarginStop)); Add(new cMenuEditIntItem( tr("Setup.Recording$Primary limit"), &data.PrimaryLimit, 0, MAXPRIORITY)); Add(new cMenuEditIntItem( tr("Setup.Recording$Default priority"), &data.DefaultPriority, 0, MAXPRIORITY)); Add(new cMenuEditIntItem( tr("Setup.Recording$Default lifetime (d)"), &data.DefaultLifetime, 0, MAXLIFETIME)); + Add(new cMenuEditStraItem(tr("Setup.Recording$Pause key handling"), &data.PauseKeyHandling, 3, pauseKeyHandlingTexts)); Add(new cMenuEditIntItem( tr("Setup.Recording$Pause priority"), &data.PausePriority, 0, MAXPRIORITY)); Add(new cMenuEditIntItem( tr("Setup.Recording$Pause lifetime (d)"), &data.PauseLifetime, 0, MAXLIFETIME)); Add(new cMenuEditBoolItem(tr("Setup.Recording$Use episode name"), &data.UseSubtitle)); diff --git a/po/ca_ES.po b/po/ca_ES.po index 0ab2de62..e0408598 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti \n" "Language-Team: Catalanian\n" @@ -707,6 +707,15 @@ msgstr "CAM en msgid "Can't reset CAM!" msgstr "No puc reiniciar la CAM!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Opcions de Gravaci" @@ -725,6 +734,9 @@ msgstr "Prioritat per defecte" msgid "Setup.Recording$Default lifetime (d)" msgstr "Durada predefinida" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Prioritat de la pausa" @@ -986,6 +998,9 @@ msgstr "Diumenge" msgid "Upcoming recording!" msgstr "Gravaci a punt d'iniciar!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Gravaci comenada" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index a50a33d6..34a941b5 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-02-28 15:00+0200\n" "Last-Translator: Vladimr Brta , Ji Dobr \n" "Language-Team: Czech\n" @@ -705,6 +705,15 @@ msgstr "CAM se pou msgid "Can't reset CAM!" msgstr "CAM modul nelze restartovat!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Nahrvn" @@ -723,6 +732,9 @@ msgstr "V msgid "Setup.Recording$Default lifetime (d)" msgstr "Vchoz ivotnost" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Priorita peruen" @@ -984,6 +996,9 @@ msgstr "Ned msgid "Upcoming recording!" msgstr "Brzo zane nahrvn!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Zaalo nahrvn" diff --git a/po/da_DK.po b/po/da_DK.po index e8d05c8e..cd533a07 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Mogens Elneff \n" "Language-Team: Danish\n" @@ -704,6 +704,15 @@ msgstr "CAM er i brug - virkelig nulstille?" msgid "Can't reset CAM!" msgstr "Kan ikke nulstille CAM!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Optagelse" @@ -722,6 +731,9 @@ msgstr "Standard prioritet" msgid "Setup.Recording$Default lifetime (d)" msgstr "Standard levetid (d)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Pause prioritet" @@ -983,6 +995,9 @@ msgstr "S msgid "Upcoming recording!" msgstr "Optagelse starter snart!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Optagelse startet" diff --git a/po/de_DE.po b/po/de_DE.po index 6b55d6ab..eea68172 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2007-11-25 15:19+0200\n" "Last-Translator: Klaus Schmidinger \n" "Language-Team: German\n" @@ -704,6 +704,15 @@ msgstr "CAM wird benutzt - wirklich zur msgid "Can't reset CAM!" msgstr "Zurcksetzen des CAM fehlgeschlagen!" +msgid "do not pause live video" +msgstr "Live-Signal nicht anhalten" + +msgid "confirm pause live video" +msgstr "Anhalten des Live-Signals besttigen" + +msgid "pause live video" +msgstr "Live-Signal anhalten" + msgid "Recording" msgstr "Aufnahme" @@ -722,6 +731,9 @@ msgstr "Default-Priorit msgid "Setup.Recording$Default lifetime (d)" msgstr "Default-Lebensdauer (d)" +msgid "Setup.Recording$Pause key handling" +msgstr "Funktion der Pause-Taste" + msgid "Setup.Recording$Pause priority" msgstr "Pause-Prioritt" @@ -983,6 +995,9 @@ msgstr "Sonntag" msgid "Upcoming recording!" msgstr "Aufnahme beginnt in Krze!" +msgid "Pause live video?" +msgstr "Live-Signal anhalten?" + msgid "Recording started" msgstr "Aufzeichnung gestartet" diff --git a/po/el_GR.po b/po/el_GR.po index 90ff04d9..bcdcb8e8 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Dimitrios Dimitrakos \n" "Language-Team: Greek\n" @@ -704,6 +704,15 @@ msgstr "" msgid "Can't reset CAM!" msgstr " CAM" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "" @@ -722,6 +731,9 @@ msgstr " msgid "Setup.Recording$Default lifetime (d)" msgstr " ()" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr " " @@ -983,6 +995,9 @@ msgstr " msgid "Upcoming recording!" msgstr "" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "" diff --git a/po/es_ES.po b/po/es_ES.po index 667d6507..58cb4143 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-03-02 19:02+0100\n" "Last-Translator: Luca Olivetti \n" "Language-Team: Spanish\n" @@ -705,6 +705,15 @@ msgstr "CAM en uso - msgid "Can't reset CAM!" msgstr "No se puede reiniciar CAM!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Opciones de grabacin" @@ -723,6 +732,9 @@ msgstr "Prioridad por defecto" msgid "Setup.Recording$Default lifetime (d)" msgstr "Duracin por defecto (das)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Prioridad en modo pausa" @@ -984,6 +996,9 @@ msgstr "Domingo" msgid "Upcoming recording!" msgstr "Grabacin a punto de empezar!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Iniciando grabacin" diff --git a/po/et_EE.po b/po/et_EE.po index ff66d8a5..b0477c29 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Arthur Konovalov \n" "Language-Team: Estonian\n" @@ -704,6 +704,15 @@ msgstr "CAM on kasutuses - taask msgid "Can't reset CAM!" msgstr "CAM mooduli taaskivitus ebannestus!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Salvestamine" @@ -722,6 +731,9 @@ msgstr "Vaikimisi prioriteet" msgid "Setup.Recording$Default lifetime (d)" msgstr "Salvestuse eluiga (pevi)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Pausi prioriteet" @@ -983,6 +995,9 @@ msgstr "P msgid "Upcoming recording!" msgstr "Salvestamine tulekul!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Salvestamine algas" diff --git a/po/fi_FI.po b/po/fi_FI.po index ed5b94db..e62b9f65 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2007-08-15 15:52+0200\n" "Last-Translator: Rolf Ahrenberg \n" "Language-Team: Finnish\n" @@ -707,6 +707,15 @@ msgstr "CA-moduuli k msgid "Can't reset CAM!" msgstr "CA-moduulin nollaus eponnistui!" +msgid "do not pause live video" +msgstr "l pysyt lhetyst" + +msgid "confirm pause live video" +msgstr "varmista lhetyksen pysyttminen" + +msgid "pause live video" +msgstr "pysyt lhetys" + msgid "Recording" msgstr "Tallennus" @@ -725,6 +734,9 @@ msgstr "Tallenteen oletusprioriteetti" msgid "Setup.Recording$Default lifetime (d)" msgstr "Tallenteen oletuselinik (d)" +msgid "Setup.Recording$Pause key handling" +msgstr "Taukonppimen toiminta" + msgid "Setup.Recording$Pause priority" msgstr "Taukotallenteen prioriteetti" @@ -986,6 +998,9 @@ msgstr "Sunnuntai" msgid "Upcoming recording!" msgstr "Tallennus on alkamassa!" +msgid "Pause live video?" +msgstr "Pysytetnk lhetys?" + msgid "Recording started" msgstr "Tallennus aloitettu" diff --git a/po/fr_FR.po b/po/fr_FR.po index 53536259..e1ef364c 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-02-27 18:14+0100\n" "Last-Translator: Jean-Claude Repetto \n" "Language-Team: French\n" @@ -710,6 +710,15 @@ msgstr "CAM en cours d'utilisation - Remettre msgid "Can't reset CAM!" msgstr "Impossible de rinitialiser le CAM !" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Enregistrement" @@ -728,6 +737,9 @@ msgstr "Priorit msgid "Setup.Recording$Default lifetime (d)" msgstr "Dure de vie par dfaut (j)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Priorit des pauses" @@ -989,6 +1001,9 @@ msgstr "Dimanche" msgid "Upcoming recording!" msgstr "L'enregistrement va commencer !" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "L'enregistrement a commenc" diff --git a/po/hr_HR.po b/po/hr_HR.po index 9b409e3e..f69c24a6 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-03-17 19:00+0100\n" "Last-Translator: Adrian Caval \n" "Language-Team: Croatian\n" @@ -706,6 +706,15 @@ msgstr "CAM se koristi - ponovno pokrenuti unato msgid "Can't reset CAM!" msgstr "Ponovno pokretanje CAM-a neuspjeno!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Snimanje" @@ -724,6 +733,9 @@ msgstr "Zadani prioritet" msgid "Setup.Recording$Default lifetime (d)" msgstr "Zadano trajanje (d)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Prioritet pauze" @@ -985,6 +997,9 @@ msgstr "Nedjelja" msgid "Upcoming recording!" msgstr "Obnovljena snimka!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Snimanje zapoelo" diff --git a/po/hu_HU.po b/po/hu_HU.po index 5c0a8877..fad18a4a 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2007-12-01 21:42+0200\n" "Last-Translator: Istvn Fley \n" "Language-Team: Hungarian\n" @@ -707,6 +707,15 @@ msgstr "CAM haszn msgid "Can't reset CAM!" msgstr "A CAM jraindts nem sikerlt" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Felvtel" @@ -725,6 +734,9 @@ msgstr "Alap msgid "Setup.Recording$Default lifetime (d)" msgstr "Alaprtelmezett lettartam" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Sznet priorits" @@ -986,6 +998,9 @@ msgstr "Vas msgid "Upcoming recording!" msgstr "Felvtel rgtn kezddik!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "A felvtel elindtva" diff --git a/po/it_IT.po b/po/it_IT.po index 877191b0..09429cbc 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2009-02-08 18:58+0100\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian\n" @@ -711,6 +711,15 @@ msgstr "La CAM è in uso - vuoi reimpostarla?" msgid "Can't reset CAM!" msgstr "Impossibile reimpostare il modulo CAM!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Registrazione" @@ -729,6 +738,9 @@ msgstr "Priorità predefinita" msgid "Setup.Recording$Default lifetime (d)" msgstr "Scadenza predefinita (gg)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Priorità di pausa" @@ -990,6 +1002,9 @@ msgstr "Domenica" msgid "Upcoming recording!" msgstr "Registrazione imminente!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Registrazione avviata" diff --git a/po/nl_NL.po b/po/nl_NL.po index 36a99220..ef5c9765 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-02-26 17:20+0100\n" "Last-Translator: Johan Schuring \n" "Language-Team: Dutch\n" @@ -708,6 +708,15 @@ msgstr "CAM wordt gebruikt - werkelijk herstarten?" msgid "Can't reset CAM!" msgstr "Kan CAM niet herstarten!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Opname" @@ -726,6 +735,9 @@ msgstr "Standaard prioriteit" msgid "Setup.Recording$Default lifetime (d)" msgstr "Standaard levensduur (d)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Pauze prioriteit" @@ -987,6 +999,9 @@ msgstr "Zondag" msgid "Upcoming recording!" msgstr "Opname start binnenkort!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Opname is gestart!" diff --git a/po/nn_NO.po b/po/nn_NO.po index 2445b023..daf56f1e 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2007-08-12 14:17+0200\n" "Last-Translator: Truls Slevigen \n" "Language-Team: Norwegian\n" @@ -705,6 +705,15 @@ msgstr "" msgid "Can't reset CAM!" msgstr "" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Opptak" @@ -723,6 +732,9 @@ msgstr "Normal prioritet (Timer)" msgid "Setup.Recording$Default lifetime (d)" msgstr "Normal levetid timer (d)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "" @@ -984,6 +996,9 @@ msgstr "S msgid "Upcoming recording!" msgstr "" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "" diff --git a/po/pl_PL.po b/po/pl_PL.po index 860094a4..d8871789 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-03-09 12:59+0100\n" "Last-Translator: Michael Rakowski \n" "Language-Team: Polish\n" @@ -705,6 +705,15 @@ msgstr "CAM jest w u msgid "Can't reset CAM!" msgstr "Nie mona zresetowa CAM!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Nagranie" @@ -723,6 +732,9 @@ msgstr "Domy msgid "Setup.Recording$Default lifetime (d)" msgstr "Domylny czas ycia (d)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Priorytet pauzy" @@ -984,6 +996,9 @@ msgstr "Niedziela" msgid "Upcoming recording!" msgstr "Wkrtce nagranie!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Rozpoczto nagrywanie" diff --git a/po/pt_PT.po b/po/pt_PT.po index fa4767f4..ba23834d 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-03-18 17:04+0100\n" "Last-Translator: anonymous\n" "Language-Team: Portuguese\n" @@ -704,6 +704,15 @@ msgstr "CAM em uso - quer mesmo reiniciar?" msgid "Can't reset CAM!" msgstr "No possvel reiniciar a CAM" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Opes de gravao" @@ -722,6 +731,9 @@ msgstr "Prioridade por defeito" msgid "Setup.Recording$Default lifetime (d)" msgstr "Validade por defeito (d)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Prioridade da pausa" @@ -983,6 +995,9 @@ msgstr "Domingo" msgid "Upcoming recording!" msgstr "Gravao agendada!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Gravao iniciada" diff --git a/po/ro_RO.po b/po/ro_RO.po index 0c6013cb..30aee23c 100644 --- a/po/ro_RO.po +++ b/po/ro_RO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-02-25 00:39+0100\n" "Last-Translator: Lucian Muresan \n" "Language-Team: Romanian\n" @@ -707,6 +707,15 @@ msgstr "CAM-ul este in folosin msgid "Can't reset CAM!" msgstr "Nu pot reseta CAM" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "nregistrare" @@ -725,6 +734,9 @@ msgstr "Prioritate implicit msgid "Setup.Recording$Default lifetime (d)" msgstr "Timp de pstrare predefinit (zile)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Prioritate pauz" @@ -986,6 +998,9 @@ msgstr "Duminic msgid "Upcoming recording!" msgstr "Urmeaz o nregistrare!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "A nceput nregistrarea" diff --git a/po/ru_RU.po b/po/ru_RU.po index a0a25557..0c61dce4 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-12-15 14:37+0100\n" "Last-Translator: Oleg Roitburd \n" "Language-Team: Russian\n" @@ -705,6 +705,15 @@ msgstr "CAM msgid "Can't reset CAM!" msgstr " CAM-!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "" @@ -723,6 +732,9 @@ msgstr " msgid "Setup.Recording$Default lifetime (d)" msgstr " ()" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr " " @@ -984,6 +996,9 @@ msgstr " msgid "Upcoming recording!" msgstr " " +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr " " diff --git a/po/sl_SI.po b/po/sl_SI.po index 347e5991..35b60435 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-02-28 19:44+0100\n" "Last-Translator: Matjaz Thaler \n" "Language-Team: Slovenian\n" @@ -705,6 +705,15 @@ msgstr "CAM je v uporabi - zares resetiraj?" msgid "Can't reset CAM!" msgstr "Ne morem resetirati CAM-a!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Snemanje" @@ -723,6 +732,9 @@ msgstr "Privzeta prioriteta" msgid "Setup.Recording$Default lifetime (d)" msgstr "Privzeti ivljenski as (d)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Prioriteta pavze" @@ -984,6 +996,9 @@ msgstr "Nedelja" msgid "Upcoming recording!" msgstr "Sledi snemanje!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Snemanje se je prielo" diff --git a/po/sv_SE.po b/po/sv_SE.po index d47da8a2..e4fbe25a 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-03-12 18:25+0100\n" "Last-Translator: Magnus Andersson \n" "Language-Team: Swedish\n" @@ -707,6 +707,15 @@ msgstr "CAM upptagen, vill du verkligen starta om?" msgid "Can't reset CAM!" msgstr "Kan inte terstlla CAM!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Inspelning" @@ -725,6 +734,9 @@ msgstr "Normal prioritet" msgid "Setup.Recording$Default lifetime (d)" msgstr "Normal livstid (dagar)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Prioritet fr direktinspelning" @@ -986,6 +998,9 @@ msgstr "S msgid "Upcoming recording!" msgstr "strax inspelning..." +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Inspelningen har startat" diff --git a/po/tr_TR.po b/po/tr_TR.po index abdb594c..44bf894e 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-02-28 00:33+0100\n" "Last-Translator: Oktay Yolgeen \n" "Language-Team: Turkish\n" @@ -704,6 +704,15 @@ msgstr "CAM kullan msgid "Can't reset CAM!" msgstr "CAM sfrlanamad!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "Kayt" @@ -722,6 +731,9 @@ msgstr "Ola msgid "Setup.Recording$Default lifetime (d)" msgstr "Olaan ekim mr (gn)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "Duraklama prioritesi" @@ -983,6 +995,9 @@ msgstr "Pazar" msgid "Upcoming recording!" msgstr "ekim yaknda balyor!" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "Kayt baland" diff --git a/po/uk_UA.po b/po/uk_UA.po index 3d566fc0..82f17407 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: VDR 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-03-07 14:17+0200\n" "Last-Translator: Yarema Aka Knedlyk \n" "Language-Team: Ukrainian\n" @@ -704,6 +704,15 @@ msgstr "CAM msgid "Can't reset CAM!" msgstr " CAM-!" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "" @@ -722,6 +731,9 @@ msgstr " msgid "Setup.Recording$Default lifetime (d)" msgstr " ()" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr " " @@ -983,6 +995,9 @@ msgstr " msgid "Upcoming recording!" msgstr " " +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr " " diff --git a/po/zh_CN.po b/po/zh_CN.po index 92b20a71..f2767757 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: \n" -"POT-Creation-Date: 2008-12-14 16:10+0100\n" +"POT-Creation-Date: 2009-05-21 13:18+0200\n" "PO-Revision-Date: 2008-03-21 08:44+0800\n" "Last-Translator: Nan Feng \n" "Language-Team: Chinese\n" @@ -707,6 +707,15 @@ msgstr "CAM正在使用-是否重启？" msgid "Can't reset CAM!" msgstr "不能重启CAM" +msgid "do not pause live video" +msgstr "" + +msgid "confirm pause live video" +msgstr "" + +msgid "pause live video" +msgstr "" + msgid "Recording" msgstr "记录中" @@ -725,6 +734,9 @@ msgstr "默认优先" msgid "Setup.Recording$Default lifetime (d)" msgstr "默认终身 (d)" +msgid "Setup.Recording$Pause key handling" +msgstr "" + msgid "Setup.Recording$Pause priority" msgstr "暂停优先" @@ -986,6 +998,9 @@ msgstr "星期天" msgid "Upcoming recording!" msgstr "即将的记录！" +msgid "Pause live video?" +msgstr "" + msgid "Recording started" msgstr "记录开始！" diff --git a/vdr.c b/vdr.c index cdada01c..2384895c 100644 --- a/vdr.c +++ b/vdr.c @@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 2.9 2009/05/12 21:02:58 kls Exp $ + * $Id: vdr.c 2.10 2009/05/21 11:14:48 kls Exp $ */ #include @@ -1062,8 +1062,12 @@ int main(int argc, char *argv[]) case kPause: if (!cControl::Control()) { DELETE_MENU; - if (!cRecordControls::PauseLiveVideo()) - Skins.Message(mtError, tr("No free DVB device to record!")); + if (Setup.PauseKeyHandling) { + if (Setup.PauseKeyHandling > 1 || Interface->Confirm(tr("Pause live video?"))) { + if (!cRecordControls::PauseLiveVideo()) + Skins.Message(mtError, tr("No free DVB device to record!")); + } + } key = kNone; // nobody else needs to see this key } break;