[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-2/kmplayer/src
From:       Koos Vriezen <koos.vriezen () xs4all ! nl>
Date:       2003-12-21 22:03:54
[Download RAW message or body]

CVS commit by vriezen: 

Finally got rid of ugly left/right borders with Xine, simply make pixel_aspect = 1.0,
so much for using http://xinehq.de/index.php/hackersguide#AEN78 example code
(did remind me adding a gpl licence)


  M +3 -3      kmplayerview.cpp   1.48
  M +24 -6     xineplayer.cpp   1.24


--- kdeextragear-2/kmplayer/src/kmplayerview.cpp  #1.47:1.48
@@ -765,6 +765,6 @@ void KMPlayerViewer::showEvent (QShowEve
     XConfigureEvent c = {
         ConfigureNotify, 0UL, True,
-        qt_xdisplay (), winId (), parent->winId (),
-        0, 0, parent->width (), parent->height (),
+        qt_xdisplay (), winId (), parentWidget ()->winId (),
+        x (), y (), width (), height (),
         0, None, False
     };
@@ -777,5 +777,5 @@ void KMPlayerViewer::resizeEvent (QResiz
         ConfigureNotify, 0UL, True,
         qt_xdisplay (), winId (), parentWidget ()->winId (),
-        0, 0, width (), height (),
+        x (), y (), width (), height (),
         0, None, False
     };

--- kdeextragear-2/kmplayer/src/xineplayer.cpp  #1.23:1.24
@@ -1,2 +1,21 @@
+/* This file is part of the KMPlayer application
+   Copyright (C) 2003 Koos Vriezen <koos.vriezen@xs4all.nl>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
 #include <stdio.h>
 #include <string.h>
@@ -42,5 +61,4 @@ public:
          brightness (0), contrast (0), hue (0), saturation (0), volume (0) {
     }
-    double res_h, res_v;
     char * vo_driver;
     char * ao_driver;
@@ -302,8 +320,8 @@ void KXinePlayer::init () {
         fprintf (stderr, "map %lu\n", wid);
         XMapRaised(display, wid);
-    }
-    d->res_h = 1.0 * DisplayWidth(display, screen) / DisplayWidthMM(display, screen);
-    d->res_v = 1.0 * DisplayHeight(display, screen) / DisplayHeightMM(display, screen);
     XSync(display, False);
+    }
+    //double d->res_h = 1.0 * DisplayWidth(display, screen) / DisplayWidthMM(display, screen);
+    //double d->res_v = 1.0 * DisplayHeight(display, screen) / DisplayHeightMM(display, screen);
     XUnlockDisplay(display);
     vis.display           = display;
@@ -313,7 +331,7 @@ void KXinePlayer::init () {
     vis.frame_output_cb   = frame_output_cb;
     vis.user_data         = NULL;
-    pixel_aspect          = d->res_v / d->res_h;
+    //pixel_aspect          = d->res_v / d->res_h;
 
-    if(fabs(pixel_aspect - 1.0) < 0.01)
+    //if(fabs(pixel_aspect - 1.0) < 0.01)
         pixel_aspect = 1.0;
 


[prev in list] [next in list] [prev in thread] [next in thread]