Permalink
Browse files

Merge remote-tracking branch 'remotes/origin/master' into FEAT-4237-N…

…ew_skin_property_TV_Guide_idProgram_for_selected_item
  • Loading branch information...
2 parents d0b82a2 + f823e40 commit 689431b32dda30dfd8b23239a75ffc0d1d133078 @Sebastiii Sebastiii committed Mar 13, 2013
Showing with 7,761 additions and 4,210 deletions.
  1. +1 −1 Common-MP-TVE3/OsInfo/OSInfo.cs
  2. +2 −2 Common-MP-TVE3/SolutionInfo.cs
  3. +2 −2 Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh
  4. +1 −1 Tools/InstallationScripts/include/MediaPortalMacros.nsh
  5. +2 −2 Tools/MediaPortal.DeployTool/Utils.cs
  6. +4 −2 TvEngine3/TVLibrary/SetupTv/61_upgrade_mysql_database.sql
  7. +1 −1 TvEngine3/TVLibrary/SetupTv/61_upgrade_sqlserver_database.sql
  8. +8 −4 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Austria.UPC Tirol.xml
  9. +96 −36 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Denmark.Yousee Copenhagen.xml
  10. +51 −1 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Finland.Rauma-DNA.xml
  11. +67 −12 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Finland.Tampere.xml
  12. +15 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.KMS Muenchen.xml
  13. +138 −0 ...e3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Kabel Deutschland (KDG) Braunschweig.xml
  14. +138 −0 ...y/TVServer.Base/TuningParameters/dvbc/Germany.Kabel Deutschland (KDG) Hamburg und Südholstein.xml
  15. +1 −6 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.KabelBW.xml
  16. +203 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Unitymedia Hessen.xml
  17. +49 −9 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Unitymedia NRW.xml
  18. +25 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Norway.GET-Oslo.xml
  19. +31 −31 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem Göteborg.xml
  20. +6 −1 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem Jonkoping.xml
  21. +143 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Sweden.Comhem Uppsala.xml
  22. +11 −1 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Switzerland.UPC Cablecom [DE-FR].xml
  23. +143 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Delta.xml
  24. +4 −4 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 1111.xml
  25. +1 −1 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 5555.xml
  26. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7271.xml
  27. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7800.xml
  28. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7900.xml
  29. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8600.xml
  30. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8888.xml
  31. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9001.xml
  32. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9003.xml
  33. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9004.xml
  34. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9600.xml
  35. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9700.xml
  36. +43 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Australia.QLD - Gold Coast.xml
  37. +28 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Australia.QLD - Toowoomba.xml
  38. +18 −23 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Estonia.All regions.xml
  39. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Estonia.Haapsalu.xml
  40. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Estonia.Koeru.xml
  41. +18 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Estonia.Kohtla-Nõmme, Narva.xml
  42. +8 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Estonia.Pehka, Ellamaa, Paldiski.xml
  43. +18 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Estonia.Pärnu.xml
  44. +8 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Estonia.Ruhnu, Sõrve, Männamaa, Kärdla.xml
  45. +3 −3 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Estonia.Sauvere, Orissaare.xml
  46. +18 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Estonia.Tallinn, Teletorn, Kristiina.xml
  47. +18 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Estonia.Valgjärve, Tartu.xml
  48. +2 −2 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Estonia.Viljandi.xml
  49. +16 −6 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/France.Toulouse - Pic du Midi.xml
  50. +87 −7 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/HongKong.All Regions.xml
  51. +355 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Iceland.All Regions.xml
  52. +1 −1 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Netherlands.Delft.xml
  53. +33 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Knock More - Post Switchover.xml
  54. +6 −6 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Rowridge.xml
  55. +1 −1 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Wenvoe.xml
  56. +328 −138 TvEngine3/TVLibrary/TVServer.Base/WebEPG/channels/channels.xml
  57. +198 −192 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_elpais_es.xml
  58. +103 −102 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_formulatv_com.xml
  59. +179 −109 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_laguiatv_com.xml
  60. +16 −11 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_miguiatv_com.xml
  61. +63 −45 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_ono_es.xml
  62. +70 −58 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_programacion-tdt_com.xml
  63. +138 −0 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_programacion-tv_es.xml
  64. +92 −92 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/NO/0-www_sol_no_detailed.xml
  65. +162 −162 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/NO/1-www_sol_no.xml
  66. +140 −139 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/gazetaecho_pl.xml
  67. +150 −0 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/teleman2_pl.xml
  68. +176 −97 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/PL/teleman_pl.xml
  69. +904 −497 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/RU/www_vsetv_com.xml
  70. +66 −0 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/SE/sverigesradio_se.xml
  71. +347 −48 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/SE/svt_se.xml
  72. +0 −131 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/SE/tvplaneten_tv4_se.xml
  73. +433 −227 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/SE/www_dagenstv_com.xml
  74. +14 −5 TvEngine3/TVLibrary/TvPlugin/TvPlugin/RadioSetupForm.cs
  75. +1 −1 mediaportal/Configuration/App.config
  76. +2 −2 mediaportal/Configuration/Sections/General.cs
  77. +240 −4 mediaportal/Configuration/Sections/TVClient.cs
  78. +15 −0 mediaportal/Configuration/SettingsForm.cs
  79. +50 −0 mediaportal/Configuration/TvServerRemote.cs
  80. +1 −0 mediaportal/Core/guilib/GUISelectButtonControl.cs
  81. +1 −1 mediaportal/MediaPortal.Application/App.config
  82. +2 −2 mediaportal/MediaPortal.Base/VDBParserStrings.xml
  83. +188 −72 mediaportal/MediaPortal.Base/language/strings_ru.xml
  84. +2 −1 mediaportal/MediaPortal.Base/language/strings_sv.xml
  85. +70 −48 mediaportal/MediaPortal.Base/scripts/MovieInfo/IMDB.csscript
  86. +75 −52 mediaportal/MediaPortal.Base/scripts/MovieInfo/IMDB_MP13x.csscript
  87. +2 −2 mediaportal/MediaPortal.Base/scripts/VDBParserStrings.xml
  88. +9 −8 mediaportal/MediaPortal.Base/skin/Default/common.play.xml
  89. +1 −1 mediaportal/MediaPortal.Base/skin/Default/mytvFullScreen.xml
  90. +5 −5 mediaportal/MediaPortal.Base/skin/Default/videoFullScreen.xml
  91. +8 −8 mediaportal/MediaPortal.Base/skin/DefaultWide/common.play.xml
  92. +1 −1 mediaportal/MediaPortal.Base/skin/DefaultWide/mytvFullScreen.xml
  93. +5 −5 mediaportal/MediaPortal.Base/skin/DefaultWide/videoFullScreen.xml
  94. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/background.png
  95. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/background_focus.png
  96. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/block_bg.png
  97. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_focus_toggleoff.png
  98. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_focus_toggleon.png
  99. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_nofocus_toggleoff.png
  100. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_nofocus_toggleon.png
  101. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_texture.png
  102. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_texture_focus.png
  103. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/bar_hor.png
  104. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/bar_vert.png
  105. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/fanart_overlay.png
  106. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/fanart_overlay_top.png
  107. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/hover_mynumberplace.png
  108. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/icon_empty_focus.png
  109. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/icon_empty_nofocus.png
  110. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/mynumberplace_score_bg.png
  111. BIN mediaportal/MediaPortal.Base/skin/Titan/Media/panel_weather2.png
  112. +4 −0 mediaportal/MediaPortal.Base/skin/Titan/fonts.xml
  113. +1,531 −1,655 mediaportal/MediaPortal.Base/skin/Titan/mynumberplace.xml
  114. +107 −85 mediaportal/MediaPortal.Base/skin/Titan/mytetris.xml
  115. +1 −1 mediaportal/MediaPortal.Base/skin/Titan/titan.version.xml
  116. +1 −1 mediaportal/Utils/ServiceImplementations/LogImpl.cs
@@ -589,7 +589,7 @@ public static OsSupport GetOSSupported()
}
if (VerifyDesktopOSMinRequirement(6, 2, 9200, NT_WORKSTATION, 0))
{ // Windows 8 RTM
- return OsSupport.NotSupported;
+ return OsSupport.FullySupported;
}
if (IsServer())
{ // any server OS
@@ -51,8 +51,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.2.300.0")]
-[assembly: AssemblyFileVersion("1.2.300.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
//[assembly: AssemblyInformationalVersion("")]
//[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]
@@ -31,8 +31,8 @@
!define VER_MAJOR 1
-!define VER_MINOR 2
-!define VER_REVISION 300
+!define VER_MINOR 3
+!define VER_REVISION 0
#**********************************************************************************************************#
@@ -711,7 +711,7 @@ DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\MediaPort
${ElseIf} ${IsWin8}
${LOG_TEXT} "INFO" "OSTest::IsWin8"
- StrCpy $0 "OSwarn"
+ StrCpy $0 "OSok"
${ElseIf} ${IsWin2008R2}
${LOG_TEXT} "INFO" "OSTest::IsWin2008R2"
@@ -554,7 +554,7 @@ public static Version GetPackageVersion(string type)
case "max":
major = 1;
minor = 2;
- revision = 200;
+ revision = 300;
break;
}
Version ver = new Version(major, minor, revision);
@@ -604,7 +604,7 @@ public static Version VersionFromRegistry(string regkey)
public static string GetDisplayVersion()
{
- return "1.3.0 RC";
+ return "1.3.0";
}
/// <summary>
@@ -1,6 +1,8 @@
USE %TvLibrary%;
-ALTER TABLE "Channel" ADD COLUMN "channelNumber" int(11) NOT NULL DEFAULT 10000;
-UPDATE Channel c set c.channelNumber = (SELECT t.channelNumber FROM TuningDetail t WHERE t.idChannel = c.idChannel ORDER BY t.idTuning limit 1);
+ALTER TABLE Channel ADD COLUMN channelNumber INT(11) NULL DEFAULT NULL;
+UPDATE Channel c SET c.channelNumber = (SELECT t.channelNumber FROM TuningDetail t WHERE t.idChannel = c.idChannel ORDER BY t.idTuning LIMIT 1);
+UPDATE Channel SET channelNumber = 10000 WHERE ISNULL(channelNumber);
+ALTER TABLE Channel CHANGE channelNumber channelNumber INT(11) NOT NULL DEFAULT 10000;
UPDATE Version SET versionNumber=61;
@@ -2,7 +2,7 @@ USE %TvLibrary%;
GO
ALTER TABLE Channel ADD channelNumber INT NOT NULL CONSTRAINT [DF_Channel_ChannelNumber] DEFAULT 10000
GO
-UPDATE Channel SET channelNumber = (SELECT TOP 1 t.channelNumber FROM TuningDetail AS t WHERE t.idChannel = channel.idChannel ORDER BY t.idTuning)
+UPDATE Channel SET channelNumber = (SELECT TOP 1 t.channelNumber ORDER BY t.idTuning) FROM TuningDetail AS t INNER JOIN Channel AS c ON t.idChannel = c.idChannel
GO
UPDATE Version SET versionNumber=61
GO
@@ -91,17 +91,21 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>330000</Frequency>
- <ModulationType>Mod64Qam</ModulationType>
+ <Frequency>642000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning> <DVBCTuning>
+ <Frequency>578000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>570000</Frequency>
+ <Frequency>330000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>578000</Frequency>
+ <Frequency>570000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -1,160 +1,220 @@
<?xml version="1.0" encoding="utf-8"?>
<ArrayOfDVBCTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <DVBCTuning>
- <Frequency>714000</Frequency>
+ <DVBCTuning>
+ <!--C C8,C Seri,Event,C Hits,C Emo,CFrst -->
+ <Frequency>143000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>730000</Frequency>
+ <!-- Guide,HitsHD,C Kids,C Ten,C Extr,C Act,*V Film,Trailer,SeriHD -->
+ <Frequency>156000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>770000</Frequency>
+ <!--2ØstHD,LorrHD,TV3+HD -->
+ <Frequency>222000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>786000</Frequency>
+ <!--HD DR1,ARD HD,SVT2HD,Guiden -->
+ <Frequency>248000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>794000</Frequency>
+ <!--DR1,DR2,DR1Syn,TV 2,TV2 HD,Hoved,Lorry -->
+ <Frequency>378000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
- <DVBCTuning>
- <Frequency>586000</Frequency>
+ <DVBCTuning>
+ <!--NickHD,NDR HD,SVT1HD,6rn HD -->
+ <Frequency>394000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>594000</Frequency>
+ <!--C9 HD,dk4 HD,DiscHD,Canal8 -->
+ <Frequency>402000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>602000</Frequency>
+ <!--Start forfra,Tv-arkiv,Cinema -->
+ <Frequency>418000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>618000</Frequency>
+ <!--DR3,YouBio,C F HD,MTV HD -->
+ <Frequency>442000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>626000</Frequency>
+ <!--AnimHD,EkstHD,DisnHD,WildHD -->
+ <Frequency>450000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
-
-
<DVBCTuning>
- <Frequency>143000</Frequency>
+ <!--SilvHD,ESp2HD,RTL HD,ESPNHD -->
+ <Frequency>458000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>156000</Frequency>
+ <!--Histor,Explor,Golf,ESPNcl,Via NC,Blue H,PlayBy,GolfHD-->
+ <Frequency>482000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>330000</Frequency>
+ <!--Tinget,MTVDan,MTVhit,MTVRoc,VH1Cla,Roj TV,Me TV,TV Pol,ZDF HD -->
+ <Frequency>490000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>378000</Frequency>
+ <!-- NickJr,ZDF,Nickel,NatGeo,BBC W,Infoka,Animal,Disney,6´eren -->
+ <Frequency>498000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>418000</Frequency>
+ <!-- NickJr,ZDF,Nickel,NatGeo,BBC W,Infoka,Animal,Disney,6´eren -->
+ <Frequency>538000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>442000</Frequency>
+ <!-- BBC E,3Puls,Charli,Kanal4,TV3+,Canal9 -->
+ <Frequency>506000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>450000</Frequency>
+ <!--DR Ram,NRK1,MTV,VH1,Cartoo,BBC L,dk4,TLC,DisnXD -->
+ <Frequency>514000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>458000</Frequency>
+ <!--EuStar,TGRT,RTK 1,Al Jaz,AlAoul,AlMasr,Kanal7,Euro D,HUSTtv,VOX,Kral,EDTV -->
+ <Frequency>522000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>482000</Frequency>
+ <!--Ekstra,RTL,NDR,2News,7'eren,CNN,Kanal5,DR K -->
+ <Frequency>530000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>490000</Frequency>
+ <!--Geo,AAG,World,Scienc,TV5,KSpHD,TV4,Update -->
+ <Frequency>538000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>498000</Frequency>
+ <!--Lig TV,STV,Trkmax,ATV,AbuDTV,Iqraa,ShowTV,TRT,MBC -->
+ <Frequency>546000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>506000</Frequency>
+ <!--TV3,SVT1,SVT2,Sat1,BBC K,Discov,TCM,Pro7 -->
+ <Frequency>554000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>514000</Frequency>
+ <!--Realit,Arte,Motors,Showtm,Bloom,Star!,ID,Norge2,NGWild -->
+ <Frequency>562000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>522000</Frequency>
+ <!--Mezzo,CNBC,Travel,ESPN,K5 HD,3Sp HD -->
+ <Frequency>570000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>530000</Frequency>
+ <!--3Sat,Zulu,EuroSp,KSport,EuSp 2,ARD,3Sport,24Nord -->
+ <Frequency>578000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>538000</Frequency>
+ <!--ShowHD,EuSpHD,BBC HD,MTVLHD -->
+ <Frequency>586000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>546000</Frequency>
+ <!--Spil,CCTV 4,RaiUno,TVE,StarPl,Franc2,StarGo,ThaiTV,HisCHD -->
+ <Frequency>594000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>554000</Frequency>
+ <!--AlEng,HRT1,Pink+,Butik,RTSsat,RTCG,Hayat,NGC HD -->
+ <Frequency>602000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>562000</Frequency>
+ <!--Kanal 4,TV3+HD,6rn HD,C9 HD,BBC K -->
+ <Frequency>618000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>570000</Frequency>
+ <!--Charli,TV3+,Canal9,2News,Zulu,6´eren,BBC W -->
+ <Frequency>626000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>578000</Frequency>
+ <!-- 3Sport,3Puls,BBC W,DisnXD,KSport,Nickel,TCM,VH1 -->
+ <Frequency>714000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <!-- Animal,BBC E,Cartoo,Discov,Disney,MTV,NatGeo,7'eren -->
+ <Frequency>730000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <!-- DisnHD,EuSpHD,ESp2HD,MTV HD -->
+ <Frequency>770000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <!-- BBC L,CNN,DisnJr,EuroSp,EuSp 2,TLC,TNT -->
+ <Frequency>786000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <!-- 3Sp HD,NickHD,TNT HD,TLC HD -->
+ <Frequency>794000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <!-- KSp HD,DiscHD,Canal8,AnimHD -->
+ <Frequency>858000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
-</ArrayOfDVBCTuning>
+</ArrayOfDVBCTuning>
+
Oops, something went wrong.

0 comments on commit 689431b

Please sign in to comment.