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

List:       kde-commits
Subject:    extragear/multimedia/kdetv
From:       Dirk Ziegelmeier <dziegel () gmx ! de>
Date:       2005-05-15 10:09:28
Message-ID: 1116151768.767122.9560.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 414097 by dziegel:

Do XGrabPort() before using XvPutImage(). This fixes problems with video
display if kdetv is started after other XV applications.


 M  +17 -0     trunk/extragear/multimedia/kdetv/ChangeLog  
 M  +9 -5      trunk/extragear/multimedia/kdetv/kvideoio/kxv.cpp  


--- trunk/extragear/multimedia/kdetv/ChangeLog #414096:414097
@@ -1,3 +1,20 @@
+2005-05-14 09:21  dziegel
+
+	* : Give some dirs a saner name (I like svn)
+
+2005-05-14 09:16  dziegel
+
+	* : Teletext plugin: Implement "Reveal hidden teletext"
+
+2005-05-13 17:44  dziegel
+
+	* : - Add snapshots to KDELIRC profile - Adapt Makefile to svn2dist
+	  - bump up version
+
+2005-05-13 03:26  scripty
+
+	* : CVS_SILENT made messages (.desktop file)
+
 2005-05-06 14:24  dziegel
 
 	* : - Make kdetv unsermake-compatible again - Update changelog - Add
--- trunk/extragear/multimedia/kdetv/kvideoio/kxv.cpp #414096:414097
@@ -292,11 +292,6 @@
         xv_gc = XCreateGC(qt_xdisplay(), w, 0, NULL);
     }
     
-    if (XvGrabPort(qt_xdisplay(), xv_port, CurrentTime)) {
-        kdWarning() << "KXvDevice::startVideo: Unable to grab Xv port." << endl;
-        return -2;
-    }
-    
     if (-1 != xv_encoding) {
         sw = ((XvEncodingInfo *)xv_encoding_info)[xv_encoding].width;
         sh = ((XvEncodingInfo *)xv_encoding_info)[xv_encoding].height;
@@ -388,6 +383,9 @@
 #endif
     if (xv_gc)
         XFreeGC(qt_xdisplay(), xv_gc);
+
+    if (xv_port != -1)
+        XvUngrabPort(qt_xdisplay(), xv_port, CurrentTime);
 }
 
 
@@ -397,6 +395,12 @@
     return false;
 #else
     assert(xv_port != -1);   // make sure we were prepped by KXv already.
+
+    if (XvGrabPort(qt_xdisplay(), xv_port, CurrentTime)) {
+        kdWarning() << "KXvDevice::init(): Unable to grab Xv port." << endl;
+        return false;
+    }
+
     if (Success != XvQueryEncodings(qt_xdisplay(),
                                     xv_port,
                                     &xv_encodings,
[prev in list] [next in list] [prev in thread] [next in thread]