Changeset 910 for trunk/MagicSoft/Cosy/videodev

Timestamp:

08/15/01 12:52:38 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/videodev

Files:

• Camera.cc (modified) (3 diffs)
• Camera.h (modified) (1 diff)
• Writer.cc (modified) (2 diffs)

trunk/MagicSoft/Cosy/videodev/Camera.cc

@@ -187 +187 @@
 
 
-void Camera::Execute(const unsigned long n,
-                     byte *img,
-                     struct timeval *tm)
+void Camera::ProcessFrame(const unsigned long n, byte *img,
+                          struct timeval *tm)
 {
     cout << "Img: " << n << "  " << (void*)img << endl;
@@ -247 +246 @@
             if (!StartGrab(i&1))
                 break;
-            Execute(i, (byte*)fImg, &fTime);
+            ProcessFrame(i, (byte*)fImg, &fTime);
             i++;
         }
@@ -254 +253 @@
         {
             LoopStep(i);
-            Execute(i, (byte*)fImg, &fTime);
+            ProcessFrame(i, (byte*)fImg, &fTime);
             i++;
         }
 
         LoopStep(i);
-        Execute(i, (byte*)fImg, &fTime);
+        ProcessFrame(i, (byte*)fImg, &fTime);
         i++;
 

trunk/MagicSoft/Cosy/videodev/Camera.h

@@ -86 +86 @@
     // Execution of one frame - this function may be overloaded!
     //
-    virtual void Execute(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/Writer.cc

@@ -7 +7 @@
 #include <png.h>
 
-#include "timer.h"
+#include "base/timer.h"
 
 void Writer::Png(const char *fname, const byte *buf,
@@ -80 +80 @@
         char text[36];
 
-        Timer time(date);
-        sprintf(text, "*** %s ***", time.GetTimeStr());
+        Timer timet(date);
+        sprintf(text, "*** %s ***", timet.GetTimeStr());
         png_write_chunk(fPng, (png_byte*)"UTC", (png_byte*)text, strlen(text));
         sprintf(text,"*** %s %s %.1f %i ***", tzname[0], tzname[1], 1.0/3600*timezone, daylight);