win d3d: MythVideoOutput: Remove GetOSDPainter method

This extend 663dd5f to the windows d3d video driver.
MythTV · Nov 24, 2023 · c3ae5a5 · c3ae5a5
1 parent e93e218
commit c3ae5a5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 33 deletions.
diff --git a/mythtv/libs/libmythtv/videoout_d3d.cpp b/mythtv/libs/libmythtv/videoout_d3d.cpp
@@ -69,18 +69,6 @@ void VideoOutputD3D::TearDown(void)
         m_pauseFrame.m_buffer = nullptr;
     }
 
-    if (m_osdPainter)
-    {
-        // Hack to ensure that the osd painter is not
-        // deleted while image load thread is still busy
-        // loading images with that painter
-        m_osdPainter->Teardown();
-        if (invalid_osd_painter)
-            delete invalid_osd_painter;
-        invalid_osd_painter = m_osdPainter;
-        m_osdPainter = nullptr;
-    }
-
     DeleteDecoder();
     DestroyContext();
 }
@@ -211,18 +199,7 @@ bool VideoOutputD3D::Init(QSize video_dim_buf,
 
     if (!success)
         TearDown();
-    else
-    {
-        m_osdPainter = new MythD3D9Painter(m_render);
-        if (m_osdPainter)
-        {
-            m_osdPainter->SetSwapControl(false);
-            LOG(VB_PLAYBACK, LOG_INFO, LOC + "Created D3D9 osd painter.");
-        }
-        else
-            LOG(VB_GENERAL, LOG_ERR, LOC +
-                "Failed to create D3D9 osd painter.");
-    }
+
     return success;
 }
 
@@ -487,11 +464,6 @@ QStringList VideoOutputD3D::GetAllowedRenderers(
     return list;
 }
 
-MythPainter *VideoOutputD3D::GetOSDPainter(void)
-{
-    return m_osdPainter;
-}
-
 MythCodecID VideoOutputD3D::GetBestSupportedCodec(
     uint width,       uint height, const QString &decoder,
     uint stream_type, bool no_acceleration,

diff --git a/mythtv/libs/libmythtv/videoout_d3d.h b/mythtv/libs/libmythtv/videoout_d3d.h
@@ -43,8 +43,6 @@ class VideoOutputD3D : public MythVideoOutput
                                              bool no_acceleration,
                                              AVPixelFormat &pix_fmt);
 
-    MythPainter *GetOSDPainter(void) override; // VideoOutput
-
   private:
     void TearDown(void);
     bool SetupContext(void);
@@ -69,8 +67,6 @@ class VideoOutputD3D : public MythVideoOutput
     bool                    m_renderValid    {false};
     bool                    m_renderReset    {false};
 
-    MythD3D9Painter        *m_osdPainter     {nullptr};
-
     bool CreateDecoder(void);
     void DeleteDecoder(void);
 #ifdef USING_DXVA2