diff -Nru vdr-1.6.0-2-vanilla/config.c vdr-1.6.0-2-pause-i18n/config.c --- vdr-1.6.0-2-vanilla/config.c 2008-02-17 15:39:00.000000000 +0200 +++ vdr-1.6.0-2-pause-i18n/config.c 2009-05-11 13:02:58.000000000 +0300 @@ -250,6 +250,7 @@ PrimaryLimit = 0; DefaultPriority = 50; DefaultLifetime = 99; + PauseKeyHandling = 2; PausePriority = 10; PauseLifetime = 1; UseSubtitle = 1; @@ -423,6 +424,7 @@ 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); @@ -506,6 +508,7 @@ Store("PrimaryLimit", PrimaryLimit); Store("DefaultPriority", DefaultPriority); Store("DefaultLifetime", DefaultLifetime); + Store("PauseKeyHandling", PauseKeyHandling); Store("PausePriority", PausePriority); Store("PauseLifetime", PauseLifetime); Store("UseSubtitle", UseSubtitle); diff -Nru vdr-1.6.0-2-vanilla/config.h vdr-1.6.0-2-pause-i18n/config.h --- vdr-1.6.0-2-vanilla/config.h 2009-03-06 11:00:59.000000000 +0200 +++ vdr-1.6.0-2-pause-i18n/config.h 2009-05-11 12:40:30.000000000 +0300 @@ -233,7 +233,7 @@ int ChannelEntryTimeout; int PrimaryLimit; int DefaultPriority, DefaultLifetime; - int PausePriority, PauseLifetime; + int PauseKeyHandling, PausePriority, PauseLifetime; int UseSubtitle; int UseVps; int VpsMargin; diff -Nru vdr-1.6.0-2-vanilla/menu.c vdr-1.6.0-2-pause-i18n/menu.c --- vdr-1.6.0-2-vanilla/menu.c 2008-03-16 13:15:28.000000000 +0200 +++ vdr-1.6.0-2-pause-i18n/menu.c 2009-05-11 14:35:00.000000000 +0300 @@ -2736,18 +2736,24 @@ // --- 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 -Nru vdr-1.6.0-2-vanilla/po/fi_FI.po vdr-1.6.0-2-pause-i18n/po/fi_FI.po --- vdr-1.6.0-2-vanilla/po/fi_FI.po 2008-03-23 12:31:29.000000000 +0200 +++ vdr-1.6.0-2-pause-i18n/po/fi_FI.po 2009-05-11 18:51:23.000000000 +0300 @@ -716,6 +716,18 @@ msgid "Setup.Recording$Default lifetime (d)" msgstr "Tallenteen oletuselinikä (d)" +msgid "Setup.Recording$Pause key handling" +msgstr "Taukonäppäimen toiminta" + +msgid "do not pause live video" +msgstr "älä pysäytä lähetystä" + +msgid "confirm pause live video" +msgstr "varmista lähetyksen pysäyttäminen" + +msgid "pause live video" +msgstr "pysäytä lähetys" + msgid "Setup.Recording$Pause priority" msgstr "Taukotallenteen prioriteetti" @@ -857,6 +869,9 @@ msgid "No free DVB device to record!" msgstr "Ei vapaata DVB-viritintä tallennukselle!" +msgid "Pause live video?" +msgstr "Pysäytetäänkö lähetys?" + msgid "Pausing live video..." msgstr "Pysäytetään lähetys..." diff -Nru vdr-1.6.0-2-vanilla/vdr.c vdr-1.6.0-2-pause-i18n/vdr.c --- vdr-1.6.0-2-vanilla/vdr.c 2009-03-06 11:00:59.000000000 +0200 +++ vdr-1.6.0-2-pause-i18n/vdr.c 2009-05-11 13:27:52.000000000 +0300 @@ -1049,8 +1049,12 @@ 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;