Changeset 7787 for trunk/MagicSoft/Cosy/videodev

Timestamp:

07/11/06 20:45:10 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/videodev

Files:

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

trunk/MagicSoft/Cosy/videodev/Camera.cc

@@ -17 +17 @@
 inline int Camera::Ioctl(int req, void *opt, const char *str)
 {
+    if (fd<0)
+    {
+        cout << "Error! Called Ioctl with invalid filedescriptor." << endl;
+        return -1;
+    }
+
     while (1)
     {
@@ -181 +187 @@
 //        cout << "Camera::Camera - mutex is already locked by this thread" << endl;
     pthread_create(&fThread, NULL, MapThread, this);
-    cout << "done." << endl;
+    cout << "CameraInitialized..." << endl;
 
 }
@@ -216 +222 @@
 void Camera::ExitLoop()
 {
-    //    cout << "ExitLoop..." << endl;
     fStop = 1;
     while (IsRunning())
         usleep(1);
-    //    cout << "Loop exited." << endl;
 }
 
@@ -261 +265 @@
     while (1)
     {
-        //cout << "Wait..." << flush;
-        fCond.Wait();
-        //cout << "done." << endl;
+        fCond.Wait();;
         if (fd==-1)
             break;
@@ -319 +321 @@
     }
 
-    cout << "Loop..." << endl;
     ExitLoop();
 
@@ -329 +330 @@
     //
     fCond.Broadcast();
+
+    // I don't know what the reason for this line is, but it
+    // seems to solve some starnge crashes when switching
+    // between the two cameras and it ensures that cosy works
+    // with root 4.04/02g
+    fMutex->UnLock();
 }
 

trunk/MagicSoft/Cosy/videodev/Makefile

@@ -20 +20 @@
 # @endcode 
 
-INCLUDES = -I. -I.. -I../incl -I../base -I../caos -I/usr/X11R6/include
+INCLUDES = -I. -I.. -I../incl -I../base -I../caos -I/usr/X11R6/include -I../mars
 
 # @code