MythVDPAUHelper: Suppress warning about opening X display

MythTV · Sep 30, 2019 · 3512c2e · 3512c2e
1 parent 743c1ed
commit 3512c2e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/mythtv/libs/libmythtv/mythvdpauhelper.cpp b/mythtv/libs/libmythtv/mythvdpauhelper.cpp
@@ -75,7 +75,7 @@ static const char* DummyGetError(VdpStatus)
 MythVDPAUHelper::MythVDPAUHelper(void)
   : m_createdDevice(true)
 {
-    m_display = OpenMythXDisplay();
+    m_display = OpenMythXDisplay(false);
     if (!m_display)
         return;
 

diff --git a/mythtv/libs/libmythui/mythxdisplay.cpp b/mythtv/libs/libmythui/mythxdisplay.cpp
@@ -56,13 +56,14 @@ MythXDisplay *GetMythXDisplay(Display *d)
     return nullptr;
 }
 
-MythXDisplay *OpenMythXDisplay(void)
+MythXDisplay *OpenMythXDisplay(bool Warn /*= true*/)
 {
     MythXDisplay *disp = new MythXDisplay();
     if (disp && disp->Open())
         return disp;
 
-    LOG(VB_GENERAL, LOG_CRIT, "MythXOpenDisplay() failed");
+    if (Warn)
+        LOG(VB_GENERAL, LOG_CRIT, "MythXOpenDisplay() failed");
     delete disp;
     return nullptr;
 }

diff --git a/mythtv/libs/libmythui/mythxdisplay.h b/mythtv/libs/libmythui/mythxdisplay.h
@@ -71,7 +71,7 @@ class MythXLocker
 
 MUI_PUBLIC void          LockMythXDisplays(bool lock);
 MUI_PUBLIC MythXDisplay *GetMythXDisplay(Display*);
-MUI_PUBLIC MythXDisplay *OpenMythXDisplay(void);
+MUI_PUBLIC MythXDisplay *OpenMythXDisplay(bool Warn = true);
 #define XLOCK(dpy, arg) { dpy->Lock(); arg; dpy->Unlock(); }
 #endif // USING_X11