win d3d: MythVideoOutput: Move visualiser into MythPlayer

This extends 9d7f694 to the windows d3d video driver.
MythTV · Nov 24, 2023 · 7b51ce1 · 7b51ce1
1 parent d5e709c
commit 7b51ce1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/mythtv/libs/libmythtv/videoout_d3d.cpp b/mythtv/libs/libmythtv/videoout_d3d.cpp
@@ -299,8 +299,7 @@ bool VideoOutputD3D::CreatePauseFrame(void)
 }
 
 void VideoOutputD3D::RenderFrame(MythVideoFrame *buffer,
-                                 FrameScanType t,
-                                 [[maybe_unused]] OSD *osd)
+                                 FrameScanType t)
 {
     if (IsErrored())
     {
@@ -339,20 +338,25 @@ void VideoOutputD3D::RenderFrame(MythVideoFrame *buffer,
             {
                 if (!dummy)
                     m_video->Draw();
-
-                if (m_visual)
-                    m_visual->Draw(GetTotalOSDBounds(), m_osdPainter, nullptr);
-
-                if (osd && m_osdPainter && !m_window.IsEmbedding())
-                    osd->Draw(m_osdPainter, GetTotalOSDBounds().size(),
-                                    true);
-                m_render->End();
             }
         }
 
     }
 }
 
+void VideoOutputD3D::RenderOverlays(OSD *osd)
+{
+    if (osd && m_osdPainter && !m_window.IsEmbedding())
+        osd->Draw(m_osdPainter, GetTotalOSDBounds().size(), true);
+}
+
+void VideoOutputD3D::RenderEnd()
+{
+    if (!m_renderValid)
+        return;
+    m_render->End();
+}
+
 void VideoOutputD3D::EndFrame()
 {
     if (IsErrored())

diff --git a/mythtv/libs/libmythtv/videoout_d3d.h b/mythtv/libs/libmythtv/videoout_d3d.h
@@ -21,8 +21,11 @@ class VideoOutputD3D : public MythVideoOutput
 
     bool Init(const QSize &video_dim_buf, const QSize &video_dim_disp, float video_aspect,
               WId winid, const QRect &win_rect, MythCodecID codec_id) override; // VideoOutput
-    void RenderFrame(MythVideoFrame *buffer, FrameScanType, OSD *osd) override; // VideoOutput
+    void RenderFrame(MythVideoFrame *buffer, FrameScanType) override; // VideoOutput
+    void RenderOverlays(OSD *osd) override; // VideoOutput
+    void RenderEnd() override; // VideoOutput
     void PrepareFrame(MythVideoFrame *frame, FrameScanType scan) override; // VideoOutput
+    void PrepareEnd() override; // VideoOutput
     void EndFrame() override;
     void WindowResized(const QSize &new_size) override; // VideoOutput
     bool InputChanged(const QSize &video_dim_buf,
@@ -43,12 +46,6 @@ class VideoOutputD3D : public MythVideoOutput
 
     MythPainter *GetOSDPainter(void) override; // VideoOutput
 
-    bool CanVisualise(AudioPlayer *audio, MythRender */*render*/) override // VideoOutput
-        { return MythVideoOutput::CanVisualise(audio, (MythRender*)m_render); }
-    bool SetupVisualisation(AudioPlayer *audio, MythRender */*render*/,
-                            const QString &name) override // VideoOutput
-        { return MythVideoOutput::SetupVisualisation(audio, (MythRender*)m_render, name); }
-
   private:
     void TearDown(void);
     bool SetupContext(void);