Changeset 8856 for trunk/MagicSoft/Cosy/videodev

Timestamp:

02/05/08 11:41:55 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/videodev

Files:

• Camera.cc (modified) (1 diff)
• MVideo.cc (modified) (6 diffs)

trunk/MagicSoft/Cosy/videodev/Camera.cc

@@ -102 +102 @@
     if (!fVideo->IsOpen())
     {
-        gLog << "ERROR - Process: Device not open." << endl;
+        gLog << err << "Camera::Thread: ERROR - Device not open." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Cosy/videodev/MVideo.cc

@@ -104 +104 @@
                 return -4;
 
-            gLog << err << "ERROR - MVideo::Ioctl -ioctl returned rc=" << rc << " '";
-            gLog << strerror(errno) << "' (errno = " << errno << ")" << endl;
+            gLog << err << "ERROR - MVideo::Ioctl 0x" << hex << req << ": errno=" << dec << errno << " - ";
+            gLog << strerror(errno) << " (rc=" << rc << ")" << endl;
             usleep(10);
             continue;
         }
 
-        gLog << err << "ERROR - MVideo::Ioctl " << hex << req << ": errno=" << dec << errno << " - ";
+        gLog << err << "ERROR - MVideo::Ioctl 0x" << hex << req << ": errno=" << dec << errno << " - ";
         gLog << strerror(errno) << " (rc=" << rc << ")" << endl;
         return rc;
@@ -161 +161 @@
     }
 
-    gLog << all << "Opening " << fPath << "..." << flush;
+    gLog << all << "Opening " << fPath << "... " << flush;
     do
     {
@@ -171 +171 @@
     if (fFileDesc == -1)
     {
-        gLog << err << "ERROR!" << endl;
+        gLog << err << "ERROR: " << strerror(errno) << endl;
         return kFALSE;
     }
@@ -263 +263 @@
         fCaps.maxheight, fCaps.maxwidth, // height, width
         VIDEO_PALETTE_RGB24              // palette
+        //768, 576, 
+        //VIDEO_PALETTE_RGB555             // palette
     };
 
@@ -271 +273 @@
         return kTRUE;
 
-    if (errno == EAGAIN)
+//    if (errno == EAGAIN)
         gLog << err << "ERROR - Couldn't start capturing frame " << frame << " - unable to sync." << endl;
 
@@ -341 +343 @@
 
     memcpy(&fChannel, &ch, sizeof(fChannel));
+
+    gLog << all << "Switched to channel " << chan << endl;
 
     return kTRUE;