From 591fb8431b748e347df8c27c9b72552670a6a76f Mon Sep 17 00:00:00 2001 From: Rolf Ahrenberg Date: Sat, 5 Apr 2014 18:29:45 +0300 Subject: [PATCH] Updated the section filtering options. --- HISTORY | 4 ++++ common.c | 14 ++++++-------- common.h | 2 +- iptv.c | 2 +- po/de_DE.po | 16 +++++----------- po/fi_FI.po | 16 +++++----------- po/fr_FR.po | 16 +++++----------- po/it_IT.po | 16 +++++----------- po/nl_NL.po | 16 +++++----------- po/ru_RU.po | 16 +++++----------- 10 files changed, 42 insertions(+), 76 deletions(-) diff --git a/HISTORY b/HISTORY index fa8adec..e0ffc69 100644 --- a/HISTORY +++ b/HISTORY @@ -247,3 +247,7 @@ VDR Plugin 'iptv' Revision History 2014-03-16: Version 2.1.2 - Updated for vdr-2.1.6. + +2014-04-12: Version 2.1.3 + +- Updated the section filtering options. diff --git a/common.c b/common.c index f1751ac..24abeed 100644 --- a/common.c +++ b/common.c @@ -75,12 +75,10 @@ cString ChangeCase(const cString &strP, bool upperP) const section_filter_table_type section_filter_table[SECTION_FILTER_TABLE_SIZE] = { - /* description tag pid tid mask */ - {trNOOP("PAT (0x00)"), "PAT", 0x00, 0x00, 0xFF}, - {trNOOP("NIT (0x40)"), "NIT", 0x10, 0x40, 0xFF}, - {trNOOP("SDT (0x42)"), "SDT", 0x11, 0x42, 0xFF}, - {trNOOP("EIT (0x4E/0x4F)"), "EIT", 0x12, 0x4E, 0xFE}, - {trNOOP("EIT (0x5X)"), "EIT", 0x12, 0x50, 0xF0}, - {trNOOP("EIT (0x6X)"), "EIT", 0x12, 0x60, 0xF0}, - {trNOOP("TDT (0x70)"), "TDT", 0x14, 0x70, 0xFF}, + /* description tag pid tid mask */ + {trNOOP("PAT (0x00)"), "PAT", 0x00, 0x00, 0xFF}, + {trNOOP("NIT (0x40)"), "NIT", 0x10, 0x40, 0xFF}, + {trNOOP("SDT (0x42)"), "SDT", 0x11, 0x42, 0xFF}, + {trNOOP("EIT (0x4E/0x4F/0x5X/0x6X)"), "EIT", 0x12, 0x40, 0xC0}, + {trNOOP("TDT (0x70)"), "TDT", 0x14, 0x70, 0xFF}, }; diff --git a/common.h b/common.h index 95e631d..c034940 100644 --- a/common.h +++ b/common.h @@ -38,7 +38,7 @@ #define IPTV_STATS_ACTIVE_PIDS_COUNT 10 #define IPTV_STATS_ACTIVE_FILTERS_COUNT 10 -#define SECTION_FILTER_TABLE_SIZE 7 +#define SECTION_FILTER_TABLE_SIZE 5 #define ERROR_IF_FUNC(exp, errstr, func, ret) \ do { \ diff --git a/iptv.c b/iptv.c index dccfba7..98dd312 100644 --- a/iptv.c +++ b/iptv.c @@ -21,7 +21,7 @@ #define GITVERSION "" #endif - const char VERSION[] = "2.1.2" GITVERSION; + const char VERSION[] = "2.1.3" GITVERSION; static const char DESCRIPTION[] = trNOOP("Experience the IPTV"); class cPluginIptv : public cPlugin { diff --git a/po/de_DE.po b/po/de_DE.po index 472977d..5dad05e 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 2.1.2\n" +"Project-Id-Version: vdr-iptv 2.1.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-16 03:16+0200\n" -"PO-Revision-Date: 2014-03-16 03:16+0200\n" +"POT-Creation-Date: 2014-04-12 04:12+0200\n" +"PO-Revision-Date: 2014-04-12 04:12+0200\n" "Last-Translator: Tobias Grimm \n" "Language-Team: German \n" "Language: de\n" @@ -26,14 +26,8 @@ msgstr "NIT (0x40)" msgid "SDT (0x42)" msgstr "SDT (0x42)" -msgid "EIT (0x4E/0x4F)" -msgstr "EIT (0x4E/0x4F)" - -msgid "EIT (0x5X)" -msgstr "EIT (0x5X)" - -msgid "EIT (0x6X)" -msgstr "EIT (0x6X)" +msgid "EIT (0x4E/0x4F/0x5X/0x6X)" +msgstr "EIT (0x4E/0x4F/0x5X/0x6X)" msgid "TDT (0x70)" msgstr "TDT (0x70)" diff --git a/po/fi_FI.po b/po/fi_FI.po index 496421d..e83cbeb 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 2.1.2\n" +"Project-Id-Version: vdr-iptv 2.1.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-16 03:16+0200\n" -"PO-Revision-Date: 2014-03-16 03:16+0200\n" +"POT-Creation-Date: 2014-04-12 04:12+0200\n" +"PO-Revision-Date: 2014-04-12 04:12+0200\n" "Last-Translator: Rolf Ahrenberg\n" "Language-Team: Finnish \n" "Language: fi\n" @@ -25,14 +25,8 @@ msgstr "NIT (0x40)" msgid "SDT (0x42)" msgstr "SDT (0x42)" -msgid "EIT (0x4E/0x4F)" -msgstr "EIT (0x4E/0x4F)" - -msgid "EIT (0x5X)" -msgstr "EIT (0x5X)" - -msgid "EIT (0x6X)" -msgstr "EIT (0x6X)" +msgid "EIT (0x4E/0x4F/0x5X/0x6X)" +msgstr "EIT (0x4E/0x4F/0x5X/0x6X)" msgid "TDT (0x70)" msgstr "TDT (0x70)" diff --git a/po/fr_FR.po b/po/fr_FR.po index 737286d..dbb6d26 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -6,10 +6,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 2.1.2\n" +"Project-Id-Version: vdr-iptv 2.1.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-16 03:16+0200\n" -"PO-Revision-Date: 2014-03-16 03:16+0200\n" +"POT-Creation-Date: 2014-04-12 04:12+0200\n" +"PO-Revision-Date: 2014-04-12 04:12+0200\n" "Last-Translator: NIVAL Michaël \n" "Language-Team: French \n" "Language: fr\n" @@ -27,14 +27,8 @@ msgstr "NIT (0x40)" msgid "SDT (0x42)" msgstr "SDT (0x42)" -msgid "EIT (0x4E/0x4F)" -msgstr "EIT (0x4E/0x4F)" - -msgid "EIT (0x5X)" -msgstr "EIT (0x5X)" - -msgid "EIT (0x6X)" -msgstr "EIT (0x6X)" +msgid "EIT (0x4E/0x4F/0x5X/0x6X)" +msgstr "EIT (0x4E/0x4F/0x5X/0x6X)" msgid "TDT (0x70)" msgstr "TDT (0x70)" diff --git a/po/it_IT.po b/po/it_IT.po index e029eaa..98dd2f3 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 2.1.2\n" +"Project-Id-Version: vdr-iptv 2.1.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-16 03:16+0200\n" -"PO-Revision-Date: 2014-03-16 03:16+0200\n" +"POT-Creation-Date: 2014-04-12 04:12+0300\n" +"PO-Revision-Date: 2014-04-12 04:12+0200\n" "Last-Translator: Diego Pierotto \n" "Language-Team: Italian \n" "Language: it\n" @@ -26,14 +26,8 @@ msgstr "NIT (0x40)" msgid "SDT (0x42)" msgstr "SDT (0x42)" -msgid "EIT (0x4E/0x4F)" -msgstr "EIT (0x4E/0x4F)" - -msgid "EIT (0x5X)" -msgstr "EIT (0x5X)" - -msgid "EIT (0x6X)" -msgstr "EIT (0x6X)" +msgid "EIT (0x4E/0x4F/0x5X/0x6X)" +msgstr "EIT (0x4E/0x4F/0x5X/0x6X)" msgid "TDT (0x70)" msgstr "TDT (0x70)" diff --git a/po/nl_NL.po b/po/nl_NL.po index f92254b..fbe14eb 100644 --- a/po/nl_NL.po +++ b/po/nl_NL.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 2.1.2\n" +"Project-Id-Version: vdr-iptv 2.1.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-16 03:16+0200\n" -"PO-Revision-Date: 2014-03-16 03:16+0200\n" +"POT-Creation-Date: 2014-04-12 04:12+0200\n" +"PO-Revision-Date: 2014-04-12 04:12+0200\n" "Last-Translator: Carel\n" "Language-Team: Dutch \n" "Language: nl\n" @@ -26,14 +26,8 @@ msgstr "NIT (0x40)" msgid "SDT (0x42)" msgstr "SDT (0x42)" -msgid "EIT (0x4E/0x4F)" -msgstr "EIT (0x4E/0x4F)" - -msgid "EIT (0x5X)" -msgstr "EIT (0x5X)" - -msgid "EIT (0x6X)" -msgstr "EIT (0x6X)" +msgid "EIT (0x4E/0x4F/0x5X/0x6X)" +msgstr "EIT (0x4E/0x4F/0x5X/0x6X)" msgid "TDT (0x70)" msgstr "TDT (0x70)" diff --git a/po/ru_RU.po b/po/ru_RU.po index 0cb3003..68d9731 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: vdr-iptv 2.1.2\n" +"Project-Id-Version: vdr-iptv 2.1.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-16 03:16+0200\n" -"PO-Revision-Date: 2014-03-16 03:16+0200\n" +"POT-Creation-Date: 2014-04-12 04:12+0200\n" +"PO-Revision-Date: 2014-04-12 04:12+0200\n" "Last-Translator: Alexander Gross \n" "Language-Team: Russian \n" "Language: ru\n" @@ -27,14 +27,8 @@ msgstr "NIT (0x40)" msgid "SDT (0x42)" msgstr "SDT (0x42)" -msgid "EIT (0x4E/0x4F)" -msgstr "EIT (0x4E/0x4F)" - -msgid "EIT (0x5X)" -msgstr "EIT (0x5X)" - -msgid "EIT (0x6X)" -msgstr "EIT (0x6X)" +msgid "EIT (0x4E/0x4F/0x5X/0x6X)" +msgstr "EIT (0x4E/0x4F/0x5X/0x6X)" msgid "TDT (0x70)" msgstr "TDT (0x70)"