Merge pull request #279 from MediaPortal/MP1.33_Final

MP1-1.33: Final

.github/workflows/mediaportal.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
     - name: Setup Visual Studio 2019
-      uses: microsoft/setup-msbuild@v1.3
+      uses: microsoft/setup-msbuild@v2
       with:
         vs-version: 16.11
 

.github/workflows/workflow_milestone.yml

@@ -13,6 +13,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: benelan/milestone-action@v3
+        with:
+          single: true
 
   add_on_close:
     name: Add Milestone on Close / Merge
@@ -21,4 +23,5 @@ jobs:
     steps:
       - uses: benelan/milestone-action@v3
         with:
-          overwrite: true # remove this line to keep existing milestone
+          overwrite: true
+          single: true

Common-MP-TVE3/SolutionInfo.cs

@@ -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
@@ -36,7 +36,7 @@
 
 [assembly: AssemblyCompany("Team MediaPortal")]
 [assembly: AssemblyProduct("MediaPortal")]
-[assembly: AssemblyCopyright("Copyright © 2005-2023 Team MediaPortal")]
+[assembly: AssemblyCopyright("Copyright © 2005-2024 Team MediaPortal")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.32.100.0")]
-[assembly: AssemblyFileVersion("1.32.100.0")]
+[assembly: AssemblyVersion("1.33.000.0")]
+[assembly: AssemblyFileVersion("1.33.000.0")]
 
 //[assembly: AssemblyInformationalVersion("")]
 //[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]

DirectShowFilters/MPAudioRenderer/source/SynchCorrection.cpp

@@ -254,7 +254,9 @@ double SynchCorrection::GetRequiredAdjustment(REFERENCE_TIME rtAHwTime, REFERENC
 	bool bQuality;
 	double dHwTime, dHwTimeDelta, dPhaseDiff, dDiffP, dDiff, dGain;
 
-	if (!m_pSettings->GetMaintainSoundPitch())
+	bQuality = bias > 1.0 - QUALITY_BIAS_LIMIT && bias < 1.0 + QUALITY_BIAS_LIMIT;
+
+	if (bQuality && !m_pSettings->GetMaintainSoundPitch())
 	{
 		// RATE mode: sound pitch is not maintained
 		// To avoid large change in speed(sound pitch), we use simple PI regulator to keep the target speed almost constant
@@ -437,9 +439,10 @@ double SynchCorrection::GetRequiredAdjustment(REFERENCE_TIME rtAHwTime, REFERENC
 	}
 	else
 	{
+		m_bMaintainSoundPitch = true; //use TEMPO to keep sound pitch
+
 		ret = bias * adjustment;
 		dTotalAudioDrift = CalculateDrift(rtAHwTime, rtRCTime - m_rtStart) + m_dAudioDelay + m_dEVRAudioDelay;
-		bQuality = bias > 1.0 - QUALITY_BIAS_LIMIT && bias < 1.0 + QUALITY_BIAS_LIMIT;
 
 		if (bQuality)
 		{

Tools/InstallationScripts/include/MediaPortalCurrentVersion.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
@@ -31,8 +31,8 @@
 
 
 !define VER_MAJOR       1
-!define VER_MINOR       32
-!define VER_REVISION    100
+!define VER_MINOR       33
+!define VER_REVISION    000
 
 #**********************************************************************************************************#
 

Tools/InstallationScripts/include/MediaPortalMacros.nsh

@@ -556,6 +556,9 @@
 !if "${PRODUCT_NAME}" == "MediaPortal TV Server / Client"
   !insertmacro NSISuninstall "${MP_REG_UNINSTALL}"
 !endif
+!if "${PRODUCT_NAME}" == "MediaPortal TV Server / Client (x64)"
+  !insertmacro NSISuninstall "${MP_REG_UNINSTALL}"
+!endif
 
 SetShellVarContext all
 # Delete new MediaPortal ( >= 0.2.3 RC3 ) and TVengine 3 directories
@@ -837,10 +840,12 @@ DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\MediaPort
 !macro MediaPortalVCRedistCheck
   ${LOG_TEXT} "INFO" ".: Microsoft Visual C++ Redistributable Check :."
 
+!if "${Architecture}" == "x86"
   ; check if VC Redist 2008 SP1 is installed
   ${IfNot} ${VCRedist2008IsInstalled}
     !insertmacro ShowMissingComponent "     - Microsoft Visual C++ 2008 Service Pack 1 Redistributable Package ATL Security Update"
   ${EndIf}
+!endif
 
   ${LOG_TEXT} "INFO" "============================"
 !macroend
@@ -926,6 +931,17 @@ ${EndIf}
     !insertmacro TVSERVER_GET_VERSION $R0
 !endif
 
+!if "${PRODUCT_NAME}" == "MediaPortal TV Server / Client (x64)"
+  ${IfNot} ${TVServerIsInstalled}
+  ${AndIfNot} ${TVClientIsInstalled}
+    MessageBox MB_YESNO|MB_ICONSTOP "$(TEXT_MSGBOX_ERROR_GIT_NOMP)" IDNO +2
+    ExecShell open "${WEB_DOWNLOAD_MIN_MP_VERSION}"
+    Abort
+  ${Else}
+
+    !insertmacro TVSERVER_GET_VERSION $R0
+!endif
+
     ${VersionCompare} $R0 ${MIN_INSTALLED_MP_VERSION} $R0
     ${If} $R0 == 0
       ; installed version is EQUAL to min

Tools/MediaPortal.DeployTool/Utils.cs

@@ -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
@@ -780,7 +780,7 @@ public static Version GetPackageVersion(string type)
         case "max":
           major = 1;
           minor = 32;
-          revision = 000;
+          revision = 100;
           break;
       }
       Version ver = new Version(major, minor, revision);
@@ -800,8 +800,8 @@ public static bool IsPackageUpdatabled(Version pkgVer)
     public static Version GetCurrentPackageVersion()
     {
       int major = 1;
-      int minor = 32;
-      int revision = 100;
+      int minor = 33;
+      int revision = 000;
 
       Version ver = new Version(major, minor, revision);
       return ver;
@@ -851,7 +851,7 @@ public static Version VersionFromRegistry(string regkey)
 
     public static string GetDisplayVersion()
     {
-      return "1.33 Pre Release";
+      return "1.33 Springtime / 20th Anniversary";
     }
 
     /// <summary>
@@ -926,7 +926,7 @@ public static void FixMediaPortal64RegistryPath(string strName)
         {
           //Existing old registry path
 
-          RegistryKey key = Registry.LocalMachine.OpenSubKey(strPath);
+          RegistryKey key = Registry.LocalMachine.OpenSubKey(strPath, true);
 
           if (key == null)
           {

TvEngine3/TVLibrary/Setup/setup.nsi

@@ -638,8 +638,12 @@ ${MementoSection} "MediaPortal TV Server" SecServer
   !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "${git_DirectShowFilters}\TsWriter\bin\${BUILD_TYPE}\TsWriter.ax" "$INSTDIR\TsWriter.ax" "$INSTDIR"
   ; filters for analog tv
   !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "${git_DirectShowFilters}\MPWriter\bin\${BUILD_TYPE}\mpFileWriter.ax" "$INSTDIR\mpFileWriter.ax" "$INSTDIR"
-  !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "${git_DirectShowFilters}\bin\Release\PDMpgMux.ax" "$INSTDIR\PDMpgMux.ax" "$INSTDIR"
-
+  !if "${Architecture}" == "x64"
+    !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "${git_DirectShowFilters}\bin\Release\x64\PDMpgMux.ax" "$INSTDIR\PDMpgMux.ax" "$INSTDIR"
+  !else
+    !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "${git_DirectShowFilters}\bin\Release\PDMpgMux.ax" "$INSTDIR\PDMpgMux.ax" "$INSTDIR"
+  !endif
+
   ${If} ${FileExists} "$INSTDIR\MPUrlSourceSplitter\MPUrlSourceSplitter.ax"
     ${LOG_TEXT} "INFO" "MPUrlSourceSplitter detected, skipping registration of MPIPTVSource.ax"
     ; reregister because previous uninstall probably unregisterd the MPIPTVSource.ax
@@ -1332,7 +1336,7 @@ Function un.onUninstSuccess
   ${If} ${RebootFlag}
     ${LOG_TEXT} "INFO" "!!! Some files were not able to uninstall. To finish uninstallation completly a REBOOT is needed."
     FileOpen $0 $INSTDIR\rebootflag w
-    Delete $INSTDIR\rebootflag ; this will not be deleted until the reboot because it is currently opened
+    Delete /REBOOTOK $INSTDIR\rebootflag ; this will not be deleted until the reboot because it is currently opened
     RmDir $INSTDIR
     FileClose $0
   ${EndIf}

TvEngine3/TVLibrary/TVDatabase/TvBusinessLayer/BusinessLayer.cs

@@ -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
@@ -3399,7 +3399,7 @@ public bool IsChannelMappedToCard(Channel dbChannel, Card card, bool forEpg)
     /// </summary>
     public void SetLogLevel()
     {
-      var logLevel = (LogLevel)int.Parse(GetSetting("loglevel", "5").Value); // debug is "5", info is "4"
+      var logLevel = (LogLevel)int.Parse(GetSetting("loglevel", "4").Value); // debug is "5", info is "4"
       Log.SetLogLevel(logLevel);
     }
   }

TvEngine3/TVLibrary/TVLibrary/Implementations/Analog/Components/Encoder.cs

@@ -1911,26 +1911,42 @@ private bool AddMpegMuxer(IFilterGraph2 _graphBuilder, Capture _capture)
       Log.Log.WriteFile("analog:AddMpegMuxer()");
       try
       {
+        //CyberLink MPEG Muxer
+        const string _MONIKER_MPEG_MUXER =
+          @"@device:sw:{083863F1-70DE-11D0-BD40-00A0C911CE86}\{4B5C6BC0-D60E-11D2-8F3F-0080C84E9806}";
         const string monikerPowerDirectorMuxer =
           @"@device:sw:{083863F1-70DE-11D0-BD40-00A0C911CE86}\{7F2BBEAF-E11C-4D39-90E8-938FB5A86045}";
         const string monikerPowerDvdMuxer =
           @"@device:sw:{083863F1-70DE-11D0-BD40-00A0C911CE86}\{6770E328-9B73-40C5-91E6-E2F321AEDE57}";
         const string monikerPowerDvdMuxer2 =
           @"@device:sw:{083863F1-70DE-11D0-BD40-00A0C911CE86}\{370E9701-9DC5-42C8-BE29-4E75F0629EED}";
-        _filterMpegMuxer = Marshal.BindToMoniker(monikerPowerDirectorMuxer) as IBaseFilter;
-        int hr = _graphBuilder.AddFilter(_filterMpegMuxer, "CyberLink MPEG Muxer");
+
+        int hr = -1;
+        try
+        {
+          _filterMpegMuxer = Marshal.BindToMoniker(_MONIKER_MPEG_MUXER) as IBaseFilter;
+          hr = _graphBuilder.AddFilter(_filterMpegMuxer, "CyberLink MPEG Muxer");
+          if (hr == 0)
+            Log.Log.WriteFile("analog:CyberLink MPEG Muxer loaded: " + _MONIKER_MPEG_MUXER);
+        }
+        catch { }
         if (hr != 0)
         {
-          _filterMpegMuxer = Marshal.BindToMoniker(monikerPowerDvdMuxer) as IBaseFilter;
+          _filterMpegMuxer = Marshal.BindToMoniker(monikerPowerDirectorMuxer) as IBaseFilter;
           hr = _graphBuilder.AddFilter(_filterMpegMuxer, "CyberLink MPEG Muxer");
           if (hr != 0)
           {
-            _filterMpegMuxer = Marshal.BindToMoniker(monikerPowerDvdMuxer2) as IBaseFilter;
+            _filterMpegMuxer = Marshal.BindToMoniker(monikerPowerDvdMuxer) as IBaseFilter;
             hr = _graphBuilder.AddFilter(_filterMpegMuxer, "CyberLink MPEG Muxer");
             if (hr != 0)
             {
-              Log.Log.WriteFile("analog:AddMpegMuxer returns:0x{0:X}", hr);
-              //throw new TvException("Unable to add Cyberlink MPEG Muxer");
+              _filterMpegMuxer = Marshal.BindToMoniker(monikerPowerDvdMuxer2) as IBaseFilter;
+              hr = _graphBuilder.AddFilter(_filterMpegMuxer, "CyberLink MPEG Muxer");
+              if (hr != 0)
+              {
+                Log.Log.WriteFile("analog:AddMpegMuxer returns:0x{0:X}", hr);
+                //throw new TvException("Unable to add Cyberlink MPEG Muxer");
+              }
             }
           }
         }

TvEngine3/TVLibrary/TvPlugin/TvPlugin/TVHome.cs

@@ -1052,10 +1052,10 @@ public static bool WaitForGentleConnection()
           IList<Card> cards = TvDatabase.Card.ListAll();
           success = true;
         }
-        catch (Exception)
+        catch (Exception e)
         {
           success = false;
-          Log.Debug("TVHome: waiting for gentle.net DB connection {0} msec", timer.ElapsedMilliseconds);
+          Log.Debug("TVHome: waiting for gentle.net DB connection {0} msec\nException: {1}", timer.ElapsedMilliseconds, e.Message);
           Thread.Sleep(100);
         }
       }

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.33.Pre.Release.{build}
+version: 1.33.Final.{build}
 image: Visual Studio 2019
 clone_folder: c:\project\mediaportal
 environment:

mediaportal/Configuration/App.config

@@ -23,7 +23,7 @@
     <loadFromRemoteSources enabled="true" />
   </runtime>
   <appSettings>
-    <add key="version" value="1.33-Pre Release" />
+    <add key="version" value="1.33-Springtime / 20th Anniversary" />
   </appSettings>
   <startup useLegacyV2RuntimeActivationPolicy="true">
     <supportedRuntime version="v4.0.30319" />

mediaportal/Configuration/Sections/General.cs

@@ -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
@@ -42,7 +42,7 @@ public General(string name)
       InitializeComponent();
     }
 
-    private string loglevel = "3"; // 1= error, 2 = info, 3 = debug
+    private string loglevel = "2"; // 1= error, 2 = info, 3 = debug
 
     /// <summary> 
     /// Erforderliche Designervariable.

mediaportal/Configuration/Sections/GeneralVolume.cs

@@ -78,8 +78,8 @@ public override void LoadSettings()
       {
         string isSettingExist = reader.GetValueAsString("volume", "handler", "");
         int volumeStyle = reader.GetValueAsInt("volume", "handler", 1);
-        bool isDigital = reader.GetValueAsBool("volume", "digital", true);
-        mpCBHideWinOSD.Checked = reader.GetValueAsBool("volume", "hideWindowsOSD", false);
+        bool isDigital = reader.GetValueAsBool("volume", "digital", false);
+        mpCBHideWinOSD.Checked = reader.GetValueAsBool("volume", "hideWindowsOSD", true);
 
         _useClassicHandler.Checked = volumeStyle == 0;
         _useWindowsHandler.Checked = volumeStyle == 1;