Permalink
Browse files

Merge branch 'Release_1.2.x' into FEAT-3410_Shuffle_and_repeat

  • Loading branch information...
2 parents 39973ed + 1367f5c commit b7cf2e5fe79ce2a0a68f727541cdf02b98a37021 @jamesonuk jamesonuk committed Apr 16, 2012
Showing with 952 additions and 689 deletions.
  1. +2 −2 Common-MP-TVE3/SolutionInfo.cs
  2. BIN DirectShowFilters/TsReader/bin/Debug/TsReader.ax
  3. BIN DirectShowFilters/TsReader/bin/Debug/TsReader.pdb
  4. BIN DirectShowFilters/TsReader/bin/Release/TsReader.ax
  5. BIN DirectShowFilters/TsWriter/bin/Debug/TsWriter.ax
  6. BIN DirectShowFilters/TsWriter/bin/Debug/TsWriter.pdb
  7. BIN DirectShowFilters/TsWriter/bin/Debug/vc100.pdb
  8. BIN DirectShowFilters/TsWriter/bin/Release/TsWriter.ax
  9. +1 −1 Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh
  10. +1 −1 Tools/InstallationScripts/include/ProcessMacros.nsh
  11. +3 −3 Tools/MediaPortal.DeployTool/Utils.cs
  12. +97 −97 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Finland.Sonera.xml
  13. +10 −0 TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbc/Germany.KabelBW.xml
  14. +201 −187 TvEngine3/TVLibrary/TVServer.Base/WebEPG/channels/channels.xml
  15. +171 −116 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/DE/www_tvtoday_de.xml
  16. +144 −129 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_elpais_es.xml
  17. +6 −1 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_formulatv_com.xml
  18. +117 −73 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_miguiatv_com.xml
  19. +19 −1 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/ES/www_ono_es.xml
  20. +33 −0 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/NO/m_nrk_no.xml
  21. +4 −2 TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/SE/www_dagenstv_com.xml
  22. +35 −35 mediaportal/Configuration/App.config
  23. +22 −3 mediaportal/Core/Player/Subtitles/SubtitleSelector.cs
  24. +20 −0 mediaportal/Core/Player/TSReaderPlayer.cs
  25. +28 −0 mediaportal/Core/Player/Teletext/TeletextReceiver.cs
  26. +38 −38 mediaportal/MediaPortal.Application/App.config
@@ -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.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.3.0")]
+[assembly: AssemblyFileVersion("1.2.3.0")]
//[assembly: AssemblyInformationalVersion("")]
//[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -32,7 +32,7 @@
!define VER_MAJOR 1
!define VER_MINOR 2
-!define VER_REVISION 0
+!define VER_REVISION 3
;!define VER_TYPE "" # can be "RC", "Beta". Please comment if Final release
#**********************************************************************************************************#
@@ -80,7 +80,7 @@
StrCpy $R0 0
${Do}
${If} $R0 > 0
- ${LOG_TEXT} "INFO" "StopService: sleeping 20ms and recheking service status..."
+ ${LOG_TEXT} "INFO" "StopService: sleeping 20ms and rechecking service status..."
Sleep 20
${EndIF}
@@ -551,8 +551,8 @@ public static Version GetPackageVersion(string type)
break;
case "max":
major = 1;
- minor = 1;
- revision = 8; // 1.1.8 = 1.2.0 RC1
+ minor = 2;
+ revision = 2;
break;
}
Version ver = new Version(major, minor, revision);
@@ -602,7 +602,7 @@ public static Version VersionFromRegistry(string regkey)
public static string GetDisplayVersion()
{
- return "1.2.0";
+ return "1.2.3";
}
#endregion
@@ -1,98 +1,98 @@
-<?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>154000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>162000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>170000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>314000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>322000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>338000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>346000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>354000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>362000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>370000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>378000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>386000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>394000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>402000</Frequency>
- <ModulationType>Mod128Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>234000</Frequency>
- <ModulationType>Mod256Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>242000</Frequency>
- <ModulationType>Mod256Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>250000</Frequency>
- <ModulationType>Mod256Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>258000</Frequency>
- <ModulationType>Mod256Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
- <DVBCTuning>
- <Frequency>266000</Frequency>
- <ModulationType>Mod256Qam</ModulationType>
- <SymbolRate>6900</SymbolRate>
- </DVBCTuning>
+<?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>154000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>162000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>170000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>314000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>322000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>338000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>346000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>354000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>362000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>370000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>378000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>386000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>394000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>402000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>234000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>242000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>250000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>258000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
+ <Frequency>266000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
</ArrayOfDVBCTuning>
@@ -11,6 +11,11 @@
<SymbolRate>6900</SymbolRate>
</DVBCTuning>
<DVBCTuning>
+ <Frequency>130000</Frequency>
+ <ModulationType>Mod256Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
+ <DVBCTuning>
<Frequency>346000</Frequency>
<ModulationType>Mod256Qam</ModulationType>
<SymbolRate>6900</SymbolRate>
@@ -90,6 +95,11 @@
<ModulationType>Mod256Qam</ModulationType>
<SymbolRate>6900</SymbolRate>
</DVBCTuning>
+ <DVBCTuning>
+ <Frequency>610000</Frequency>
+ <ModulationType>Mod64Qam</ModulationType>
+ <SymbolRate>6900</SymbolRate>
+ </DVBCTuning>
<DVBCTuning>
<Frequency>634000</Frequency>
<ModulationType>Mod256Qam</ModulationType>
Oops, something went wrong.

0 comments on commit b7cf2e5

Please sign in to comment.