Fix method hiding in VideoOutputXv and VideoOutputOpenGL

MythTV · Nov 30, 2012 · 0e0c200 · 0e0c200
1 parent 217e4a2
commit 0e0c200
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/mythtv/libs/libmythtv/videoout_opengl.cpp b/mythtv/libs/libmythtv/videoout_opengl.cpp
@@ -100,7 +100,7 @@ bool VideoOutputOpenGL::CreateGPUResources(void)
     bool result = SetupContext();
     QSize size = window.GetActualVideoDim();
     InitDisplayMeasurements(size.width(), size.height(), false);
-    InitOSD();
+    CreatePainter();
     return result;
 }
 
@@ -378,7 +378,7 @@ bool VideoOutputOpenGL::SetupOpenGL(void)
     return success;
 }
 
-void VideoOutputOpenGL::InitOSD(void)
+void VideoOutputOpenGL::CreatePainter(void)
 {
     QMutexLocker locker(&gl_context_lock);
 

diff --git a/mythtv/libs/libmythtv/videoout_opengl.h b/mythtv/libs/libmythtv/videoout_opengl.h
@@ -70,7 +70,7 @@ class VideoOutputOpenGL : public VideoOutput
     bool CreatePauseFrame(void);
     bool SetupContext(void);
     bool SetupOpenGL(void);
-    void InitOSD(void);
+    void CreatePainter(void);
 
     QMutex            gl_context_lock;
     MythRenderOpenGL *gl_context;

diff --git a/mythtv/libs/libmythtv/videoout_xv.cpp b/mythtv/libs/libmythtv/videoout_xv.cpp
@@ -293,7 +293,7 @@ bool VideoOutputXv::InputChanged(const QSize &input_size,
     }
 
     InitColorKey(true);
-    InitOSD();
+    CreateOSD();
 
     MoveResize();
 
@@ -756,7 +756,7 @@ MythCodecID VideoOutputXv::GetBestSupportedCodec(uint stream_type)
     return (MythCodecID)(kCodec_MPEG1 + (stream_type-1));
 }
 
-bool VideoOutputXv::InitOSD(void)
+bool VideoOutputXv::CreateOSD(void)
 {
     QString osdrenderer = db_vdisp_profile->GetOSDRenderer();
 
@@ -909,7 +909,7 @@ bool VideoOutputXv::Init(int width, int height, float aspect,
         return false;
 
     InitColorKey(true);
-    InitOSD();
+    CreateOSD();
 
     MoveResize();
 

diff --git a/mythtv/libs/libmythtv/videoout_xv.h b/mythtv/libs/libmythtv/videoout_xv.h
@@ -111,7 +111,7 @@ class VideoOutputXv : public VideoOutput
     bool InitXVideo(void);
     bool InitXShm(void);
     bool InitXlib(void);
-    bool InitOSD(void);
+    bool CreateOSD(void);
 
     bool CreateBuffers(VOSType subtype);
     vector<unsigned char*> CreateShmImages(uint num, bool use_xv);