Ticket #6548: x11_refresh_connection.diff

libs/libmythtv/videoout_xv.cpp

@@ -356 +356 @@
     if (!XJ_started)
         return -1;
 
-    return MythXGetRefreshRate(XJ_disp, XJ_screen_num);
+    return MythXGetRefreshRate();
 }
 
 void VideoOutputXv::ResizeForVideo(void) 

libs/libmythui/util-x11.cpp

@@ -237 +237 @@
     return pixelAspect;
 }
 
-int MythXGetRefreshRate(Display *display, int screen)
+int MythXGetRefreshRate(Display *d, int screen)
 {
+    Display *display = d;
     if (!display)
+        display = MythXOpenDisplay();
+    if (!display)
+    {
+        VERBOSE(VB_IMPORTANT, "MythXGetRefreshRate: "
+                "MythXOpenDisplay call failed");
         return -1;
+    }
 
+    X11L;
+    int scr = screen;
+    if (scr < 0)
+        scr = DefaultScreen(display);
+    X11U;
+
     XF86VidModeModeLine mode_line;
     int dot_clock;
 
     int ret = False;
-    X11S(ret = XF86VidModeGetModeLine(display, screen,
+    X11S(ret = XF86VidModeGetModeLine(display, scr,
                                       &dot_clock, &mode_line));
     if (!ret)
     {

libs/libmythui/util-x11.h

@@ -19 +19 @@
 MPUBLIC QSize  MythXGetDisplaySize(      Display *d = NULL, int screen = -1);
 MPUBLIC QSize  MythXGetDisplayDimensions(Display *d = NULL, int screen = -1);
 MPUBLIC double MythXGetPixelAspectRatio( Display *d = NULL, int screen = -1);
-MPUBLIC int    MythXGetRefreshRate(      Display *display,  int screen);
+MPUBLIC int    MythXGetRefreshRate(      Display *d = NULL, int screen = -1);
 #endif // USING_X11
 
 MPUBLIC int GetNumberOfXineramaScreens();