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

List:       kde-commits
Subject:    branches/work/avkode/avkode
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2006-08-24 14:13:33
Message-ID: 1156428813.492163.18080.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 576655 by carewolf:

Don't inhibit paint updates in the rest of the window


 M  +11 -9     xv_sink.cpp  


--- branches/work/avkode/avkode/xv_sink.cpp #576654:576655
@@ -133,8 +133,8 @@
 //     XSetErrorHandler(dummy);
 
     d->gc=XCreateGC(d->display,d->window,0,NULL);
-//     XMapWindow(d->display,d->window);
-    XMapRaised(d->display,d->window);
+    XMapWindow(d->display,d->window);
+//     XMapRaised(d->display,d->window);
 
     if (!checkXv()) {
         std::cout << "Xv failed\n";
@@ -256,7 +256,7 @@
 {
     if (d->vframe.isEmpty()) return;
 
-    QPainter p(this);
+//     QPainter p;
     d->mutex.lock();
 
     QSize image_size = QSize(d->vframe.width, d->vframe.height);
@@ -269,7 +269,7 @@
                              (int)(d->vframe.aspect_ratio.height * ratio));
     // resize to widget
     frame_size.scale(size(), Qt::KeepAspectRatio);
-
+//     p.begin(this);
     d->xv_image = XvCreateImage(d->display, d->xv_port,
                                 avformat2xv(d->vframe.color_format), (char*)d->vframe.data,
                                 d->vframe.width, d->vframe.height);
@@ -285,16 +285,18 @@
                 0, 0, image_size.width(), image_size.height(),
                 0, 0, frame_size.width(), frame_size.height());
 
-    XSync(d->display, True);
-
-    XFree(d->xv_image);
-    d->xv_image = 0;
-
+/*
     QFont font("Arial", 16);
     p.setPen(Qt::white);
     p.setFont(font);
     p.drawText(QPoint(20,20), QString("Delay: ")+QString::number(latency())+"ms");
+*/
+//     p.end();
+    XSync(d->display, False);
 
+    XFree(d->xv_image);
+    d->xv_image = 0;
+
     // ### does drawImage block 'till the image is on the X11 server?
     // if not we need to add X11 latency for network transparency
     if (d->vframe.sts > 0) {
[prev in list] [next in list] [prev in thread] [next in thread]