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

List:       kde-commits
Subject:    KDE/kdelibs/solid/solid/backends/hal
From:       Alex Fiestas <alex () eyeos ! org>
Date:       2009-08-04 15:37:38
Message-ID: 1249400258.986073.13504.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1006837 by afiestas:

Now video4linux driver is always added to be able to distinguish between v4l1 and \
v4l2 devices without breaking the old behaviour (< KDE 4.3)


 M  +3 -2      halvideo.cpp  


--- trunk/KDE/kdelibs/solid/solid/backends/hal/halvideo.cpp #1006836:1006837
@@ -44,10 +44,11 @@
 {
     QStringList drivers;
     if ( protocol == "video4linux" ) {
+        drivers << QString( "video4linux" ); //Retrocompatibility with KDE < 4.3
         if ( m_device->property("video4linux.version") == "2" ) {
             drivers << QString( "video4linux2" );
         } else {
-            drivers << QString( "video4linux" );
+            drivers << QString( "video4linux1" );
         }
     }
     return drivers;
@@ -55,7 +56,7 @@
 
 QVariant Solid::Backends::Hal::Video::driverHandle(const QString &driver) const
 {
-    if ( driver=="video4linux" || driver=="video4linux2" ) {
+    if ( driver=="video4linux" || driver=="video4linux1" || driver=="video4linux2" ) \
{  return m_device->property("video4linux.device");
     }
     // TODO: Fill in the blank for other drivers


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