MP1.35 Final Release

.github/labeler.yml

@@ -15,3 +15,6 @@ Tuning:
 
 MPE:
   - 'MPE'
+
+Skin:
+  - '(Titan|DWHD|skin)'

.github/workflows/mediaportal.yml

@@ -52,7 +52,7 @@ jobs:
 
       - name: Setup NSIS
         run: |
-          choco install --yes nsis --version=3.09 --force
+          choco install --yes nsis --version=3.10 --force
 
       - name: Git Checkout
         uses: actions/checkout@v4
@@ -73,7 +73,7 @@ jobs:
         with:
           name: Build result file ${{ matrix.architecture }}
           path: |
-            ${{ github.workspace }}\Build\BuildFullInstaller.log
+            ${{ github.workspace }}\Build\*.log
           retention-days: ${{ inputs.retention-logs || 3 }}
 
       - name: Upload Artifact / Mediaportal setup file

.github/workflows/workflow_codeql.yml

@@ -33,7 +33,7 @@ jobs:
 
       - name: Setup NSIS
         run: |
-          choco install --yes nsis --version=3.09 --force
+          choco install --yes nsis --version=3.10 --force
 
       - name: Git Checkout
         uses: actions/checkout@v4

.github/workflows/workflow_xml_validate.yml

@@ -18,6 +18,7 @@ jobs:
       - name: ⤵️ Check out configuration from GitHub
         uses: actions/checkout@v4
       - name: 🚀 Run XML Validate
-        uses: action-pack/valid-xml@v1
+        uses: kehoecj/validate-configs-action@v4
         with:
-          file-endings: ".xml"
+          exclude-dirs: "MediaPortal.Tests"
+          exclude-file-types: "yaml,yml"

Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Register.bat

@@ -4,4 +4,4 @@ REM *** EDIT THE PATHS BELOW IF NEEDED
 REM
 REM Registers Gentle.Framework in HTML 2 Help
 REM
-"C:\Program Files\Helpware\H2Reg\H2Reg.exe" -r cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.ini"
+"C:\Program Files\Helpware\H2Reg\H2Reg.exe" -r cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.help"

Common-MP-TVE3/External/Gentle.NET/Documentation/Help/Unregister.bat

@@ -1,3 +1,3 @@
 @echo off
 REM Unregisters Gentle.Framework in HTML 2 Help
-"C:\Program Files\H2Reg\H2Reg.exe" -u cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.ini"
+"C:\Program Files\H2Reg\H2Reg.exe" -u cmdfile="C:\Code\Gentle.NET\Documentation\Help\H2Reg.help"

Common-MP-TVE3/SolutionInfo.cs

@@ -50,8 +50,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.35.000.0")]
-[assembly: AssemblyFileVersion("1.35.000.0")]
+[assembly: AssemblyVersion("1.36.000.0")]
+[assembly: AssemblyFileVersion("1.36.000.0")]
 
 //[assembly: AssemblyInformationalVersion("")]
 //[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]

Tools/InstallationScripts/XML-plugin/Example/test.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- world -->
+<root>
 <a>
     <a>AAA
         <a>
@@ -17,3 +18,4 @@
 <a>
     <d attr1="value1" attr2="value2" attr3="value3" attr4="value4">HHH</d>
 </a>
+</root>

Tools/InstallationScripts/include-MP-PreBuild.nsh

@@ -1,6 +1,6 @@
-#region Copyright (C) 2005-2023 Team MediaPortal
+#region Copyright (C) 2005-2024 Team MediaPortal
 /*
-// Copyright (C) 2005-2023 Team MediaPortal
+// Copyright (C) 2005-2024 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
 // MediaPortal is free software: you can redistribute it and/or modify
@@ -110,7 +110,7 @@
 ; Build MP installer
 !ifdef BUILD_Installer
 ;!system '${git_ROOT}\Build\MSBUILD_MP_LargeAddressAware.bat Release' = 0
-!system '"${NSISDIR}\makensis.exe" /DBUILD_TYPE=Release /DArchitecture=${Architecture} "${git_MP}\Setup\setup.nsi"' = 0
+!system '"${NSISDIR}\makensis.exe" /V3 /DBUILD_TYPE=Release /DArchitecture=${Architecture} "${git_MP}\Setup\setup.nsi" > ${git_ROOT}\Build\BuildMediaportal.log' = 0
 !endif
 
 ; Build TV server
@@ -139,5 +139,5 @@
 
 ; Build TV installer
 !ifdef BUILD_Installer
-!system '"${NSISDIR}\makensis.exe" /DBUILD_TYPE=Release /DArchitecture=${Architecture} "${git_TVServer}\Setup\setup.nsi"' = 0
+!system '"${NSISDIR}\makensis.exe" /V3 /DBUILD_TYPE=Release /DArchitecture=${Architecture} "${git_TVServer}\Setup\setup.nsi" > ${git_ROOT}\Build\BuildTVServer.log' = 0
 !endif

Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh

@@ -31,7 +31,7 @@
 
 
 !define VER_MAJOR       1
-!define VER_MINOR       35
+!define VER_MINOR       36
 !define VER_REVISION    000
 
 #**********************************************************************************************************#

Tools/InstallationScripts/include/MediaPortalMacros.nsh

@@ -1,6 +1,6 @@
-#region Copyright (C) 2005-2023 Team MediaPortal
+#region Copyright (C) 2005-2024 Team MediaPortal
 /*
-// Copyright (C) 2005-2023 Team MediaPortal
+// Copyright (C) 2005-2024 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
 // MediaPortal is free software: you can redistribute it and/or modify
@@ -18,8 +18,8 @@
 */
 #endregion
 
-!if "${NSIS_VERSION}" != "v3.09"
-  !error "$\r$\n$\r$\nUnsupported NSIS version: ${NSIS_VERSION}. Please use NSIS v3.09, http://nsis.sourceforge.net$\r$\n$\r$\n"
+!if "${NSIS_VERSION}" != "v3.10"
+  !error "$\r$\n$\r$\nUnsupported NSIS version: ${NSIS_VERSION}. Please use NSIS v3.10, http://nsis.sourceforge.net$\r$\n$\r$\n"
 !endif
 
 !ifndef ___COMMON_MP_MACROS__NSH___

Tools/MediaPortal.DeployTool/Utils.cs

@@ -781,7 +781,7 @@ public static Version GetPackageVersion(string type)
           break;
         case "max":
           major = 1;
-          minor = 34;
+          minor = 35;
           revision = 100;
           break;
       }
@@ -802,7 +802,7 @@ public static bool IsPackageUpdatabled(Version pkgVer)
     public static Version GetCurrentPackageVersion()
     {
       int major = 1;
-      int minor = 35;
+      int minor = 36;
       int revision = 000;
 
       Version ver = new Version(major, minor, revision);
@@ -853,7 +853,7 @@ public static Version VersionFromRegistry(string regkey)
 
     public static string GetDisplayVersion()
     {
-      return "1.35 Horizon";
+      return "1.36 Polar Express";
     }
 
     /// <summary>

TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Croatia.D3 - sjeverna hrvatska.xml

@@ -4,6 +4,7 @@
 		<Frequency>658000</Frequency>
 		<BandWidth>8</BandWidth>
 		<Offset>0</Offset>
+	</DVBTTuning>
 	<DVBTTuning>
 		<Frequency>690000</Frequency>
 		<BandWidth>8</BandWidth>

TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/Ireland.Donegal - Holywell Hill.xml

@@ -5,6 +5,7 @@
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
   </DVBTTuning>
+  <DVBTTuning>
     <Frequency>506000</Frequency>
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>

TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Beacon Hill.xml

@@ -36,4 +36,4 @@
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
   </DVBTTuning>
-</ArrayOfDVBTTuning>3
+</ArrayOfDVBTTuning>

TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Bluebell Hill.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <!-- PSB1 -->
+  <DVBTTuning>
     <Frequency>562000</Frequency><!-- C32 -->
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
@@ -47,4 +48,4 @@
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
   </DVBTTuning>
-</ArrayOfDVBTTuning>
+</ArrayOfDVBTTuning>

TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Rosneath.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <!-- PSB1 -->
+  <DVBTTuning>
     <Frequency>618000</Frequency><!-- C39 -->
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
@@ -35,4 +36,4 @@
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
   </DVBTTuning>
-</ArrayOfDVBTTuning>
+</ArrayOfDVBTTuning>

TvEngine3/TVLibrary/TVServer.Base/TuningParameters/dvbt/UK.Tunbridge Wells.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ArrayOfDVBTTuning xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <!-- PSB1 -->
+  <DVBTTuning>
     <Frequency>634000</Frequency><!-- C41 -->
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
@@ -41,4 +42,4 @@
     <BandWidth>8</BandWidth>
     <Offset>167</Offset>
   </DVBTTuning>
-</ArrayOfDVBTTuning>
+</ArrayOfDVBTTuning>

TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/FR/linternaute_com.xml

@@ -7,8 +7,8 @@
     <Channel id="Arte" siteId="3" />
     <Channel id="BFM TV" siteId="4" />
     <Channel id="Canal+" siteId="5" />
-    <Channel id="Canal+ cinéma" siteId="6" />
-    <Channel id="Canal+ Décalé" siteId="7" />
+    <Channel id="Canal+ cinéma" siteId="6" />
+    <Channel id="Canal+ Décalé" siteId="7" />
     <Channel id="Canal J" siteId="9" />
     <Channel id="Canal+ sport" siteId="8" />
     <Channel id="Cinecinema Aut..." siteId="10" />
@@ -18,13 +18,13 @@
     <Channel id="Cinecinema Fri..." siteId="14" />
     <Channel id="Cinecinema Pre..." siteId="15" />
     <Channel id="Cinecinema Star" siteId="81" />
-    <Channel id="Ciné FX" siteId="16" />
-    <Channel id="Comédie" siteId="17" />
+    <Channel id="Ciné FX" siteId="16" />
+    <Channel id="Comédie" siteId="17" />
     <Channel id="Cuisine.Tv" siteId="18" />
     <Channel id="Direct 8" siteId="19" />
     <Channel id="Equidia" siteId="20" />
     <Channel id="Escales" siteId="21" />
-    <Channel id="Eurêka" siteId="22" />
+    <Channel id="Eurêka" siteId="22" />
     <Channel id="Euronews" siteId="23" />
     <Channel id="Europe 2 TV" siteId="24" />
     <Channel id="Eurosport" siteId="25" />
@@ -34,49 +34,49 @@
     <Channel id="France 3" siteId="29" />
     <Channel id="France 4" siteId="30" />
     <Channel id="France 5" siteId="31" />
-    <Channel id="France Ô" siteId="32" />
+    <Channel id="France Ô" siteId="32" />
     <Channel id="Fun TV" siteId="33" />
     <Channel id="Gulli" siteId="34" />
     <Channel id="Histoire (TPS)" siteId="35" />
     <Channel id="Info sport" siteId="36" />
     <Channel id="i Tele" siteId="37" />
     <Channel id="Jimmy" siteId="38" />
     <Channel id="KTO" siteId="39" />
-    <Channel id="La Chaîne Météo" siteId="40" />
-    <Channel id="La Chaîne parl..." siteId="41" />
-    <Channel id="LCI - La Chaîn..." siteId="42" />
+    <Channel id="La Chaîne Météo" siteId="40" />
+    <Channel id="La Chaîne parl..." siteId="41" />
+    <Channel id="LCI - La Chaîn..." siteId="42" />
     <Channel id="L'Equipe TV (b..." siteId="43" />
     <Channel id="M6" siteId="44" />
-    <Channel id="Ma Planète" siteId="45" />
+    <Channel id="Ma Planète" siteId="45" />
     <Channel id="MCM" siteId="46" />
     <Channel id="Mezzo" siteId="47" />
     <Channel id="Moteurs" siteId="48" />
     <Channel id="MTV" siteId="49" />
     <Channel id="Musique Classi..." siteId="50" />
     <Channel id="National Geogr..." siteId="51" />
-    <Channel id="Nickelodéon" siteId="52" />
+    <Channel id="Nickelodéon" siteId="52" />
     <Channel id="NRJ 12" siteId="53" />
     <Channel id="NT 1" siteId="54" />
-    <Channel id="Odyssée" siteId="55" />
-    <Channel id="Paris Première" siteId="56" />
+    <Channel id="Odyssée" siteId="55" />
+    <Channel id="Paris Première" siteId="56" />
     <Channel id="Pink TV" siteId="57" />
     <Channel id="Piwi" siteId="58" />
-    <Channel id="Planète" siteId="59" />
-    <Channel id="Planète Choc" siteId="60" />
-    <Channel id="Planète Thalas..." siteId="61" />
+    <Channel id="Planète" siteId="59" />
+    <Channel id="Planète Choc" siteId="60" />
+    <Channel id="Planète Thalas..." siteId="61" />
     <Channel id="SCI-FI" siteId="62" />
-    <Channel id="Série club" siteId="63" />
+    <Channel id="Série club" siteId="63" />
     <Channel id="Sport+" siteId="64" />
     <Channel id="TCM" siteId="65" />
-    <Channel id="Téva" siteId="66" />
+    <Channel id="Téva" siteId="66" />
     <Channel id="TF 1" siteId="67" />
     <Channel id="TF 6" siteId="68" />
     <Channel id="TFou" siteId="69" />
     <Channel id="TIJI" siteId="70" />
     <Channel id="TMC" siteId="71" />
     <Channel id="Toute l'histoi..." siteId="72" />
     <Channel id="TPS Foot" siteId="73" />
-    <Channel id="TPS Homecinéma" siteId="74" />
+    <Channel id="TPS Homecinéma" siteId="74" />
     <Channel id="TPS Star" siteId="75" />
     <Channel id="TV5MONDE" siteId="76" />
     <Channel id="Ushuaia TV" siteId="77" />
@@ -87,7 +87,7 @@
   <Listing type="Html">
     <Site url="http://www.linternaute.com/television/programme-tv/cgi/recherche/recherche.php?f_date=[DD]-[MM]-[YYYY]&amp;f_id_tranche_horaire=0&amp;f_id_format=&amp;f_id_chaine=[ID]&amp;submit.x=6&amp;submit.y=11" external="false" encoding="" />
     <Html>
-      <Template name="default" start="Derniers avis" end="&nbsp;&nbsp;&nbsp;CHERCHER UN">
+      <Template name="default" start="Derniers avis" end="nbsp;CHERCHER UN">
         <SectionTemplate tags="TSA">
           <TemplateText>
 &lt;tr&gt;
@@ -119,4 +119,3 @@
     <Modify channel="*" field="#DESCRIPTION" search="Toutes les chaines" action="Replace">---</Modify>
   </Actions>
 </Grabber>
-

TvEngine3/TVLibrary/TVServer.Base/WebEPG/grabbers/GR/www_in_gr.xml

@@ -65,7 +65,7 @@
           </TemplateText>
         </SectionTemplate>
       </Template>
-      <Template name="Details" start="&lt;div vlass=&quote;text-content&quote;&gt;" end="&lt;hr&gt;">
+      <Template name="Details" start="&lt;div vlass=&quot;text-content&quot;&gt;" end="&lt;hr&gt;">
         <SectionTemplate tags="DP">
           <TemplateText>
             &lt;div&gt;&lt;div&gt;&lt;/div&gt;&lt;p&gt;&lt;#DESCRIPTION&gt;&lt;/p&gt;

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.35.Final.{build}
+version: 1.36.Final.{build}
 image: Visual Studio 2019
 clone_folder: c:\project\mediaportal
 environment:
@@ -12,7 +12,7 @@ install:
   - cmd: >-
       git submodule update --init --recursive
 
-      choco install nsis --version=3.09
+      choco install --yes nsis --version=3.10 --force
 
       java -version
 

mediaportal/Configuration/App.config

@@ -23,7 +23,7 @@
     <loadFromRemoteSources enabled="true" />
   </runtime>
   <appSettings>
-    <add key="version" value="1.35-Horizon" />
+    <add key="version" value="1.36-Polar Express" />
   </appSettings>
   <startup useLegacyV2RuntimeActivationPolicy="true">
     <supportedRuntime version="v4.0.30319" />

mediaportal/Configuration/Sections/Movies.cs

@@ -152,7 +152,7 @@ public override void LoadSettings()
 
         repeatPlaylistCheckBox.Checked = xmlreader.GetValueAsBool("movies", "repeat", true);
         comboBoxPlayAll.SelectedIndex = xmlreader.GetValueAsInt("movies", "playallinfolder", 3);
-
+        MadVrInUse = xmlreader.GetValueAsBool("general", "useMadVideoRenderer", false);
         subEnginesCombo.SelectedItem = xmlreader.GetValueAsString("subtitles", "engine", "MPC-HC");
         subPaths.Text = xmlreader.GetValueAsString("subtitles", "paths", @".\,.\Subtitles\");
         checkBoxShowWatched.Checked = xmlreader.GetValueAsBool("movies", "markwatched", true);
@@ -163,7 +163,7 @@ public override void LoadSettings()
         playedPercentageTB.Value = playedPercentageTrackBar.Value;
 
         comSkipCheckBox.Checked = xmlreader.GetValueAsBool("comskip", "automaticskip", false);
-        MadVrInUse = xmlreader.GetValueAsBool("general", "useMadVideoRenderer", false);
+
         string selection = (string)subEnginesCombo.SelectedItem;
         if ((!MadVrInUse && selection.Equals("XySubFilter") && !SubtitleComboMessageDone))
         {

mediaportal/Core/Core.csproj

@@ -1766,11 +1766,11 @@ xcopy "$(TargetDir)core.*" "$(SolutionDir)MediaPortal.Application\bin\$(Configur
     <Error Condition="!Exists('..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets'))" />
     <Error Condition="!Exists('..\..\Packages\FFmpeg.Win64.Static.4.1.1.1\build\FFmpeg.Win64.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\FFmpeg.Win64.Static.4.1.1.1\build\FFmpeg.Win64.Static.targets'))" />
     <Error Condition="!Exists('..\..\Packages\MediaInfo.Native.21.9.1\build\MediaInfo.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\MediaInfo.Native.21.9.1\build\MediaInfo.Native.targets'))" />
-    <Error Condition="!Exists('..\..\Packages\Sqlite.3.41.2.5\build\sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\Sqlite.3.41.2.5\build\sqlite.targets'))" />
+    <Error Condition="!Exists('..\..\Packages\Sqlite.3.47.0\build\sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\Sqlite.3.47.0\build\sqlite.targets'))" />
   </Target>
   <Import Project="..\..\Packages\BASSCombined.2.4.15\build\basscombined.targets" Condition="Exists('..\..\Packages\BASSCombined.2.4.15\build\basscombined.targets')" />
   <Import Project="..\..\Packages\FFmpeg.Win64.Static.4.1.1.1\build\FFmpeg.Win64.Static.targets" Condition="Exists('..\..\Packages\FFmpeg.Win64.Static.4.1.1.1\build\FFmpeg.Win64.Static.targets')" />
   <Import Project="..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets" Condition="Exists('..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets')" />
   <Import Project="..\..\Packages\MediaInfo.Native.21.9.1\build\MediaInfo.Native.targets" Condition="Exists('..\..\Packages\MediaInfo.Native.21.9.1\build\MediaInfo.Native.targets')" />
-  <Import Project="..\..\Packages\Sqlite.3.41.2.5\build\sqlite.targets" Condition="Exists('..\..\Packages\Sqlite.3.41.2.5\build\sqlite.targets')" />
+  <Import Project="..\..\Packages\Sqlite.3.47.0\build\sqlite.targets" Condition="Exists('..\..\Packages\Sqlite.3.47.0\build\sqlite.targets')" />
 </Project>