Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merged with latest trunk

  • Loading branch information...
commit c39bf01707276e2f4981210184b6bcbf27250c55 2 parents 59b0b41 + fbfe149
@gibman gibman authored
Showing with 8,236 additions and 4,881 deletions.
  1. +5 −0 TVLibrary/SetupTv/60_upgrade_mysql_database.sql
  2. +8 −0 TVLibrary/SetupTv/60_upgrade_sqlserver_database.sql
  3. +2 −5 TVLibrary/SetupTv/Sections/CardAnalog.cs
  4. +2 −0  TVLibrary/SetupTv/SetupTv.csproj
  5. +41 −8 TVLibrary/TVDatabase/Card.cs
  6. +1 −1  TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs
  7. +10 −3 TVLibrary/TVLibrary/Implementations/TvCardCollection.cs
  8. +10 −0 TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Unitymedia NRW.xml
  9. +20 −0 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 1111.xml
  10. +25 −0 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 5555.xml
  11. +22 −2 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7271.xml
  12. +25 −0 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7800.xml
  13. +18 −3 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7900.xml
  14. +28 −3 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8400.xml
  15. +25 −0 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8600.xml
  16. +18 −3 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8888.xml
  17. +27 −2 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9001.xml
  18. +21 −1 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9003.xml
  19. +20 −0 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9004.xml
  20. +28 −3 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9600.xml
  21. +18 −3 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9700.xml
  22. +40 −31 TVLibrary/TVServer.Base/TuningParameters/dvbs/0.8°W Thor 3,5,6 Intelsat 10-02.xml
  23. +116 −80 TVLibrary/TVServer.Base/TuningParameters/dvbs/10.0°E Eutelsat W2A.xml
  24. +47 −38 TVLibrary/TVServer.Base/TuningParameters/dvbs/100.5°E AsiaSat 5.xml
  25. +22 −4 TVLibrary/TVServer.Base/TuningParameters/dvbs/101.0°W AMC 2,4 DirecTV 4S,8.xml
  26. +38 −2 TVLibrary/TVServer.Base/TuningParameters/dvbs/103.0°W AMC 1.xml
  27. +9 −0 TVLibrary/TVServer.Base/TuningParameters/dvbs/105.0°W AMC 15,18.xml
  28. +46 −10 TVLibrary/TVServer.Base/TuningParameters/dvbs/105.5°E AsiaSat 3S.xml
  29. +71 −8 TVLibrary/TVServer.Base/TuningParameters/dvbs/11.0°W Express AM44.xml
  30. +3 −57 TVLibrary/TVServer.Base/TuningParameters/dvbs/110.5°E Sinosat 1.xml
  31. +91 −19 TVLibrary/TVServer.Base/TuningParameters/dvbs/113.0°E Koreasat 5 Palapa D.xml
  32. +26 −44 TVLibrary/TVServer.Base/TuningParameters/dvbs/113.0°W SatMex 6.xml
  33. +9 −9 TVLibrary/TVServer.Base/TuningParameters/dvbs/116.0°E Koreasat 3.xml
  34. +49 −31 TVLibrary/TVServer.Base/TuningParameters/dvbs/116.8°W SatMex 5.xml
  35. +27 −0 TVLibrary/TVServer.Base/TuningParameters/dvbs/119.0°W Anik F3 EchoStar 7 DirecTV 7S.xml
  36. +21 −93 TVLibrary/TVServer.Base/TuningParameters/dvbs/12.5°W Atlantic Bird 1.xml
  37. +30 −30 TVLibrary/TVServer.Base/TuningParameters/dvbs/121.0°W EchoStar 9,Galaxy 23.xml
  38. +41 −59 TVLibrary/TVServer.Base/TuningParameters/dvbs/122.2°E AsiaSat 4.xml
  39. +0 −18 TVLibrary/TVServer.Base/TuningParameters/dvbs/123.0°W Galaxy 18.xml
  40. +0 −72 TVLibrary/TVServer.Base/TuningParameters/dvbs/124.0°E JCSAT 4A.xml
  41. +29 −2 TVLibrary/TVServer.Base/TuningParameters/dvbs/125.0°W Galaxy 14 AMC 21.xml
  42. +9 −9 TVLibrary/TVServer.Base/TuningParameters/dvbs/128.0°E JCSAT 3A.xml
  43. +38 −83 TVLibrary/TVServer.Base/TuningParameters/dvbs/13.0°E Hot Bird 6,8,9.xml
  44. +9 −0 TVLibrary/TVServer.Base/TuningParameters/dvbs/131.0°W AMC 11.xml
  45. +4 −13 TVLibrary/TVServer.Base/TuningParameters/dvbs/132.0°E Vinasat 1 JCSAT 5A.xml
  46. +0 −36 TVLibrary/TVServer.Base/TuningParameters/dvbs/134.0°E Apstar 6.xml
  47. +36 −9 TVLibrary/TVServer.Base/TuningParameters/dvbs/138.0°E Telstar 18.xml
  48. +34 −43 TVLibrary/TVServer.Base/TuningParameters/dvbs/146.0°E Agila 2.xml
  49. +32 −5 TVLibrary/TVServer.Base/TuningParameters/dvbs/15.0°W Telstar 12.xml
  50. +0 −9 TVLibrary/TVServer.Base/TuningParameters/dvbs/152.0°E Optus D2.xml
  51. +1 −1  TVLibrary/TVServer.Base/TuningParameters/dvbs/156.0°E Optus C1,D3.xml
  52. +18 −0 TVLibrary/TVServer.Base/TuningParameters/dvbs/160.0°E Optus D1.xml
  53. +41 −14 TVLibrary/TVServer.Base/TuningParameters/dvbs/166.0°E Intelsat 8.xml
  54. +9 −0 TVLibrary/TVServer.Base/TuningParameters/dvbs/177.0°W NSS 9.xml
  55. +9 −0 TVLibrary/TVServer.Base/TuningParameters/dvbs/18.0°W Intelsat 901.xml
  56. +0 −9 TVLibrary/TVServer.Base/TuningParameters/dvbs/180.0°E Intelsat 701.xml
  57. +46 −19 TVLibrary/TVServer.Base/TuningParameters/dvbs/19.2°E Astra 1H,1KR,1L,1M.xml
  58. +158 −23 TVLibrary/TVServer.Base/TuningParameters/dvbs/2.0°E Astra 1C.xml
  59. +42 −6 TVLibrary/TVServer.Base/TuningParameters/dvbs/2.8°E Rascom 1.xml
  60. +52 −43 TVLibrary/TVServer.Base/TuningParameters/dvbs/21.6°E Eutelsat W6.xml
  61. +0 −27 TVLibrary/TVServer.Base/TuningParameters/dvbs/22.0°W NSS 7.xml
  62. +101 −29 TVLibrary/TVServer.Base/TuningParameters/dvbs/23.5°E Astra 1E,1G,3A.xml
  63. +41 −23 TVLibrary/TVServer.Base/TuningParameters/dvbs/24.5°W Intelsat 905.xml
  64. +6 −51 TVLibrary/TVServer.Base/TuningParameters/dvbs/25.5°E Eurobird 2.xml
  65. +60 −33 TVLibrary/TVServer.Base/TuningParameters/dvbs/26.0°E Badr 4,6.xml
  66. +15 −6 TVLibrary/TVServer.Base/TuningParameters/dvbs/27.5°W Intelsat 907.xml
  67. +34 −43 TVLibrary/TVServer.Base/TuningParameters/dvbs/28.2°E Eurobird 1 Astra 2A,2B,2D.xml
  68. +181 −55 TVLibrary/TVServer.Base/TuningParameters/dvbs/30.0°W Hispasat 1C,1D.xml
  69. +134 −53 TVLibrary/TVServer.Base/TuningParameters/dvbs/30.5°E Arabsat 2B.xml
  70. +16 −25 TVLibrary/TVServer.Base/TuningParameters/dvbs/31.5°E Astra 2C.xml
  71. +55 −28 TVLibrary/TVServer.Base/TuningParameters/dvbs/33.0°E Eurobird 3 Intelsat 802.xml
  72. +25 −34 TVLibrary/TVServer.Base/TuningParameters/dvbs/34.5°W Intelsat 903.xml
  73. +73 −118 TVLibrary/TVServer.Base/TuningParameters/dvbs/36.0°E Eutelsat W4,W7.xml
  74. +39 −3 TVLibrary/TVServer.Base/TuningParameters/dvbs/37.5°W NSS 10 Telstar 11N.xml
  75. +56 −29 TVLibrary/TVServer.Base/TuningParameters/dvbs/38.0°E Paksat 1.xml
  76. +27 −27 TVLibrary/TVServer.Base/TuningParameters/dvbs/39.0°E Hellas Sat 2.xml
  77. +38 −11 TVLibrary/TVServer.Base/TuningParameters/dvbs/4.0°E Eurobird 4A.xml
  78. +68 −95 TVLibrary/TVServer.Base/TuningParameters/dvbs/4.0°W Amos 2,3.xml
  79. +23 −41 TVLibrary/TVServer.Base/TuningParameters/dvbs/4.8°E NSS 5 Sirius 4.xml
  80. +6 −6 TVLibrary/TVServer.Base/TuningParameters/dvbs/40.0°E Express AM1.xml
  81. +108 −81 TVLibrary/TVServer.Base/TuningParameters/dvbs/40.5°W NSS 806.xml
  82. +200 −137 TVLibrary/TVServer.Base/TuningParameters/dvbs/42.0°E Türksat 2A,3A.xml
  83. +12 −39 TVLibrary/TVServer.Base/TuningParameters/dvbs/45.0°E Intelsat 12.xml
  84. +17 −8 TVLibrary/TVServer.Base/TuningParameters/dvbs/45.0°W Intelsat 14.xml
  85. +22 −4 TVLibrary/TVServer.Base/TuningParameters/dvbs/49.0°E Yamal 202.xml
  86. +82 −118 TVLibrary/TVServer.Base/TuningParameters/dvbs/5.0°W Atlantic Bird 3.xml
  87. +32 −14 TVLibrary/TVServer.Base/TuningParameters/dvbs/50.0°W Intelsat 705,1R.xml
  88. +66 −12 TVLibrary/TVServer.Base/TuningParameters/dvbs/53.0°E Express AM22.xml
  89. +9 −0 TVLibrary/TVServer.Base/TuningParameters/dvbs/55.0°E Insat 3E.xml
  90. +66 −66 TVLibrary/TVServer.Base/TuningParameters/dvbs/55.5°W Intelsat 805.xml
  91. +72 −36 TVLibrary/TVServer.Base/TuningParameters/dvbs/57.0°E NSS 12.xml
  92. +6 −24 TVLibrary/TVServer.Base/TuningParameters/dvbs/58.0°W Intelsat 9.xml
  93. +24 −6 TVLibrary/TVServer.Base/TuningParameters/dvbs/60.0°E Intelsat 904.xml
  94. +27 −9 TVLibrary/TVServer.Base/TuningParameters/dvbs/61.0°W Amazonas 1.xml
  95. +9 −0 TVLibrary/TVServer.Base/TuningParameters/dvbs/61.5°W EchoStar 3,12.xml
  96. +0 −18 TVLibrary/TVServer.Base/TuningParameters/dvbs/62.0°E Intelsat 902.xml
  97. +27 −45 TVLibrary/TVServer.Base/TuningParameters/dvbs/63.0°W Telstar 14.xml
  98. +28 −28 TVLibrary/TVServer.Base/TuningParameters/dvbs/64.2°E Intelsat 906.xml
  99. +36 −0 TVLibrary/TVServer.Base/TuningParameters/dvbs/65.0°W Star One C1.xml
  100. +55 −10 TVLibrary/TVServer.Base/TuningParameters/dvbs/66.0°E Intelsat 702.xml
  101. +79 −52 TVLibrary/TVServer.Base/TuningParameters/dvbs/68.5°E Intelsat 7,10.xml
  102. +72 −81 TVLibrary/TVServer.Base/TuningParameters/dvbs/7.0°E Eutelsat W3A.xml
  103. +63 −45 TVLibrary/TVServer.Base/TuningParameters/dvbs/7.0°W Nilesat 101,102 Atlantic Bird 4A.xml
  104. +10 −46 TVLibrary/TVServer.Base/TuningParameters/dvbs/70.0°W Star One C2.xml
  105. +2 −38 TVLibrary/TVServer.Base/TuningParameters/dvbs/72.0°W Nahuel 1 AMC 6.xml
  106. +390 −0 TVLibrary/TVServer.Base/TuningParameters/dvbs/72.5°W DirecTV 1R Nimiq 5.xml
  107. +13 −13 TVLibrary/TVServer.Base/TuningParameters/dvbs/74.0°E Insat 3C,4CR Edusat.xml
  108. +37 −19 TVLibrary/TVServer.Base/TuningParameters/dvbs/75.0°E ABS 1.xml
  109. +49 −22 TVLibrary/TVServer.Base/TuningParameters/dvbs/75.0°W Brasilsat B3.xml
  110. +110 −29 TVLibrary/TVServer.Base/TuningParameters/dvbs/76.5°E Apstar 2R.xml
  111. +15 −6 TVLibrary/TVServer.Base/TuningParameters/dvbs/77.0°W EchoStar 4,8.xml
  112. +15 −6 TVLibrary/TVServer.Base/TuningParameters/dvbs/78.0°W Simón Bolívar.xml
  113. +106 −61 TVLibrary/TVServer.Base/TuningParameters/dvbs/78.5°E Thaicom 2,5.xml
  114. +0 −9 TVLibrary/TVServer.Base/TuningParameters/dvbs/79.0°W AMC 5.xml
  115. +183 −57 TVLibrary/TVServer.Base/TuningParameters/dvbs/8.0°W Telecom 2D Atlantic Bird 2.xml
  116. +21 −12 TVLibrary/TVServer.Base/TuningParameters/dvbs/80.0°E Express AM2,MD1.xml
  117. +4 −13 TVLibrary/TVServer.Base/TuningParameters/dvbs/82.0°W Nimiq 4.xml
  118. +81 −54 TVLibrary/TVServer.Base/TuningParameters/dvbs/83.0°E Insat 2E,3B,4A.xml
  119. +19 −1 TVLibrary/TVServer.Base/TuningParameters/dvbs/83.0°W AMC 9.xml
  120. +2 −20 TVLibrary/TVServer.Base/TuningParameters/dvbs/84.0°W Brasilsat B4.xml
  121. +36 −0 TVLibrary/TVServer.Base/TuningParameters/dvbs/85.2°E Intelsat 15.xml
  122. +38 −20 TVLibrary/TVServer.Base/TuningParameters/dvbs/87.0°W AMC 3.xml
  123. +28 −55 TVLibrary/TVServer.Base/TuningParameters/dvbs/88.0°E ST 1.xml
  124. +49 −31 TVLibrary/TVServer.Base/TuningParameters/dvbs/89.0°W Galaxy 28.xml
  125. +33 −15 TVLibrary/TVServer.Base/TuningParameters/dvbs/9.0°E Eurobird 9A.xml
  126. +28 −46 TVLibrary/TVServer.Base/TuningParameters/dvbs/90.0°E Yamal 201.xml
  127. +68 −86 TVLibrary/TVServer.Base/TuningParameters/dvbs/91.0°W Nimiq 1 Galaxy 17.xml
  128. +49 −58 TVLibrary/TVServer.Base/TuningParameters/dvbs/91.5°E Measat 3,3a.xml
  129. +0 −9 TVLibrary/TVServer.Base/TuningParameters/dvbs/92.2°E Chinasat 9.xml
  130. +28 −1 TVLibrary/TVServer.Base/TuningParameters/dvbs/93.1°W Galaxy 25.xml
  131. +48 −39 TVLibrary/TVServer.Base/TuningParameters/dvbs/93.5°E Insat 3A,4B.xml
  132. +34 −34 TVLibrary/TVServer.Base/TuningParameters/dvbs/95.0°E NSS 6.xml
  133. +75 −21 TVLibrary/TVServer.Base/TuningParameters/dvbs/95.0°W Galaxy 3C.xml
  134. +9 −9 TVLibrary/TVServer.Base/TuningParameters/dvbs/96.5°E Express AM33.xml
  135. +51 −78 TVLibrary/TVServer.Base/TuningParameters/dvbs/97.0°W Galaxy 19.xml
  136. +151 −151 TVLibrary/TVServer.Base/TuningParameters/dvbs/satellites.xml
  137. +6 −6 TVLibrary/TVServer.Base/TuningParameters/dvbt/France.Lyon - Mont-Pilat.xml
  138. +6 −6 TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Emley Moor.xml
  139. +6 −6 TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Fenton.xml
  140. +6 −6 TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Oxford.xml
  141. +6 −6 TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Sutton Coldfield.xml
  142. +297 −166 TVLibrary/TVServer.Base/WebEPG/channels/channels.xml
  143. +19 −12 TVLibrary/TVServer.Base/WebEPG/grabbers/CZ/tv_sms_cz.xml
  144. +165 −41 TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_elpais_es.xml
  145. +23 −0 TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_espanol_cntv_cn.xml
  146. +32 −32 TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_estdt_com.xml
  147. +87 −10 TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_formulatv_com.xml
  148. +0 −20 TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_goltelevision_com.xml
  149. +121 −0 TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_laguiatv_com.xml
  150. +33 −34 TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_miguiatv_com.xml
  151. +159 −47 TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_ono_es.xml
  152. +51 −46 TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_programacion-tdt_com.xml
  153. +57 −57 TVLibrary/TVServer.Base/WebEPG/grabbers/FI/www_telvis_fi.xml
  154. +403 −338 TVLibrary/TVServer.Base/WebEPG/grabbers/GB/1-xmltv_radiotimes_com.xml
  155. +665 −410 TVLibrary/TVServer.Base/WebEPG/grabbers/GB/2-www_mydigiguide_com.xml
  156. +15 −9 TVLibrary/TVServer.Base/WebEPG/grabbers/SE/svt_se.xml
  157. +38 −30 TVLibrary/TVServer.Base/WebEPG/grabbers/SE/www_dagenstv_com.xml
  158. +4 −4 TVLibrary/TvLibrary.sln
  159. +518 −0 TVLibrary/TvPlugin/TvPlugin/TCPEventClient/TCPClient.cs
View
5 TVLibrary/SetupTv/60_upgrade_mysql_database.sql
@@ -0,0 +1,5 @@
+USE %TvLibrary%;
+
+UPDATE Card SET stopgraph = 1;
+
+UPDATE Version SET versionNumber = 60;
View
8 TVLibrary/SetupTv/60_upgrade_sqlserver_database.sql
@@ -0,0 +1,8 @@
+use %TvLibrary%
+GO
+
+UPDATE Card SET stopgraph = 1
+GO
+
+UPDATE Version SET versionNumber=60
+GO
View
7 TVLibrary/SetupTv/Sections/CardAnalog.cs
@@ -1206,11 +1206,8 @@ private void DoRadioScan()
dbChannel.IsRadio = channel.IsRadio;
dbChannel.Persist();
- if (dbChannel.IsTv)
- {
- layer.AddChannelToGroup(dbChannel, TvConstants.TvGroupNames.Analog);
- }
- if (dbChannel.IsRadio)
+ layer.AddChannelToRadioGroup(dbChannel, TvConstants.RadioGroupNames.AllChannels);
+ if (checkBoxCreateSignalGroup.Checked)
{
layer.AddChannelToRadioGroup(dbChannel, TvConstants.RadioGroupNames.Analog);
}
View
2  TVLibrary/SetupTv/SetupTv.csproj
@@ -663,6 +663,8 @@
<EmbeddedResource Include="40_upgrade_sqlserver_database.sql" />
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Include="60_upgrade_mysql_database.sql" />
+ <EmbeddedResource Include="60_upgrade_sqlserver_database.sql" />
<Content Include="images\animation.SatDish.gif" />
<Content Include="images\icon.card.gif" />
<Content Include="images\icon.computer.gif" />
View
49 TVLibrary/TVDatabase/Card.cs
@@ -62,19 +62,46 @@ public class Card : Persistent, IComparable
[TableColumn("preload", NotNull = true)] private bool preloadCard;
[TableColumn("stopgraph", NotNull = true)] private bool stopGraph;
- [TableColumn("CAM", NotNull = true)] private bool CAModule;
+ [TableColumn("CAM", NotNull = true)] private bool caModule;
[TableColumn("NetProvider", NotNull = true)] private int NetProvider;
#endregion
#region Constructors
+ /// <summary>
+ /// For backwards compatibility: do *not* use.
+ /// </summary>
+ [System.Obsolete("Use the constructor that provides access to all parameters.")]
+ public Card(string devicePath, string name, int priority, bool grabEPG, DateTime lastEpgGrab, string recordingFolder,
+ int idServer, bool enabled, int camType, string timeshiftingFolder, int recordingFormat,
+ int decryptLimit, int netProvider)
+ {
+ isChanged = true;
+ this.devicePath = devicePath;
+ this.name = name;
+ this.priority = priority;
+ this.grabEPG = grabEPG;
+ this.lastEpgGrab = lastEpgGrab;
+ this.recordingFolder = recordingFolder;
+ this.idServer = idServer;
+ this.enabled = enabled;
+ this.camType = camType;
+ this.timeshiftingFolder = timeshiftingFolder;
+ this.recordingFormat = recordingFormat;
+ this.decryptLimit = decryptLimit;
+ this.preloadCard = false;
+ this.stopGraph = true;
+ this.caModule = false;
+ this.NetProvider = netProvider;
+ }
+
/// <summary>
/// Create a new object by specifying all fields (except the auto-generated primary key field).
/// </summary>
public Card(string devicePath, string name, int priority, bool grabEPG, DateTime lastEpgGrab, string recordingFolder,
int idServer, bool enabled, int camType, string timeshiftingFolder, int recordingFormat,
- int decryptLimit, int NetProvider)
+ int decryptLimit, bool preloadCard, bool stopGraph, bool caModule, int netProvider)
{
isChanged = true;
this.devicePath = devicePath;
@@ -89,7 +116,10 @@ public class Card : Persistent, IComparable
this.timeshiftingFolder = timeshiftingFolder;
this.recordingFormat = recordingFormat;
this.decryptLimit = decryptLimit;
- this.NetProvider = NetProvider;
+ this.preloadCard = preloadCard;
+ this.stopGraph = stopGraph;
+ this.caModule = caModule;
+ this.NetProvider = netProvider;
}
/// <summary>
@@ -98,7 +128,7 @@ public class Card : Persistent, IComparable
/// </summary>
public Card(int idCard, string devicePath, string name, int priority, bool grabEPG, DateTime lastEpgGrab,
string recordingFolder, int idServer, bool enabled, int camType, string timeshiftingFolder,
- int recordingFormat, int decryptLimit, int NetProvider)
+ int recordingFormat, int decryptLimit, bool preloadCard, bool stopGraph, bool caModule, int netProvider)
{
this.idCard = idCard;
this.devicePath = devicePath;
@@ -113,7 +143,10 @@ public class Card : Persistent, IComparable
this.timeshiftingFolder = timeshiftingFolder;
this.recordingFormat = recordingFormat;
this.decryptLimit = decryptLimit;
- this.NetProvider = NetProvider;
+ this.preloadCard = preloadCard;
+ this.stopGraph = stopGraph;
+ this.caModule = caModule;
+ this.NetProvider = netProvider;
}
#endregion
@@ -181,11 +214,11 @@ public int DecryptLimit
/// </summary>
public bool CAM
{
- get { return CAModule; }
+ get { return caModule; }
set
{
- isChanged |= CAModule != value;
- CAModule = value;
+ isChanged |= caModule != value;
+ caModule = value;
}
}
View
2  TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs
@@ -128,7 +128,7 @@ public Card AddCard(string name, string devicePath, Server server)
// Card(devicePath, name, priority, grabEPG, lastEpgGrab, recordingFolder, idServer, enabled, camType, timeshiftingFolder, recordingFormat, decryptLimit)
//
Card newCard = new Card(devicePath, name, 1, true, new DateTime(2000, 1, 1), "", server.IdServer, true, 0, "", 0,
- 0, (int)TvDatabase.DbNetworkProvider.Generic);
+ 0, false, true, false, (int)TvDatabase.DbNetworkProvider.Generic);
newCard.Persist();
return newCard;
}
View
13 TVLibrary/TVLibrary/Implementations/TvCardCollection.cs
@@ -331,10 +331,17 @@ private void DetectCards()
_cards.Add(dvbsCard);
connected = true;
}
- if (connected) break; // already found one, no need to continue
+ if (connected)
+ {
+ graphBuilder.RemoveFilter(tmp);
+ Release.ComObject("tmp filter", tmp);
+ break; // already found one, no need to continue
+ }
+ else if (n == (pulcNetworkTypes - 1))
+ {
+ Log.Log.WriteFile("Connected with generic MS Network Provider however network types don't match, using the original method");
+ }
}
- graphBuilder.RemoveFilter(tmp);
- Release.ComObject("tmp filter", tmp);
}
else
{
View
10 TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.Unitymedia NRW.xml
@@ -155,4 +155,14 @@
<ModulationType>Mod256Qam</ModulationType>
<SymbolRate>6900</SymbolRate>
</DVBCTuning>
+ <DVBCTuning>
+ <Frequency>129000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>666000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
</ArrayOfDVBCTuning>
View
20 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 1111.xml
@@ -121,11 +121,31 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>818750</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>802750</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>546750</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>570750</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>626750</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>436000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
View
25 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 5555.xml
@@ -135,4 +135,29 @@
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
+ <DVBCTuning>
+ <Frequency>778000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>786000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>802000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>810000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>474000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
</ArrayOfDVBCTuning>
View
24 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7271.xml
@@ -31,7 +31,7 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>402000</Frequency>
+ <Frequency>158000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -111,7 +111,7 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>158000</Frequency>
+ <Frequency>402000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -121,11 +121,31 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>738000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>770000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>650000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>682000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>642000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>287000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
View
25 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7800.xml
@@ -121,11 +121,31 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>514000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>794000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>164000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>474000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>498000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>425000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
@@ -135,4 +155,9 @@
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
+ <DVBCTuning>
+ <Frequency>778000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
</ArrayOfDVBCTuning>
View
21 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 7900.xml
@@ -26,7 +26,7 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>578000</Frequency>
+ <Frequency>530000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -121,7 +121,7 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>634000</Frequency>
+ <Frequency>498000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -131,6 +131,21 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>164000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>474000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>490000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>425000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
@@ -141,7 +156,7 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>272000</Frequency>
+ <Frequency>634000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
View
31 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8400.xml
@@ -66,12 +66,12 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>385000</Frequency>
+ <Frequency>842000</Frequency>
<ModulationType>Mod256Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>393000</Frequency>
+ <Frequency>530000</Frequency>
<ModulationType>Mod256Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -91,7 +91,7 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>377000</Frequency>
+ <Frequency>546000</Frequency>
<ModulationType>Mod256Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -121,11 +121,31 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>514000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>482000</Frequency>
<ModulationType>Mod256Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>164000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>474000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>498000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>425000</Frequency>
<ModulationType>Mod256Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
@@ -135,4 +155,9 @@
<ModulationType>Mod256Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
+ <DVBCTuning>
+ <Frequency>778000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
</ArrayOfDVBCTuning>
View
25 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8600.xml
@@ -121,11 +121,31 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>514000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>482000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>164000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>474000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>498000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>425000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
@@ -135,4 +155,9 @@
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
+ <DVBCTuning>
+ <Frequency>778000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
</ArrayOfDVBCTuning>
View
21 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 8888.xml
@@ -131,17 +131,32 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>562750</Frequency>
+ <Frequency>570750</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>570750</Frequency>
+ <Frequency>674750</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>698750</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>738750</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>746750</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>730750</Frequency>
+ <Frequency>562750</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
View
29 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9001.xml
@@ -26,7 +26,7 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>842000</Frequency>
+ <Frequency>738000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -56,7 +56,7 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>738000</Frequency>
+ <Frequency>842000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -121,11 +121,31 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>570000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>794000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>164000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>474000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>498000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>425000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
@@ -135,4 +155,9 @@
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
+ <DVBCTuning>
+ <Frequency>546000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
</ArrayOfDVBCTuning>
View
22 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9003.xml
@@ -121,7 +121,7 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>546000</Frequency>
+ <Frequency>570000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -131,6 +131,21 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>164000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>474000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>498000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>425000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
@@ -140,4 +155,9 @@
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
+ <DVBCTuning>
+ <Frequency>546000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
</ArrayOfDVBCTuning>
View
20 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9004.xml
@@ -121,11 +121,31 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>454000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>462000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>594000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>612000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>446000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>287000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
View
31 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9600.xml
@@ -66,12 +66,12 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>385000</Frequency>
+ <Frequency>842000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>393000</Frequency>
+ <Frequency>530000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -91,7 +91,7 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>377000</Frequency>
+ <Frequency>546000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -121,11 +121,31 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>514000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>794000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>164000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>474000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>498000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>425000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
@@ -135,4 +155,9 @@
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
+ <DVBCTuning>
+ <Frequency>778000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
</ArrayOfDVBCTuning>
View
21 TVLibrary/TVServer.Base/TuningParameters/dvbc/The Netherlands.Ziggo NID 9700.xml
@@ -121,7 +121,7 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>778000</Frequency>
+ <Frequency>514000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
@@ -131,6 +131,21 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>164000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>474000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>498000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6875</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>425000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
<SymbolRate>6875</SymbolRate>
@@ -141,8 +156,8 @@
<SymbolRate>6875</SymbolRate>
</DVBCTuning>
<DVBCTuning>
- <Frequency>184750</Frequency>
+ <Frequency>778000</Frequency>
<ModulationType>Mod64Qam</ModulationType>
- <SymbolRate>4000</SymbolRate>
+ <SymbolRate>6875</SymbolRate>
</DVBCTuning>
</ArrayOfDVBCTuning>
View
71 TVLibrary/TVServer.Base/TuningParameters/dvbs/0.8°W Thor 3,5,6 Intelsat 10-02.xml
@@ -145,11 +145,11 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11045000</CarrierFrequency>
+ <CarrierFrequency>11042000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
- <SymbolRate>2500</SymbolRate>
+ <SymbolRate>2200</SymbolRate>
<Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate3_4</InnerFecRate>
+ <InnerFecRate>Rate7_8</InnerFecRate>
<Pilot>NotSet</Pilot>
<Rolloff>NotSet</Rolloff>
</Transponder>
@@ -163,15 +163,6 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11052000</CarrierFrequency>
- <Polarisation>LinearH</Polarisation>
- <SymbolRate>2590</SymbolRate>
- <Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate3_4</InnerFecRate>
- <Pilot>NotSet</Pilot>
- <Rolloff>NotSet</Rolloff>
- </Transponder>
- <Transponder>
<CarrierFrequency>11082000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>2600</SymbolRate>
@@ -460,7 +451,7 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11619000</CarrierFrequency>
+ <CarrierFrequency>11614000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>5632</SymbolRate>
<Modulation>ModNotSet</Modulation>
@@ -469,6 +460,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>11623000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>6250</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>11642000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>3125</SymbolRate>
@@ -541,15 +541,6 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11881000</CarrierFrequency>
- <Polarisation>LinearV</Polarisation>
- <SymbolRate>28000</SymbolRate>
- <Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate5_6</InnerFecRate>
- <Pilot>NotSet</Pilot>
- <Rolloff>NotSet</Rolloff>
- </Transponder>
- <Transponder>
<CarrierFrequency>11900000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>28000</SymbolRate>
@@ -577,15 +568,6 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11958000</CarrierFrequency>
- <Polarisation>LinearV</Polarisation>
- <SymbolRate>28000</SymbolRate>
- <Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate7_8</InnerFecRate>
- <Pilot>NotSet</Pilot>
- <Rolloff>NotSet</Rolloff>
- </Transponder>
- <Transponder>
<CarrierFrequency>11977000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>28000</SymbolRate>
@@ -631,6 +613,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>12226000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>27500</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate5_6</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>12265000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>28000</SymbolRate>
@@ -667,6 +658,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>12456000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>28000</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate7_8</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>12513000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>5200</SymbolRate>
@@ -838,6 +838,15 @@
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>11188000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>1005</SymbolRate>
+ <Modulation>Mod8Psk</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>On</Pilot>
+ <Rolloff>ThirtyFive</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>11535000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>4936</SymbolRate>
View
196 TVLibrary/TVServer.Base/TuningParameters/dvbs/10.0°E Eutelsat W2A.xml
@@ -28,6 +28,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>10723000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>3255</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate1_2</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>10738000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>6111</SymbolRate>
@@ -73,6 +82,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>10830000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>6111</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>10848000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>6111</SymbolRate>
@@ -181,7 +199,7 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>10981000</CarrierFrequency>
+ <CarrierFrequency>10977000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>3124</SymbolRate>
<Modulation>ModNotSet</Modulation>
@@ -190,7 +208,7 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>10985000</CarrierFrequency>
+ <CarrierFrequency>10981000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>3124</SymbolRate>
<Modulation>ModNotSet</Modulation>
@@ -199,7 +217,7 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>10985000</CarrierFrequency>
+ <CarrierFrequency>10982000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>4167</SymbolRate>
<Modulation>ModNotSet</Modulation>
@@ -208,6 +226,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>10985000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>3124</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>10988000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>3124</SymbolRate>
@@ -235,9 +262,9 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>10996000</CarrierFrequency>
+ <CarrierFrequency>11002000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
- <SymbolRate>6111</SymbolRate>
+ <SymbolRate>3255</SymbolRate>
<Modulation>ModNotSet</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
@@ -253,19 +280,10 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11005000</CarrierFrequency>
+ <CarrierFrequency>11008000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>3255</SymbolRate>
<Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate5_6</InnerFecRate>
- <Pilot>NotSet</Pilot>
- <Rolloff>NotSet</Rolloff>
- </Transponder>
- <Transponder>
- <CarrierFrequency>11011000</CarrierFrequency>
- <Polarisation>LinearV</Polarisation>
- <SymbolRate>3125</SymbolRate>
- <Modulation>ModNotSet</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
<Rolloff>NotSet</Rolloff>
@@ -361,6 +379,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>11126000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>3255</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>11127000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>6111</SymbolRate>
@@ -370,9 +397,9 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11134000</CarrierFrequency>
+ <CarrierFrequency>11130000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
- <SymbolRate>5064</SymbolRate>
+ <SymbolRate>3255</SymbolRate>
<Modulation>ModNotSet</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
@@ -415,6 +442,24 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>11148000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>2352</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
+ <CarrierFrequency>11152000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>2894</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate5_6</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>11154000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>5632</SymbolRate>
@@ -451,15 +496,6 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11163000</CarrierFrequency>
- <Polarisation>LinearH</Polarisation>
- <SymbolRate>2308</SymbolRate>
- <Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate3_4</InnerFecRate>
- <Pilot>NotSet</Pilot>
- <Rolloff>NotSet</Rolloff>
- </Transponder>
- <Transponder>
<CarrierFrequency>11172000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>2532</SymbolRate>
@@ -568,15 +604,6 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11278000</CarrierFrequency>
- <Polarisation>LinearV</Polarisation>
- <SymbolRate>2893</SymbolRate>
- <Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate3_4</InnerFecRate>
- <Pilot>NotSet</Pilot>
- <Rolloff>NotSet</Rolloff>
- </Transponder>
- <Transponder>
<CarrierFrequency>11457000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>6111</SymbolRate>
@@ -642,9 +669,9 @@
<Transponder>
<CarrierFrequency>11623000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
- <SymbolRate>2960</SymbolRate>
+ <SymbolRate>2965</SymbolRate>
<Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate5_6</InnerFecRate>
+ <InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
<Rolloff>NotSet</Rolloff>
</Transponder>
@@ -658,45 +685,36 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11628000</CarrierFrequency>
+ <CarrierFrequency>11632000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
- <SymbolRate>3125</SymbolRate>
- <Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate7_8</InnerFecRate>
- <Pilot>NotSet</Pilot>
- <Rolloff>NotSet</Rolloff>
- </Transponder>
- <Transponder>
- <CarrierFrequency>11628000</CarrierFrequency>
- <Polarisation>LinearH</Polarisation>
- <SymbolRate>2963</SymbolRate>
+ <SymbolRate>3124</SymbolRate>
<Modulation>ModNotSet</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11632000</CarrierFrequency>
+ <CarrierFrequency>11636000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
- <SymbolRate>3124</SymbolRate>
+ <SymbolRate>2142</SymbolRate>
<Modulation>ModNotSet</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11636000</CarrierFrequency>
+ <CarrierFrequency>11645000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
- <SymbolRate>2142</SymbolRate>
+ <SymbolRate>6111</SymbolRate>
<Modulation>ModNotSet</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11645000</CarrierFrequency>
+ <CarrierFrequency>11651000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
- <SymbolRate>6111</SymbolRate>
+ <SymbolRate>2590</SymbolRate>
<Modulation>ModNotSet</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
@@ -802,6 +820,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>12527000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>2143</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>12545000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>3400</SymbolRate>
@@ -1099,42 +1126,33 @@
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>3927000</CarrierFrequency>
+ <CarrierFrequency>3914000</CarrierFrequency>
<Polarisation>CircularR</Polarisation>
- <SymbolRate>8300</SymbolRate>
+ <SymbolRate>12100</SymbolRate>
<Modulation>Mod8Psk</Modulation>
<InnerFecRate>Rate5_6</InnerFecRate>
<Pilot>On</Pilot>
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>3937000</CarrierFrequency>
+ <CarrierFrequency>3930000</CarrierFrequency>
<Polarisation>CircularR</Polarisation>
- <SymbolRate>8800</SymbolRate>
+ <SymbolRate>12560</SymbolRate>
<Modulation>Mod8Psk</Modulation>
<InnerFecRate>Rate5_6</InnerFecRate>
<Pilot>On</Pilot>
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>3951000</CarrierFrequency>
+ <CarrierFrequency>3948000</CarrierFrequency>
<Polarisation>CircularR</Polarisation>
- <SymbolRate>11200</SymbolRate>
+ <SymbolRate>16210</SymbolRate>
<Modulation>Mod8Psk</Modulation>
<InnerFecRate>Rate5_6</InnerFecRate>
<Pilot>On</Pilot>
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>4038000</CarrierFrequency>
- <Polarisation>CircularL</Polarisation>
- <SymbolRate>3200</SymbolRate>
- <Modulation>Mod32Apsk</Modulation>
- <InnerFecRate>Rate3_4</InnerFecRate>
- <Pilot>On</Pilot>
- <Rolloff>ThirtyFive</Rolloff>
- </Transponder>
- <Transponder>
<CarrierFrequency>10792000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>4936</SymbolRate>
@@ -1324,15 +1342,6 @@
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11126000</CarrierFrequency>
- <Polarisation>LinearH</Polarisation>
- <SymbolRate>7120</SymbolRate>
- <Modulation>Mod8Psk</Modulation>
- <InnerFecRate>Rate3_4</InnerFecRate>
- <Pilot>On</Pilot>
- <Rolloff>ThirtyFive</Rolloff>
- </Transponder>
- <Transponder>
<CarrierFrequency>11161000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>1320</SymbolRate>
@@ -1342,6 +1351,15 @@
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>11163000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>2170</SymbolRate>
+ <Modulation>Mod8Psk</Modulation>
+ <InnerFecRate>Rate2_3</InnerFecRate>
+ <Pilot>On</Pilot>
+ <Rolloff>ThirtyFive</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>11166000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>3616</SymbolRate>
@@ -1353,7 +1371,7 @@
<Transponder>
<CarrierFrequency>11184000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
- <SymbolRate>1698</SymbolRate>
+ <SymbolRate>1238</SymbolRate>
<Modulation>ModQpsk</Modulation>
<InnerFecRate>Rate8_9</InnerFecRate>
<Pilot>Off</Pilot>
@@ -1387,11 +1405,29 @@
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>11387000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>30000</SymbolRate>
+ <Modulation>Mod8Psk</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>On</Pilot>
+ <Rolloff>ThirtyFive</Rolloff>
+ </Transponder>
+ <Transponder>
+ <CarrierFrequency>11399000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>7814</SymbolRate>
+ <Modulation>Mod8Psk</Modulation>
+ <InnerFecRate>Rate5_6</InnerFecRate>
+ <Pilot>On</Pilot>
+ <Rolloff>ThirtyFive</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>11595000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>30000</SymbolRate>
<Modulation>ModQpsk</Modulation>
- <InnerFecRate>Rate1_2</InnerFecRate>
+ <InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>Off</Pilot>
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
View
85 TVLibrary/TVServer.Base/TuningParameters/dvbs/100.5°E AsiaSat 5.xml
@@ -82,6 +82,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>3735000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>6111</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>3745000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>6111</SymbolRate>
@@ -91,6 +100,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>3753000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>6111</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>3760000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>27500</SymbolRate>
@@ -289,6 +307,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>4009000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>9600</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>4045000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>6111</SymbolRate>
@@ -325,15 +352,6 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>4072000</CarrierFrequency>
- <Polarisation>LinearV</Polarisation>
- <SymbolRate>4434</SymbolRate>
- <Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate7_8</InnerFecRate>
- <Pilot>NotSet</Pilot>
- <Rolloff>NotSet</Rolloff>
- </Transponder>
- <Transponder>
<CarrierFrequency>4094000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>6666</SymbolRate>
@@ -424,36 +442,27 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>12375000</CarrierFrequency>
- <Polarisation>LinearV</Polarisation>
- <SymbolRate>2170</SymbolRate>
- <Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate3_4</InnerFecRate>
- <Pilot>NotSet</Pilot>
- <Rolloff>NotSet</Rolloff>
- </Transponder>
- <Transponder>
- <CarrierFrequency>12379000</CarrierFrequency>
+ <CarrierFrequency>12377000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
- <SymbolRate>2170</SymbolRate>
+ <SymbolRate>2000</SymbolRate>
<Modulation>ModNotSet</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>12382000</CarrierFrequency>
+ <CarrierFrequency>12381000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
- <SymbolRate>2170</SymbolRate>
+ <SymbolRate>2000</SymbolRate>
<Modulation>ModNotSet</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>12389000</CarrierFrequency>
+ <CarrierFrequency>12386000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
- <SymbolRate>2170</SymbolRate>
+ <SymbolRate>2000</SymbolRate>
<Modulation>ModNotSet</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
@@ -478,15 +487,6 @@
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>3754000</CarrierFrequency>
- <Polarisation>LinearV</Polarisation>
- <SymbolRate>7200</SymbolRate>
- <Modulation>Mod8Psk</Modulation>
- <InnerFecRate>Rate2_3</InnerFecRate>
- <Pilot>On</Pilot>
- <Rolloff>ThirtyFive</Rolloff>
- </Transponder>
- <Transponder>
<CarrierFrequency>3794000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>4640</SymbolRate>
@@ -496,7 +496,7 @@
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>3922000</CarrierFrequency>
+ <CarrierFrequency>3798000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>2000</SymbolRate>
<Modulation>Mod8Psk</Modulation>
@@ -514,18 +514,18 @@
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>4020000</CarrierFrequency>
+ <CarrierFrequency>4052000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
- <SymbolRate>30000</SymbolRate>
+ <SymbolRate>9875</SymbolRate>
<Modulation>Mod8Psk</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>On</Pilot>
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>4052000</CarrierFrequency>
+ <CarrierFrequency>4072000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
- <SymbolRate>9875</SymbolRate>
+ <SymbolRate>4937</SymbolRate>
<Modulation>Mod8Psk</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>On</Pilot>
@@ -559,6 +559,15 @@
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>4132000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>10670</SymbolRate>
+ <Modulation>Mod8Psk</Modulation>
+ <InnerFecRate>Rate3_5</InnerFecRate>
+ <Pilot>On</Pilot>
+ <Rolloff>ThirtyFive</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>12297000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>43200</SymbolRate>
View
26 TVLibrary/TVServer.Base/TuningParameters/dvbs/101.0°W AMC 2,4 DirecTV 4S,8.xml
@@ -37,20 +37,20 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11860000</CarrierFrequency>
+ <CarrierFrequency>11821000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
- <SymbolRate>28138</SymbolRate>
+ <SymbolRate>20000</SymbolRate>
<Modulation>ModNotSet</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>12020000</CarrierFrequency>
+ <CarrierFrequency>11860000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>30000</SymbolRate>
<Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate2_3</InnerFecRate>
+ <InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
<Rolloff>NotSet</Rolloff>
</Transponder>
@@ -73,6 +73,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>12172000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>15000</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>3722000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>5161</SymbolRate>
@@ -81,4 +90,13 @@
<Pilot>On</Pilot>
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
+ <Transponder>
+ <CarrierFrequency>12020000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>30000</SymbolRate>
+ <Modulation>ModQpsk</Modulation>
+ <InnerFecRate>Rate2_3</InnerFecRate>
+ <Pilot>Off</Pilot>
+ <Rolloff>ThirtyFive</Rolloff>
+ </Transponder>
</ArrayOfTransponder>
View
40 TVLibrary/TVServer.Base/TuningParameters/dvbs/103.0°W AMC 1.xml
@@ -91,9 +91,9 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>4083000</CarrierFrequency>
+ <CarrierFrequency>4081000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
- <SymbolRate>7000</SymbolRate>
+ <SymbolRate>7233</SymbolRate>
<Modulation>ModNotSet</Modulation>
<InnerFecRate>Rate3_4</InnerFecRate>
<Pilot>NotSet</Pilot>
@@ -127,6 +127,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>11806000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>3500</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>11943000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>20000</SymbolRate>
@@ -397,6 +406,33 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>3905000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>4790</SymbolRate>
+ <Modulation>Mod8Psk</Modulation>
+ <InnerFecRate>Rate2_3</InnerFecRate>
+ <Pilot>On</Pilot>
+ <Rolloff>ThirtyFive</Rolloff>
+ </Transponder>
+ <Transponder>
+ <CarrierFrequency>4089000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>5923</SymbolRate>
+ <Modulation>Mod8Psk</Modulation>
+ <InnerFecRate>Rate5_6</InnerFecRate>
+ <Pilot>On</Pilot>
+ <Rolloff>ThirtyFive</Rolloff>
+ </Transponder>
+ <Transponder>
+ <CarrierFrequency>4120000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>30000</SymbolRate>
+ <Modulation>Mod8Psk</Modulation>
+ <InnerFecRate>Rate5_6</InnerFecRate>
+ <Pilot>On</Pilot>
+ <Rolloff>ThirtyFive</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>11840000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>30000</SymbolRate>
View
9 TVLibrary/TVServer.Base/TuningParameters/dvbs/105.0°W AMC 15,18.xml
@@ -118,6 +118,15 @@
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>3920000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>30000</SymbolRate>
+ <Modulation>Mod8Psk</Modulation>
+ <InnerFecRate>Rate5_6</InnerFecRate>
+ <Pilot>On</Pilot>
+ <Rolloff>ThirtyFive</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>3940000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>30000</SymbolRate>
View
56 TVLibrary/TVServer.Base/TuningParameters/dvbs/105.5°E AsiaSat 3S.xml
@@ -127,6 +127,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>3906000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>2815</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>3913000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>7300</SymbolRate>
@@ -181,6 +190,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>4060000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>26666</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>4071000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>14240</SymbolRate>
@@ -298,6 +316,15 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>4172000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>2480</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>4180000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>26666</SymbolRate>
@@ -343,15 +370,6 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>12465000</CarrierFrequency>
- <Polarisation>LinearV</Polarisation>
- <SymbolRate>3100</SymbolRate>
- <Modulation>ModNotSet</Modulation>
- <InnerFecRate>Rate3_4</InnerFecRate>
- <Pilot>NotSet</Pilot>
- <Rolloff>NotSet</Rolloff>
- </Transponder>
- <Transponder>
<CarrierFrequency>12469000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>2900</SymbolRate>
@@ -469,6 +487,24 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>12720000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>30000</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
+ <CarrierFrequency>3750000</CarrierFrequency>
+ <Polarisation>LinearV</Polarisation>
+ <SymbolRate>3030</SymbolRate>
+ <Modulation>Mod8Psk</Modulation>
+ <InnerFecRate>Rate2_3</InnerFecRate>
+ <Pilot>On</Pilot>
+ <Rolloff>ThirtyFive</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>3888000</CarrierFrequency>
<Polarisation>LinearV</Polarisation>
<SymbolRate>9218</SymbolRate>
@@ -491,7 +527,7 @@
<Polarisation>LinearV</Polarisation>
<SymbolRate>28100</SymbolRate>
<Modulation>Mod8Psk</Modulation>
- <InnerFecRate>Rate3_4</InnerFecRate>
+ <InnerFecRate>Rate5_6</InnerFecRate>
<Pilot>On</Pilot>
<Rolloff>ThirtyFive</Rolloff>
</Transponder>
View
79 TVLibrary/TVServer.Base/TuningParameters/dvbs/11.0°W Express AM44.xml
@@ -37,6 +37,24 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
+ <CarrierFrequency>11059000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>3124</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
+ <CarrierFrequency>11155000</CarrierFrequency>
+ <Polarisation>LinearH</Polarisation>
+ <SymbolRate>6425</SymbolRate>
+ <Modulation>ModNotSet</Modulation>
+ <InnerFecRate>Rate3_4</InnerFecRate>
+ <Pilot>NotSet</Pilot>
+ <Rolloff>NotSet</Rolloff>
+ </Transponder>
+ <Transponder>
<CarrierFrequency>11475000</CarrierFrequency>
<Polarisation>LinearH</Polarisation>
<SymbolRate>6428</SymbolRate>
@@ -73,11 +91,11 @@
<Rolloff>NotSet</Rolloff>
</Transponder>
<Transponder>
- <CarrierFrequency>11523000</CarrierFrequency>
+ <CarrierFrequency>11521000</CarrierFrequency>
<Polarisation