Ticket #1068: NuppelVideoRecorder.v4l2.only.diff

NuppelVideoRecorder.cpp

@@ -927 +927 @@
     }
 
     usingv4l2 = true;
+    if (getenv("NO_V4L2"))
+    {
+        VERBOSE(VB_IMPORTANT, "NVR: Not using V4L2 (NO_V4L2 is set)");
+        usingv4l2 = false;
+        channelfd = fd;
+        return true;
+    }
+
 
     struct v4l2_capability vcap;
     memset(&vcap, 0, sizeof(vcap));
@@ -955 +963 @@
             correct_bttv = true;
 
         QString driver = (char *)vcap.driver;
-        if (driver == "cx8800" || driver == "go7007")
-        {
-            channelfd = open(videodevice.ascii(), O_RDWR);
-            if (channelfd < 0)
-            {
-                VERBOSE(VB_IMPORTANT, QString("NVR: Can't open video device: %1").arg(videodevice));
-                perror("open video:");
-                KillChildren();
-                return false;
-            }
-
-            if (driver == "go7007")
-            {
-                go7007 = true;
-            }
-            
-            inpixfmt = FMT_NONE;
-            InitFilters();
-            DoV4L2();
+        //if (driver == "cx8800" || driver == "go7007")
+        channelfd = open(videodevice.ascii(), O_RDWR);
+        if (channelfd < 0)
+        {
+            VERBOSE(VB_IMPORTANT, QString("NVR: Can't open video device: %1").arg(videodevice));
+            perror("open video:");
+            KillChildren();
             return false;
         }
+
+        if (driver == "go7007")
+            go7007 = true;
+            
+        inpixfmt = FMT_NONE;
+        InitFilters();
+        DoV4L2();
+        return false;
     }
 
     channelfd = fd;