From 23a677c66eaf5a7525665e11a20dd965577b755b Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 31 Mar 2013 11:48:00 +0200 Subject: [PATCH] Version 2.0.0 VDR version 2.0.0 is now available at ftp://ftp.tvdr.de/vdr/vdr-2.0.0.tar.bz2 A 'diff' against the previous developer version is available at ftp://ftp.tvdr.de/vdr/Developer/vdr-1.7.42-2.0.0.diff MD5 checksums: fd7f481b996e03fae3c00e80b6b0d301 vdr-2.0.0.tar.bz2 db1fc075c567bf75c566de6ce3cb4a0b vdr-1.7.42-2.0.0.diff A summary of all the major changes since the last stable version 1.6.0 can be found at http://www.tvdr.de/changelog.htm When updating from an earlier version of VDR please make sure you read the INSTALL and MANUAL files that come with the VDR source before doing so! Please make sure you have backup copies of all your configuration files, and verify carefully that your timers will be set to the correct channels after switching to this new version. Thanks to the many people who have contributed in the making, testing and debugging of this new version of VDR. Please also visit the newly refurbished VDR homepage at http://www.tvdr.de and VDR's new facebook page at https://www.facebook.com/VideoDiskRecorder From the HISTORY file: - Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras). - Fixed the description of the 'M' parameter of channel definitions in vdr.5. - Updated the French OSD texts (thanks to Dominique Plu). - Fixed handling overlapping pending timers (reported by Matthias Senzel). - Bumped all version numbers to 2.0.0. - Official release. --- CONTRIBUTORS | 1 + HISTORY | 10 ++++++++++ PLUGINS/src/dvbhddevice/HISTORY | 4 ++++ PLUGINS/src/dvbhddevice/dvbhddevice.c | 2 +- PLUGINS/src/dvbsddevice/HISTORY | 4 ++++ PLUGINS/src/dvbsddevice/dvbsddevice.c | 4 ++-- PLUGINS/src/epgtableid0/HISTORY | 4 ++++ PLUGINS/src/epgtableid0/epgtableid0.c | 4 ++-- PLUGINS/src/hello/HISTORY | 4 ++++ PLUGINS/src/hello/hello.c | 4 ++-- PLUGINS/src/osddemo/HISTORY | 4 ++++ PLUGINS/src/osddemo/osddemo.c | 4 ++-- PLUGINS/src/pictures/HISTORY | 4 ++++ PLUGINS/src/pictures/pictures.c | 4 ++-- PLUGINS/src/rcu/HISTORY | 4 ++++ PLUGINS/src/rcu/rcu.c | 4 ++-- PLUGINS/src/servicedemo/HISTORY | 4 ++++ PLUGINS/src/servicedemo/svccli.c | 4 ++-- PLUGINS/src/servicedemo/svcsvr.c | 4 ++-- PLUGINS/src/skincurses/HISTORY | 4 ++++ PLUGINS/src/skincurses/skincurses.c | 4 ++-- PLUGINS/src/status/HISTORY | 4 ++++ PLUGINS/src/status/status.c | 4 ++-- PLUGINS/src/svdrpdemo/HISTORY | 4 ++++ PLUGINS/src/svdrpdemo/svdrpdemo.c | 4 ++-- config.h | 10 +++++----- po/fr_FR.po | 4 ++-- po/lt_LT.po | 2 +- timers.c | 6 ++++-- vdr.5 | 7 ++++--- 30 files changed, 94 insertions(+), 36 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 4da1a5c4..780ad5ff 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3116,6 +3116,7 @@ Mikael H Matthias Senzel for reporting a problem with switching back to live viewing after replay in a setup with device bonding + for reporting a problem with handling overlapping pending timers Marek Nazarko for translating OSD texts to the Polish language diff --git a/HISTORY b/HISTORY index 88f06260..393c7395 100644 --- a/HISTORY +++ b/HISTORY @@ -7772,3 +7772,13 @@ Video Disk Recorder Revision History - Fixed formatting the channel definition example in the vdr(5) man page (thanks to Dominic Evans). - Updated the default channels.conf file. + + +2013-03-31: Version 2.0.0 + +- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras). +- Fixed the description of the 'M' parameter of channel definitions in vdr.5. +- Updated the French OSD texts (thanks to Dominique Plu). +- Fixed handling overlapping pending timers (reported by Matthias Senzel). +- Bumped all version numbers to 2.0.0. +- Official release. diff --git a/PLUGINS/src/dvbhddevice/HISTORY b/PLUGINS/src/dvbhddevice/HISTORY index 85aaa6c7..2184403c 100644 --- a/PLUGINS/src/dvbhddevice/HISTORY +++ b/PLUGINS/src/dvbhddevice/HISTORY @@ -67,3 +67,7 @@ VDR Plugin 'dvbhddevice' Revision History - Fixed flashing OSD in "high level OSD" mode in case a menu is open while subtitles are being displayed. - Fixed immediately disappearing subtitle track menu when selecting "No subtitles". + +2013-03-31: Version 2.0.0 + +- Official release. diff --git a/PLUGINS/src/dvbhddevice/dvbhddevice.c b/PLUGINS/src/dvbhddevice/dvbhddevice.c index 1a754204..535f901f 100644 --- a/PLUGINS/src/dvbhddevice/dvbhddevice.c +++ b/PLUGINS/src/dvbhddevice/dvbhddevice.c @@ -10,7 +10,7 @@ #include "menu.h" #include "setup.h" -static const char *VERSION = "0.0.9"; +static const char *VERSION = "2.0.0"; static const char *DESCRIPTION = trNOOP("HD Full Featured DVB device"); static const char *MAINMENUENTRY = "dvbhddevice"; diff --git a/PLUGINS/src/dvbsddevice/HISTORY b/PLUGINS/src/dvbsddevice/HISTORY index e1f98548..4dd75d2c 100644 --- a/PLUGINS/src/dvbsddevice/HISTORY +++ b/PLUGINS/src/dvbsddevice/HISTORY @@ -41,3 +41,7 @@ VDR Plugin 'dvbsddevice' Revision History 2013-01-25: Version 0.0.9 - Returning 0 from cDvbSdFfDevice::NumProvidedSystems() if option --outputonly is given. + +2013-03-31: Version 2.0.0 + +- Official release. diff --git a/PLUGINS/src/dvbsddevice/dvbsddevice.c b/PLUGINS/src/dvbsddevice/dvbsddevice.c index 8ebfe2b6..cdc07836 100644 --- a/PLUGINS/src/dvbsddevice/dvbsddevice.c +++ b/PLUGINS/src/dvbsddevice/dvbsddevice.c @@ -3,14 +3,14 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: dvbsddevice.c 1.9 2013/01/25 10:48:50 kls Exp $ + * $Id: dvbsddevice.c 1.10 2013/03/31 09:30:18 kls Exp $ */ #include #include #include "dvbsdffdevice.h" -static const char *VERSION = "0.0.9"; +static const char *VERSION = "2.0.0"; static const char *DESCRIPTION = "SD Full Featured DVB device"; class cPluginDvbsddevice : public cPlugin { diff --git a/PLUGINS/src/epgtableid0/HISTORY b/PLUGINS/src/epgtableid0/HISTORY index 5712e241..da97932a 100644 --- a/PLUGINS/src/epgtableid0/HISTORY +++ b/PLUGINS/src/epgtableid0/HISTORY @@ -12,3 +12,7 @@ VDR Plugin 'epgtableid0' Revision History 2013-01-12: Version 0.0.3 - Adapted Makefile to changes introduced in recent VDR versions. + +2013-03-31: Version 2.0.0 + +- Official release. diff --git a/PLUGINS/src/epgtableid0/epgtableid0.c b/PLUGINS/src/epgtableid0/epgtableid0.c index 95149093..1aef2a7a 100644 --- a/PLUGINS/src/epgtableid0/epgtableid0.c +++ b/PLUGINS/src/epgtableid0/epgtableid0.c @@ -3,13 +3,13 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: epgtableid0.c 1.3 2013/01/12 14:12:13 kls Exp $ + * $Id: epgtableid0.c 1.4 2013/03/31 09:30:18 kls Exp $ */ #include #include -static const char *VERSION = "0.0.3"; +static const char *VERSION = "2.0.0"; static const char *DESCRIPTION = "EPG handler for events with table id 0x00"; // --- cTable0Handler -------------------------------------------------------- diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY index cb797184..250f36a5 100644 --- a/PLUGINS/src/hello/HISTORY +++ b/PLUGINS/src/hello/HISTORY @@ -82,3 +82,7 @@ VDR Plugin 'hello' Revision History 2013-01-12: Version 0.2.7 - Adapted Makefile to changes introduced in recent VDR versions. + +2013-03-31: Version 2.0.0 + +- Official release. diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c index f7777bec..21f93836 100644 --- a/PLUGINS/src/hello/hello.c +++ b/PLUGINS/src/hello/hello.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: hello.c 2.5 2013/01/12 14:12:18 kls Exp $ + * $Id: hello.c 2.6 2013/03/31 09:30:18 kls Exp $ */ #include @@ -12,7 +12,7 @@ #include #include -static const char *VERSION = "0.2.7"; +static const char *VERSION = "2.0.0"; static const char *DESCRIPTION = trNOOP("A friendly greeting"); static const char *MAINMENUENTRY = trNOOP("Hello"); diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY index 56ccbb8a..b1411de1 100644 --- a/PLUGINS/src/osddemo/HISTORY +++ b/PLUGINS/src/osddemo/HISTORY @@ -55,3 +55,7 @@ VDR Plugin 'osddemo' Revision History 2013-02-19: Version 0.3.1 - The demos can now also be ended with the "Back" key. + +2013-03-31: Version 2.0.0 + +- Official release. diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c index 7a36f42c..f88f7766 100644 --- a/PLUGINS/src/osddemo/osddemo.c +++ b/PLUGINS/src/osddemo/osddemo.c @@ -3,13 +3,13 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: osddemo.c 2.11 2013/02/19 12:43:19 kls Exp $ + * $Id: osddemo.c 2.12 2013/03/31 09:30:18 kls Exp $ */ #include #include -static const char *VERSION = "0.3.1"; +static const char *VERSION = "2.0.0"; static const char *DESCRIPTION = "Demo of arbitrary OSD setup"; static const char *MAINMENUENTRY = "Osd Demo"; diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY index 847f8b9a..a9995d73 100644 --- a/PLUGINS/src/pictures/HISTORY +++ b/PLUGINS/src/pictures/HISTORY @@ -83,3 +83,7 @@ VDR Plugin 'pictures' Revision History 2013-01-12: Version 0.1.5 - Adapted Makefile to changes introduced in recent VDR versions. + +2013-03-31: Version 2.0.0 + +- Official release. diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c index c73e5981..7a46a5f3 100644 --- a/PLUGINS/src/pictures/pictures.c +++ b/PLUGINS/src/pictures/pictures.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: pictures.c 2.8 2013/01/12 14:12:42 kls Exp $ + * $Id: pictures.c 2.9 2013/03/31 09:30:18 kls Exp $ */ #include @@ -11,7 +11,7 @@ #include "menu.h" #include "player.h" -static const char *VERSION = "0.1.5"; +static const char *VERSION = "2.0.0"; static const char *DESCRIPTION = trNOOP("A simple picture viewer"); static const char *MAINMENUENTRY = trNOOP("Pictures"); diff --git a/PLUGINS/src/rcu/HISTORY b/PLUGINS/src/rcu/HISTORY index 6d2d63e0..b9043bbf 100644 --- a/PLUGINS/src/rcu/HISTORY +++ b/PLUGINS/src/rcu/HISTORY @@ -16,3 +16,7 @@ VDR Plugin 'rcu' Revision History 2013-01-12: Version 0.0.4 - Adapted Makefile to changes introduced in recent VDR versions. + +2013-03-31: Version 2.0.0 + +- Official release. diff --git a/PLUGINS/src/rcu/rcu.c b/PLUGINS/src/rcu/rcu.c index a1b4538d..17b538a2 100644 --- a/PLUGINS/src/rcu/rcu.c +++ b/PLUGINS/src/rcu/rcu.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: rcu.c 1.4 2013/01/12 14:12:54 kls Exp $ + * $Id: rcu.c 1.5 2013/03/31 09:30:18 kls Exp $ */ #include @@ -16,7 +16,7 @@ #include #include -static const char *VERSION = "0.0.4"; +static const char *VERSION = "2.0.0"; static const char *DESCRIPTION = "Remote Control Unit"; #define REPEATLIMIT 150 // ms diff --git a/PLUGINS/src/servicedemo/HISTORY b/PLUGINS/src/servicedemo/HISTORY index 11c9c45c..b1c74804 100644 --- a/PLUGINS/src/servicedemo/HISTORY +++ b/PLUGINS/src/servicedemo/HISTORY @@ -17,3 +17,7 @@ VDR Plugin 'servicedemo' Revision History 2013-01-12: Version 0.1.4 - Adapted Makefile to changes introduced in recent VDR versions. + +2013-03-31: Version 2.0.0 + +- Official release. diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c index d8b8e162..eb671acc 100644 --- a/PLUGINS/src/servicedemo/svccli.c +++ b/PLUGINS/src/servicedemo/svccli.c @@ -3,14 +3,14 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: svccli.c 2.3 2013/02/17 14:10:26 kls Exp $ + * $Id: svccli.c 2.4 2013/03/31 09:30:18 kls Exp $ */ #include #include #include -static const char *VERSION = "0.1.4"; +static const char *VERSION = "2.0.0"; static const char *DESCRIPTION = "Service demo client"; static const char *MAINMENUENTRY = "Service demo"; diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c index 55d1bc01..252a4a2c 100644 --- a/PLUGINS/src/servicedemo/svcsvr.c +++ b/PLUGINS/src/servicedemo/svcsvr.c @@ -3,14 +3,14 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: svcsvr.c 2.3 2013/02/17 14:10:38 kls Exp $ + * $Id: svcsvr.c 2.4 2013/03/31 09:30:18 kls Exp $ */ #include #include #include -static const char *VERSION = "0.1.4"; +static const char *VERSION = "2.0.0"; static const char *DESCRIPTION = "Service demo server"; class cPluginSvcSvr : public cPlugin { diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY index 53e70e81..63595076 100644 --- a/PLUGINS/src/skincurses/HISTORY +++ b/PLUGINS/src/skincurses/HISTORY @@ -114,3 +114,7 @@ VDR Plugin 'skincurses' Revision History - The "Recording info" page now displays the name of the channel (if available) from which this recording was taken. + +2013-03-31: Version 2.0.0 + +- Official release. diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c index da9d17ae..8a4da965 100644 --- a/PLUGINS/src/skincurses/skincurses.c +++ b/PLUGINS/src/skincurses/skincurses.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: skincurses.c 2.12 2013/03/03 15:33:59 kls Exp $ + * $Id: skincurses.c 2.13 2013/03/31 09:30:18 kls Exp $ */ #include @@ -12,7 +12,7 @@ #include #include -static const char *VERSION = "0.1.15"; +static const char *VERSION = "2.0.0"; static const char *DESCRIPTION = trNOOP("A text only skin"); static const char *MAINMENUENTRY = NULL; diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY index 4056762c..bbf2c69b 100644 --- a/PLUGINS/src/status/HISTORY +++ b/PLUGINS/src/status/HISTORY @@ -56,3 +56,7 @@ VDR Plugin 'status' Revision History 2013-01-12: Version 0.3.3 - Adapted Makefile to changes introduced in recent VDR versions. + +2013-03-31: Version 2.0.0 + +- Official release. diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c index 4f7b0518..e9e3ae7d 100644 --- a/PLUGINS/src/status/status.c +++ b/PLUGINS/src/status/status.c @@ -3,13 +3,13 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: status.c 2.3 2013/01/12 14:13:17 kls Exp $ + * $Id: status.c 2.4 2013/03/31 09:30:18 kls Exp $ */ #include #include -static const char *VERSION = "0.3.3"; +static const char *VERSION = "2.0.0"; static const char *DESCRIPTION = "Status monitor test"; static const char *MAINMENUENTRY = NULL; diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY index bf69eecf..c6f03959 100644 --- a/PLUGINS/src/svdrpdemo/HISTORY +++ b/PLUGINS/src/svdrpdemo/HISTORY @@ -21,3 +21,7 @@ VDR Plugin 'svdrpdemo' Revision History 2013-01-12: Version 0.0.5 - Adapted Makefile to changes introduced in recent VDR versions. + +2013-03-31: Version 2.0.0 + +- Official release. diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c index 1a0032ef..a1a27663 100644 --- a/PLUGINS/src/svdrpdemo/svdrpdemo.c +++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c @@ -3,12 +3,12 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: svdrpdemo.c 2.2 2013/01/12 14:13:28 kls Exp $ + * $Id: svdrpdemo.c 2.3 2013/03/31 09:30:18 kls Exp $ */ #include -static const char *VERSION = "0.0.5"; +static const char *VERSION = "2.0.0"; static const char *DESCRIPTION = "How to add SVDRP support to a plugin"; class cPluginSvdrpdemo : public cPlugin { diff --git a/config.h b/config.h index b55498ff..6a8e5d36 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.75 2013/03/16 15:12:14 kls Exp $ + * $Id: config.h 2.76 2013/03/31 09:30:18 kls Exp $ */ #ifndef __CONFIG_H @@ -22,13 +22,13 @@ // VDR's own version number: -#define VDRVERSION "1.7.42" -#define VDRVERSNUM 10742 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "2.0.0" +#define VDRVERSNUM 20000 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: -#define APIVERSION "1.7.41" -#define APIVERSNUM 10741 // Version * 10000 + Major * 100 + Minor +#define APIVERSION "2.0.0" +#define APIVERSNUM 20000 // Version * 10000 + Major * 100 + Minor // When loading plugins, VDR searches them by their APIVERSION, which // may be smaller than VDRVERSION in case there have been no changes to diff --git a/po/fr_FR.po b/po/fr_FR.po index 7d0d90ca..6228d7f4 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -839,7 +839,7 @@ msgid "Setup.OSD$Info on channel switch" msgstr "Infos chaîne lors du changement" msgid "Setup.OSD$Timeout requested channel info" -msgstr "Compte à rebours infos chaîne" +msgstr "Affichage infos chaîne non permanent" msgid "Setup.OSD$Scroll pages" msgstr "Défilement par pages" @@ -1112,7 +1112,7 @@ msgid "Setup.Replay$Show replay mode" msgstr "Affichage mode de lecture" msgid "Setup.Replay$Show remaining time" -msgstr "Montrer le temps restant" +msgstr "Afficher le temps restant" msgid "Setup.Replay$Progress display time (s)" msgstr "Afficher la barre de progression (s)" diff --git a/po/lt_LT.po b/po/lt_LT.po index 19262472..dba42240 100644 --- a/po/lt_LT.po +++ b/po/lt_LT.po @@ -847,7 +847,7 @@ msgid "Setup.OSD$Folders in timer menu" msgstr "Katalogai esantys laikmačių meniu" msgid "Setup.OSD$Always sort folders first" -msgstr "" +msgstr "Visada pirmiau rūšiuoti katalogus" msgid "Setup.OSD$Number keys for characters" msgstr "Skaičių mygtukai simboliams" diff --git a/timers.c b/timers.c index 279f5532..9a880e10 100644 --- a/timers.c +++ b/timers.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: timers.c 2.17 2013/03/16 10:37:10 kls Exp $ + * $Id: timers.c 2.18 2013/03/29 15:37:16 kls Exp $ */ #include "timers.h" @@ -720,8 +720,10 @@ cTimer *cTimers::GetMatch(time_t t) for (cTimer *ti = First(); ti; ti = Next(ti)) { if (!ti->Recording() && ti->Matches(t)) { if (ti->Pending()) { - if (ti->Index() > LastPending) + if (ti->Index() > LastPending) { LastPending = ti->Index(); + return ti; + } else continue; } diff --git a/vdr.5 b/vdr.5 index c6ee6b42..b54b2945 100644 --- a/vdr.5 +++ b/vdr.5 @@ -8,7 +8,7 @@ .\" License as specified in the file COPYING that comes with the .\" vdr distribution. .\" -.\" $Id: vdr.5 2.34 2013/03/18 12:37:17 kls Exp $ +.\" $Id: vdr.5 2.36 2013/03/29 10:25:56 kls Exp $ .\" .TH vdr 5 "31 Mar 2013" "2.0" "Video Disk Recorder Files" .SH NAME @@ -98,7 +98,7 @@ l l. \fBH\fR@Horizontal polarization \fBI\fR@Inversion (0, 1) \fBL\fR@Left circular polarization -\fBM\fR@Modulation (2, 5, 6, 10, 11, 16, 32, 64, 128, 256, 998) +\fBM\fR@Modulation (2, 5, 6, 7, 10, 11, 12, 16, 32, 64, 128, 256, 999) \fBO\fR@rollOff (0, 20, 25, 35) \fBP\fR@stream id (0-255) \fBR\fR@Right circular polarization @@ -126,13 +126,14 @@ If no hierarchy is used, set to 0. tab (@); l l. \fB2\fR@QPSK (DVB-S, DVB-S2, DVB-T, DVB-T2, ISDB-T) -\fB5\fR@8PSK (DVB-S2) +\fB5\fR@8PSK (DVB-S, DVB-S2) \fB6\fR@16APSK (DVB-S2) \fB7\fR@32APSK (DVB-S2) \fB10\fR@VSB8 (ATSC aerial) \fB11\fR@VSB16 (ATSC aerial) \fB12\fR@DQPSK (ISDB-T) \fB16\fR@QAM16 (DVB-T, DVB-T2, ISDB-T) +\fB32\fR@QAM32 \fB64\fR@QAM64 (DVB-C, DVB-T, DVB-T2, ISDB-T) \fB128\fR@QAM128 (DVB-C) \fB256\fR@QAM256 (DVB-C, DVB-T2)