{{{{{{
Index: mythtv/programs/mythfrontend/playbackbox.cpp
===================================================================
--- mythtv/programs/mythfrontend/playbackbox.cpp        (revision 16377)
+++ mythtv/programs/mythfrontend/playbackbox.cpp        (working copy)
@@ -32,6 +32,8 @@
 #include "oldsettings.h"
 #include "NuppelVideoPlayer.h"

+#include "util.h"
+#include "util-x11.h"
 #include "exitcodes.h"
 #include "mythcontext.h"
 #include "mythdbcon.h"
@@ -4625,6 +4627,12 @@

     float boundsaspect  = 4.0f / 3.0f;
     float imageaspect   = 4.0f / 3.0f;
+    float pixelaspect   = MythGetPixelAspectRatio();
+
+    if (GetNumberOfXineramaScreens() > 1)
+        pixelaspect = gContext->GetFloatSettingOnHost(
+            "XineramaMonitorAspectRatio", gContext->GetHostName(), 1.0);
+
     QSize previewSize   = bounds;

     if ((bounds.width() > 0) && (bounds.height() > 0))
@@ -4633,6 +4641,8 @@
     if ((imageSize.width() > 0) && (imageSize.height() > 0))
         imageaspect = ((float)imageSize.width()) / ((float)imageSize.height());

+    boundsaspect = boundsaspect * pixelaspect;
+
     // Calculate new height or width according to relative aspect ratio
     if ((int)((boundsaspect + 0.05f) * 10) >
         (int)((imageaspect  + 0.05f) * 10))

}}}}}}

playbackbox.cpp: In member function 'virtual void PlaybackBox::customEvent(QCustomEvent*)':
playbackbox.cpp:4416: error: expected unqualified-id before numeric constant
playbackbox.cpp:4421: error: expected unqualified-id before numeric constant