Merge remote-tracking branch 'origin/master' into MP1-5178-MPAudioswi…

…tcher_connection&switching_issues

.github/workflows/mediaportal.yml

@@ -43,7 +43,7 @@ jobs:
         choco install --yes nsis --version=3.08
 
     - name: Git Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Git Submodule Update
       run: |

.github/workflows/mediaportal_jira.yml

@@ -43,7 +43,7 @@ jobs:
         choco install --yes nsis --version=3.08
 
     - name: Git Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Git Submodule Update
       run: |

.github/workflows/mediaportal_release.yml

@@ -52,3 +52,19 @@ jobs:
     needs: [build, release]
     permissions:
       security-events: write
+
+  ci-status:
+    name: Status
+    runs-on: ubuntu-latest
+    needs:
+      - build
+      - release
+      - codeql
+    if: always()
+    steps:
+      - name: Success
+        if: ${{ !(contains(needs.*.result, 'failure')) }}
+        run: exit 0
+      - name: Failure
+        if: ${{ contains(needs.*.result, 'failure') }}
+        run: exit 1

.github/workflows/mediaportal_test_build.yml

@@ -43,7 +43,7 @@ jobs:
         choco install --yes nsis --version=3.08
 
     - name: Git Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Git Submodule Update
       run: |

.github/workflows/workflow_codeql.yml

@@ -36,7 +36,7 @@ jobs:
         choco install --yes nsis --version=3.08
     
     - name: Git Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Git Submodule Update
       run: |

.github/workflows/workflow_stale.yml

@@ -27,7 +27,7 @@ jobs:
           operations-per-run: 150
           remove-stale-when-updated: true
           stale-pr-label: "stale"
-          exempt-pr-labels: "no-stale"
+          exempt-pr-labels: "no-stale,need-help,WIP"
           stale-pr-message: >
             There hasn't been any activity on this pull request recently. This
             pull request has been automatically marked as stale because of that

Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Framework.Tests/Gentle.Framework.Tests.csproj

@@ -330,6 +330,6 @@
   <PropertyGroup>
     <PreBuildEvent>
     </PreBuildEvent>
-    <PostBuildEvent>$(ProjectDir)Postbuild.bat $(ConfigurationName) $(ProjectDir)$(OutDir) $(SolutionDir)..\..\..\..\TvEngine3\TVLibrary\TVDatabase\references</PostBuildEvent>
+    <PostBuildEvent>"$(ProjectDir)Postbuild.bat" $(ConfigurationName) "$(ProjectDir)$(OutDir)" "$(SolutionDir)..\..\..\..\TvEngine3\TVLibrary\TVDatabase\references"</PostBuildEvent>
   </PropertyGroup>
 </Project>

Common-MP-TVE3/External/Gentle.NET/Source/Gentle.Framework.Tests/PostBuild.bat

@@ -4,9 +4,9 @@ REM %3 = Target directory
 
 if "%1" == "Debug" GOTO :Skip
 
-xcopy /Y "%2Gentle.Common.dll" "%3"
-xcopy /Y "%2Gentle.Framework.dll" "%3"
-xcopy /Y "%2Gentle.Provider.MySQL.dll" "%3"
-xcopy /Y "%2Gentle.Provider.SQLServer.dll" "%3"
+xcopy /Y %2Gentle.Common.dll %3
+xcopy /Y %2Gentle.Framework.dll %3
+xcopy /Y %2Gentle.Provider.MySQL.dll %3
+xcopy /Y %2Gentle.Provider.SQLServer.dll %3
 
 :Skip

Common-MP-TVE3/OsInfo/OSInfo.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2016 Team MediaPortal
+// Copyright (C) 2005-2023 Team MediaPortal
 // http://www.team-mediaportal.com
 // 
 // MediaPortal is free software: you can redistribute it and/or modify
@@ -337,6 +337,11 @@ public enum OSList
       ///</summary>
       Windows10,
 
+      ///<summary>
+      /// Windows 11
+      ///</summary>
+      Windows11,
+
       ///<summary>
       /// Windows 2003 Server
       ///</summary>
@@ -375,7 +380,12 @@ public enum OSList
       ///<summary>
       /// Windows 2019 Server
       ///</summary>
-      Windows2019
+      Windows2019,
+
+      ///<summary>
+      /// Windows 2022 Server
+      ///</summary>
+      Windows2022
     }
 
     /// <summary>
@@ -601,7 +611,22 @@ public static string GetOSNameString()
               switch (OSMinorVersion)
               {
                 case 0:
-                  osName = OSProductType == NTProductType.NT_WORKSTATION ? "Windows 10" : "Windows 2016";
+                  if (OSProductType == NTProductType.NT_WORKSTATION)
+                  {
+                    if (OSBuildVersion < 22000)
+                      osName = "Windows 10";
+                    else
+                      osName = "Windows 11";
+                  }
+                  else
+                  {
+                    if (OSBuildVersion < 17677)
+                      osName = "Windows 2016";
+                    else if (OSBuildVersion < 20348)
+                      osName = "Windows 2019";
+                    else
+                      osName = "Windows 2022";
+                  }
                   break;
               }
               break;
@@ -610,8 +635,7 @@ public static string GetOSNameString()
           break;
         }
       }
-      if (
-        !IsOSAsReported(OSMajorVersion, OSMinorVersion, OSBuildVersion, (byte) OSProductType, (short) OSServicePackMajor))
+      if (!IsOSAsReported(OSMajorVersion, OSMinorVersion, OSBuildVersion, (byte) OSProductType, (short) OSServicePackMajor))
         osName = "Compatibilty Mode: " + osName;
 
       return osName;
@@ -641,7 +665,22 @@ public static OSList GetOSName()
         case 63:
           return OSProductType == NTProductType.NT_WORKSTATION ? OSList.Windows81 : OSList.Windows2012R2;
         case 10:
-          return OSProductType == NTProductType.NT_WORKSTATION ? OSList.Windows10 : OSList.Windows2016;
+          if (OSProductType == NTProductType.NT_WORKSTATION)
+          {
+            if (OSBuildVersion < 22000)
+              return OSList.Windows10;
+            else
+              return OSList.Windows11;
+          }
+          else
+          {
+            if (OSBuildVersion < 17677)
+              return OSList.Windows2016;
+            else if (OSBuildVersion < 20348)
+              return OSList.Windows2019;
+            else
+              return OSList.Windows2022;
+          }
       }
       return OSList.Windows2000andPrevious;
     }
@@ -655,8 +694,8 @@ public static string GetOSDisplayVersion()
       string servicePack = GetOSServicePack();
       if (!string.IsNullOrEmpty(servicePack))
         servicePack = " (" + servicePack + ")";
-      return string.Format("{0} {1}{2} {3} [{4}]", GetOSNameString(), GetOSProductType(), servicePack,
-        GetOSx64orx32String(), OSVersion);
+      return string.Format("{0} {1}{2} {3} [{4}]", 
+                           GetOSNameString(), GetOSProductType(), servicePack, GetOSx64orx32String(), OSVersion);
     }
 
     /// <summary>
@@ -705,7 +744,7 @@ public static OsSupport GetOSSupported()
       }
       if (VerifyOSMinRequirement(10, 0, 10240, 0))
       {
-        // Windows 10/Windows Server 2016/Windows Server 2019
+        // Windows 10/Windows 11/Windows Server 2016/Windows Server 2019/Windows Server 2022
         return OsSupport.FullySupported;
       }
       return OsSupport.Blocked;

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.31.100.0")]
-[assembly: AssemblyFileVersion("1.31.100.0")]
+[assembly: AssemblyVersion("1.32.000.0")]
+[assembly: AssemblyFileVersion("1.32.000.0")]
 
 //[assembly: AssemblyInformationalVersion("")]
 //[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]

DirectShowFilters/DirectShowHelper/source/MadPresenter.h

@@ -20,14 +20,16 @@
 #include "DeviceState.h"
 #include "helpers/smartptr.h"
 #include <tchar.h>
-#include "../../mpc-hc_subs/src/DSUtil/DSUtil.h"
+//#include "../../DSUtil/DSUtil.h"
 #include "threads/Condition.h"
 #include "threads/CriticalSection.h"
 #include "StdString.h"
 #include "dshowhelper.h"
 
 using namespace std;
 
+#define QI(i)  (riid == __uuidof(i)) ? GetInterface((i*)this, ppv) :
+
   enum SHAREDRENDER_STATE
   {
     RENDERFRAME_LOCK,