Ticket #1911: xrandr.diff

mythtv/libs/libmythtv/videoout_xv.cpp

@@ -426 +426 @@
         display_dim.setWidth((int) round(300 * pixel_aspect));
     }
 
-    // If we are using XRandR, use the aspect ratio from it instead...
-    if (display_res)
-        display_aspect = display_res->GetAspectRatio();
-
     // If we are using Xinerama the display dimensions can not be trusted.
     // We need to use the Xinerama monitor aspect ratio from the DB to set
     // the physical screen width. This assumes the height is correct, which
@@ -458 +454 @@
     // Now that we know the physical monitor size, we can
     // calculate the display aspect ratio pretty simply...
     display_aspect = ((float)display_dim.width()) / display_dim.height();
-
+    // If we are using XRandR, use the aspect ratio from it instead...
+    if (display_res)
+        display_aspect = display_res->GetAspectRatio();
     VERBOSE(VB_PLAYBACK, LOC +
             QString("Estimated window dimensions: %1x%2 mm  Aspect: %3")
             .arg(display_dim.width()).arg(display_dim.height())

mythtv/libs/libmyth/DisplayResScreen.h

@@ -26 +26 @@
     // Gets
     int Width() const { return width; }
     int Height() const { return height; }
-    int Width_mm() const { return width; }
-    int Height_mm() const { return height; }
+    int Width_mm() const { return width_mm; }
+    int Height_mm() const { return height_mm; }
     inline double AspectRatio() const;
     inline short RefreshRate() const;
     const vector<short>& RefreshRates() const { return refreshRates; }

mythtv/libs/libmyth/DisplayResScreen.cpp

@@ -52 +52 @@
     if (a>0.0)
         aspect = a;
     else if (Height())
-        aspect = ((double)(Width())) / ((double)(Height()));
+        aspect = ((double)(Width_mm())) / ((double)(Height_mm()));
 }
 
 QString DisplayResScreen::toString() const