From 58379189a1a425eae045533f9f5c037a142776c5 Mon Sep 17 00:00:00 2001 From: Midas Date: Sat, 13 Nov 2010 22:36:41 +0100 Subject: Bugfix: Plugin could have been showing misbehaviour if all channels on a given transponder were blocked and the device was locked by recording from one of the channels. Fixed. Features: Updated Italian translation. Thanks again to Diego Pierotto. --- HISTORY | 18 ++++++++++++++++++ block.c | 2 +- control.c | 24 +++++++++++++++++------- i18n.c | 10 +++++----- po/it_IT.po | 21 +++++++++++---------- 5 files changed, 52 insertions(+), 23 deletions(-) diff --git a/HISTORY b/HISTORY index de27ac7..244ee60 100644 --- a/HISTORY +++ b/HISTORY @@ -1,5 +1,23 @@ VDR Plugin 'block' Revision History ----------------------------------- + +2010/11/12: Version 0.1.1 +Bugfix: + -In some cases plugin wrongly switched to a blacklisted channel, if all + channels on the given transponder were blocked. Fixed. +Features: + -Updated Italian translation. Thanks again to Diego Pierotto. + + +************************************************************************** +2010/11/05: Version 0.1.0a +Bugfix: + -In Parental Guidance mode while perfoming the search for a whitelisted + channel the plugin deblocked the last channel at either end of the + channel list. Fixed. + + +************************************************************************** 2010/11/04: Version 0.1.0 New features / Bugfixes: diff --git a/block.c b/block.c index 67ad63c..a0aa345 100644 --- a/block.c +++ b/block.c @@ -20,7 +20,7 @@ using namespace std; -static const char *VERSION = "0.1.0a"; +static const char *VERSION = "0.1.1"; static const char *DESCRIPTION = trNOOP("Block unwanted shows by EPG title"); static const char *MAINMENUENTRY = trNOOP("(De)Block broadcast"); diff --git a/control.c b/control.c index 1c7c0b5..6e98e00 100644 --- a/control.c +++ b/control.c @@ -79,7 +79,7 @@ cControlBlock::~cControlBlock() } bool switch_success=cDevice::SwitchChannel(direction); - +// dsyslog("plugin-block-DEV: direction %i, user_direction %i, lastchannel %i, cSetupBlock::lastchannel %i, lastcchannel %s", direction, cSetupBlock::user_direction,lastchannel,cSetupBlock::LastAcceptableChannel, cSetupBlock::LastcChannel->Name()); if (!switch_success) { if (cSetupBlock::ParentalGuidance==1) @@ -92,16 +92,26 @@ cControlBlock::~cControlBlock() { if (lastchannel != 0) { - dsyslog("plugin-block: ERROR: Don't know where to switch - switching to last channel!"); + dsyslog("plugin-block: ERROR: Don't know where to switch (1) - switching to last channel!"); switch_success=Channels.SwitchTo(lastchannel); } } - if (!switch_success) dsyslog("plugin-block: ERROR: Don't know where to switch - Giving up!"); - + if (!switch_success) + { + dsyslog("plugin-block: ERROR: Don't know where to switch (2) - changing direction!"); + direction=-direction; + cSetupBlock::user_direction=direction; + switch_success=cDevice::SwitchChannel(direction); + + } + if (!switch_success) + { + dsyslog("plugin-block: ERROR: Dont' know where to switch (3) - final fallback to channel 1/direction up!"); + cSetupBlock::user_direction=1; + switch_success=Channels.SwitchTo(1); + } + if (!switch_success) dsyslog("plugin-block: Don't know where to switch (4) - Giving up! Please contact the author."); } - - - } } diff --git a/i18n.c b/i18n.c index 81e06b7..88f8e70 100644 --- a/i18n.c +++ b/i18n.c @@ -510,7 +510,7 @@ const tI18nPhrase Phrases[] = { { "Message Timeout [s]", "Wartezeit bis Umschalten [s]", "", - "",//maybe someone could help out? + "Scadenza messaggio [s]", "", "", "", @@ -535,7 +535,7 @@ const tI18nPhrase Phrases[] = { { "Fuzzy fallback", "Unschärfepriorität", "", - "",//maybe someone could help out? + "Ripristina", "", "", "", @@ -560,7 +560,7 @@ const tI18nPhrase Phrases[] = { { "black", "gesperrt", "", - "",//maybe someone could help out? + "nega", "", "", "", @@ -585,7 +585,7 @@ const tI18nPhrase Phrases[] = { { "white", "nicht gesperrt", "", - "",//maybe someone could help out? + "autorizza", "", "", "", @@ -610,7 +610,7 @@ const tI18nPhrase Phrases[] = { { "Please edit duplicate instead", "Bitte vorhandenen Eintrag editieren", "", - "",//maybe someone could help out? + "Modifica invece i duplicati", "", "", "", diff --git a/po/it_IT.po b/po/it_IT.po index cf7da03..ee45cea 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -10,9 +10,9 @@ msgstr "" "Project-Id-Version: VDR 1.5.7\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-11-05 00:55+0100\n" -"PO-Revision-Date: 2010-11-05 00:53+0100\n" -"Last-Translator: Sean Carlos \n" -"Language-Team: \n" +"PO-Revision-Date: 2010-11-06 19:52+0100\n" +"Last-Translator: Diego Pierotto \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,7 +36,7 @@ msgid "Hide Mainmenu Entry" msgstr "Nascondi voce menu principale" msgid "Message Timeout [s]" -msgstr "" +msgstr "Scadenza messaggio [s]" msgid "On Switch" msgstr "Al cambio canale" @@ -45,10 +45,10 @@ msgid "Channel EPG" msgstr "Canale EPG" msgid "black" -msgstr "" +msgstr "nega" msgid "white" -msgstr "" +msgstr "autorizza" msgid "Detection Method" msgstr "Metodo rilevamento" @@ -57,10 +57,10 @@ msgid "Ok deblocks temporarily" msgstr "Permetti sblocchi temporanei" msgid "Fuzzy fallback" -msgstr "" +msgstr "Ripristina" msgid "--- Keywords -------------------------------------------------------------------" -msgstr "--- Parole chiave---------------------------------------------------------------" +msgstr "--- Parole chiave --------------------------------------------------------------" msgid "Delete keyword?" msgstr "Eliminare parola chiave?" @@ -75,10 +75,11 @@ msgid "Ignore Case" msgstr "Ignora maiuscole/minuscole" msgid "Whitelist" -msgstr "" +msgstr "Elenco autorizzati" msgid "Malformed regular expression!" msgstr "Espressione regolare mal costruita!" msgid "Please edit duplicate instead" -msgstr "" +msgstr "Modifica invece i duplicati" + -- cgit v1.2.3