Fix 0002299: WMP Visualisations were not working

MediaPortal · Jun 26, 2009 · b50fd30 · b50fd30
1 parent 7117406
commit b50fd30
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/mediaportal/Core/MusicPlayer/Visualization/IVisualization.cs b/mediaportal/Core/MusicPlayer/Visualization/IVisualization.cs
@@ -34,6 +34,7 @@ public interface IVisualization
     bool PreRenderRequired { get; }
     bool IsEngineInstalled();
     bool IsWinampVis();
+    bool IsWmpVis();
     bool Initialize();
     bool InitializePreview(); // Used for visualization previews
     bool Config();

diff --git a/mediaportal/Core/MusicPlayer/Visualization/VisualizationBase.cs b/mediaportal/Core/MusicPlayer/Visualization/VisualizationBase.cs
@@ -151,6 +151,11 @@ public virtual bool IsWinampVis()
       return false;
     }
 
+    public virtual bool IsWmpVis()
+    {
+      return false;
+    }
+
     public virtual bool Initialize()
     {
       return false;

diff --git a/mediaportal/Core/MusicPlayer/Visualization/VisualizationWindow.cs b/mediaportal/Core/MusicPlayer/Visualization/VisualizationWindow.cs
@@ -1573,7 +1573,7 @@ private void DoResize()
 
       try
       {
-        if (_EnableStatusOverlays)
+        if (_EnableStatusOverlays && !Viz.IsWmpVis())
         {
           // Make sure we're using the original defaults...
           TrackInfoImageWidth = DefaultTrackInfoImageWidth;
@@ -2009,7 +2009,7 @@ private int RenderVisualization(Graphics g)
 
       try
       {
-        if (_EnableStatusOverlays || !FullScreen)
+        if ((_EnableStatusOverlays || !FullScreen) && !Viz.IsWmpVis())
         {
           if (DialogWindowIsActive)
           {

diff --git a/mediaportal/Core/MusicPlayer/Visualization/WMPViz.cs b/mediaportal/Core/MusicPlayer/Visualization/WMPViz.cs
@@ -111,8 +111,8 @@ public override bool Initialize()
         rect.bottom = VisualizationWindow.Height;
 
         OutputContextType outputType = VisualizationWindow.OutputContextType;
-        result = WMPInterop.InitWMPEngine(VizPluginInfo.CLSID, VizPluginInfo.PresetIndex, outputType, IntPtr.Zero,
-                                          VisualizationWindow.CompatibleDC, ref rect);
+        result = WMPInterop.InitWMPEngine(VizPluginInfo.CLSID, VizPluginInfo.PresetIndex, OutputContextType.WindowHandle, IntPtr.Zero,
+                                          VisualizationWindow.Handle, ref rect);
         _Initialized = result;
         Log.Info("  Visualization Manager: WMP visualization initialization {0}", (result ? "succeeded." : "failed!"));
       }
@@ -165,6 +165,11 @@ public override int RenderVisualization()
       return result;
     }
 
+    public override bool IsWmpVis()
+    {
+      return true;
+    }
+
     public override bool Close()
     {
       try
@@ -183,7 +188,7 @@ public override bool Close()
 
     public override bool WindowSizeChanged(Size newSize)
     {
-      bool result = SetOutputContext(VisualizationWindow.OutputContextType);
+      bool result = SetOutputContext(OutputContextType.WindowHandle);
       return result;
     }
 
@@ -196,7 +201,7 @@ public override bool WindowChanged(VisualizationWindow vizWindow)
         return false;
       }
 
-      bool result = SetOutputContext(VisualizationWindow.OutputContextType);
+      bool result = SetOutputContext(OutputContextType.WindowHandle);
       return result;
     }
 
@@ -213,7 +218,7 @@ public override bool SetOutputContext(OutputContextType outputType)
         return false;
       }
 
-      bool result = WMPInterop.SetOutputWMP(outputType, VisualizationWindow.CompatibleDC);
+      bool result = WMPInterop.SetOutputWMP(outputType, VisualizationWindow.Handle);
       return result;
     }