MP1-5214: Add PixelShader support: Add Load(profile) method to PixerS…

…haderCollection class
MediaPortal · Apr 1, 2024 · 8e92363 · 8e92363
1 parent 652f43e
commit 8e92363
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 22 deletions.
diff --git a/mediaportal/Core/Player/PlaneScene.cs b/mediaportal/Core/Player/PlaneScene.cs
@@ -380,36 +380,36 @@ public void Init()
           _subEngineType = xmlreader.GetValueAsString("subtitles", "engine", "DirectVobSub");
           _posRelativeToFrame = xmlreader.GetValueAsBool("subtitles", "subPosRelative", false);
           _useRestoreMadvr1080P = xmlreader.GetValueAsBool("general", "useRestoreMadvr1080p", false);
-
-          #region Pixel Shaders
-          if (GUIGraphicsContext.VideoRenderer != GUIGraphicsContext.VideoRendererType.madVR)
-          {
-            string strProfile = PixelShaderCollection.SHADER_PROFILE_DEFAULT;
-
-            //Profile: based on video width
-            if (g_Player.MediaInfo != null && g_Player.MediaInfo.Width > 0)
-            {
-              if (g_Player.MediaInfo.Width > 1920)
-                strProfile = "UHD";
-              else if (g_Player.MediaInfo.Width >= 1440)
-                strProfile = "HD";
-              else
-                strProfile = "SD";
-            }
-
-            GUIGraphicsContext.VideoPixelShaders.Load(xmlreader.GetValueAsString("general", "VideoPixelShader" + strProfile, null), strProfile);
-          }
-          else
-            GUIGraphicsContext.VideoPixelShaders.Clear(); //not supported with MadVR
-          #endregion
         }
         catch (Exception ex)
         {
           Log.Error("PlaceScene: Init: {0}", ex.Message);
         }
       }
 
+      #region Pixel Shaders
+      if (GUIGraphicsContext.VideoRenderer != GUIGraphicsContext.VideoRendererType.madVR)
+      {
+        string strProfile = PixelShaderCollection.SHADER_PROFILE_DEFAULT;
+
+        //Profile: based on video width
+        if (g_Player.MediaInfo != null && g_Player.MediaInfo.Width > 0)
+        {
+          if (g_Player.MediaInfo.Width > 1920)
+            strProfile = "UHD";
+          else if (g_Player.MediaInfo.Width >= 1440)
+            strProfile = "HD";
+          else
+            strProfile = "SD";
+        }
+
+        GUIGraphicsContext.VideoPixelShaders.Load(strProfile);
+      }
+      else
+        GUIGraphicsContext.VideoPixelShaders.Clear(); //not supported with MadVR
+
       this._PixelShaderClock.Start();
+      #endregion
     }
 
     /// <summary>

diff --git a/mediaportal/Core/guilib/PixelShaderCollection.cs b/mediaportal/Core/guilib/PixelShaderCollection.cs
@@ -145,6 +145,18 @@ public bool RemoveAt(int iIdx)
       return true;
     }
 
+    /// <summary>
+    /// Load Pixel Shaders
+    /// </summary>
+    /// <param name="strProfile">Profile name.</param>
+    public void Load(string strProfile)
+    {
+      using (Profile.Settings xmlReader = new Profile.MPSettings())
+      {
+        this.Load(xmlReader.GetValueAsString("general", "VideoPixelShader" + strProfile, null), strProfile);
+      }
+    }
+
     /// <summary>
     /// Load Pixel Shaders
     /// </summary>