Skip to content

Commit

Permalink
Merge pull request #353 from MediaPortal/MP1.36_Final_Test
Browse files Browse the repository at this point in the history
MP1.35 Final Release
  • Loading branch information
andrewjswan authored Dec 5, 2024
2 parents be30dfa + f20275d commit 4d6b455
Show file tree
Hide file tree
Showing 70 changed files with 964 additions and 1,371 deletions.
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ Tuning:

MPE:
- 'MPE'

Skin:
- '(Titan|DWHD|skin)'
4 changes: 2 additions & 2 deletions .github/workflows/mediaportal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow_codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/workflow_xml_validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Common-MP-TVE3/SolutionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.*")]
2 changes: 2 additions & 0 deletions Tools/InstallationScripts/XML-plugin/Example/test.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- world -->
<root>
<a>
<a>AAA
<a>
Expand All @@ -17,3 +18,4 @@
<a>
<d attr1="value1" attr2="value2" attr3="value3" attr4="value4">HHH</d>
</a>
</root>
8 changes: 4 additions & 4 deletions Tools/InstallationScripts/include-MP-PreBuild.nsh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


!define VER_MAJOR 1
!define VER_MINOR 35
!define VER_MINOR 36
!define VER_REVISION 000

#**********************************************************************************************************#
Expand Down
8 changes: 4 additions & 4 deletions Tools/InstallationScripts/include/MediaPortalMacros.nsh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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___
Expand Down
6 changes: 3 additions & 3 deletions Tools/MediaPortal.DeployTool/Utils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ public static Version GetPackageVersion(string type)
break;
case "max":
major = 1;
minor = 34;
minor = 35;
revision = 100;
break;
}
Expand All @@ -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);
Expand Down Expand Up @@ -853,7 +853,7 @@ public static Version VersionFromRegistry(string regkey)

public static string GetDisplayVersion()
{
return "1.35 Horizon";
return "1.36 Polar Express";
}

/// <summary>
Expand Down
Binary file modified Tools/SkinEditor/config.xml
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<Frequency>658000</Frequency>
<BandWidth>8</BandWidth>
<Offset>0</Offset>
</DVBTTuning>
<DVBTTuning>
<Frequency>690000</Frequency>
<BandWidth>8</BandWidth>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
<DVBTTuning>
<Frequency>506000</Frequency>
<BandWidth>8</BandWidth>
<Offset>167</Offset>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
</ArrayOfDVBTTuning>3
</ArrayOfDVBTTuning>
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -47,4 +48,4 @@
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
</ArrayOfDVBTTuning>
</ArrayOfDVBTTuning>
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -35,4 +36,4 @@
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
</ArrayOfDVBTTuning>
</ArrayOfDVBTTuning>
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -41,4 +42,4 @@
<BandWidth>8</BandWidth>
<Offset>167</Offset>
</DVBTTuning>
</ArrayOfDVBTTuning>
</ArrayOfDVBTTuning>
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand All @@ -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" />
Expand All @@ -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;
Expand Down Expand Up @@ -119,4 +119,3 @@
<Modify channel="*" field="#DESCRIPTION" search="Toutes les chaines" action="Replace">---</Modify>
</Actions>
</Grabber>

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 1.35.Final.{build}
version: 1.36.Final.{build}
image: Visual Studio 2019
clone_folder: c:\project\mediaportal
environment:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mediaportal/Configuration/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions mediaportal/Configuration/Sections/Movies.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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))
{
Expand Down
4 changes: 2 additions & 2 deletions mediaportal/Core/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading

0 comments on commit 4d6b455

Please sign in to comment.