Changeset 1802 for trunk/MagicSoft/Cosy/videodev

Timestamp:

03/02/03 16:55:47 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/videodev

Files:

• Camera.cc (modified) (4 diffs)
• Camera.h (modified) (4 diffs)
• CaosFilter.cc (added)
• Makefile (modified) (2 diffs)
• PixClient.cc (added)
• PixClient.h (added)
• VideodevLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Cosy/videodev/Camera.cc

@@ -102 +102 @@
 }
 
-Camera::Camera() : fd(-1), iBufferSize(0)
+Camera::Camera(PixClient &client) : fd(-1), iBufferSize(0), fClient(client)
 {
     cout << "Starting thread..." << flush;
@@ -192 +192 @@
 
 
-void Camera::ProcessFrame(const unsigned long n, byte *img,
-                          struct timeval *tm)
-{
-    cout << "Img: " << n << "  " << (void*)img << endl;
-}
-
 void *Camera::MapThread(void *arg)
 {
@@ -251 +245 @@
                 break;
 
-            ProcessFrame(i, (byte*)fImg, &fTime);
+            fClient.ProcessFrame(i, (byte*)fImg, &fTime);
             i++;
         }
@@ -258 +252 @@
         {
             LoopStep(i);
-            ProcessFrame(i, (byte*)fImg, &fTime);
+            fClient.ProcessFrame(i, (byte*)fImg, &fTime);
             i++;
         }
 
         LoopStep(i);
-        ProcessFrame(i, (byte*)fImg, &fTime);
+        fClient.ProcessFrame(i, (byte*)fImg, &fTime);
         i++;
 

trunk/MagicSoft/Cosy/videodev/Camera.h

@@ -14 +14 @@
 #endif
 
-
-typedef unsigned char byte;
+#include "PixClient.h"
 
 class Camera
@@ -51 +50 @@
     pthread_cond_t  fCond;
 
+    PixClient &fClient;
+
     //
     // Hardware dependant functions
@@ -74 +75 @@
 
 public:
-    Camera();
+    Camera(PixClient &client);
     virtual ~Camera();
 
@@ -96 +97 @@
     // Execution of one frame - this function may be overloaded!
     //
-    virtual void ProcessFrame(const unsigned long n,
-                              byte *img, struct timeval *tm);
+    //virtual void ProcessFrame(const unsigned long n,
+    //                          byte *img, struct timeval *tm);
 
     //

trunk/MagicSoft/Cosy/videodev/Makefile

@@ -20 +20 @@
 # @endcode 
 
-INCLUDES = -I. -I.. -I../incl -I../base -I/usr/X11R6/include
+INCLUDES = -I. -I.. -I../incl -I../base -I../caos -I/usr/X11R6/include
 
 # @code 
@@ -32 +32 @@
 
 SRCFILES = Camera.cc \
+           PngReader.cc \
+           PixClient.cc \
            Filter.cc \
            Filter2.cc \
+           CaosFilter.cc \
            Writer.cc 
 

trunk/MagicSoft/Cosy/videodev/VideodevLinkDef.h

@@ -8 +8 @@
 #pragma link C++ class Filter+;
 #pragma link C++ class Filter2+;
+#pragma link C++ class CaosFilter+;
 
 #pragma link C++ class Camera+;
+#pragma link C++ class PngReader+;
 
 #endif