Changeset 8862 for trunk/MagicSoft/Cosy/videodev

Timestamp:

02/13/08 19:44:39 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/videodev

Files:

• MVideo.cc (modified) (5 diffs)
• MVideo.h (modified) (1 diff)

trunk/MagicSoft/Cosy/videodev/MVideo.cc

@@ -101 +101 @@
 // Mapper around ioctl for easier access to the device
 //
-int MVideo::Ioctl(int req, void *opt, bool allowirq) const
+int MVideo::Ioctl(int req, void *opt, bool allowirq, bool force) const
 {
     if (fFileDesc<0)
@@ -129 +129 @@
         }
 
-        gLog << err << "ERROR - MVideo::Ioctl 0x" << hex << req << ": errno=" << dec << errno << " - ";
-        gLog << strerror(errno) << " (rc=" << rc << ")" << endl;
+        if (!force)
+        {
+            gLog << err << "ERROR - MVideo::Ioctl 0x" << hex << req << ": errno=" << dec << errno << " - ";
+            gLog << strerror(errno) << " (rc=" << rc << ")" << endl;
+        }
         return rc;
     }
@@ -186 +189 @@
     while (1)
     {
-        if (Ioctl (VIDIOC_QUERYCTRL, &qctrl)==-1)
+        if (Ioctl(VIDIOC_QUERYCTRL, &qctrl, true, true)==-1)
             break;
 
@@ -769 +772 @@
 void MVideo::Print() const
 {
-    gLog << all;
+    gLog << all << dec;
 
     gLog << "Device " << fPath << " " << (IsOpen()?"open":"closed") << "." << endl;
@@ -818 +821 @@
     gLog  << dec << endl;
 
-    gLog << "Controls:" << endl;
+    gLog << inf2 << "Controls:" << endl;
     fControls.Print();
 }

trunk/MagicSoft/Cosy/videodev/MVideo.h

@@ -62 +62 @@
 
 private:
-    int Ioctl(int req, void *opt, bool allowirq=true) const;
+    int Ioctl(int req, void *opt, bool allowirq=true, bool force=false) const;
 
     void Reset();