Index: trunk/MagicSoft/Cosy/videodev/Camera.cc
===================================================================
--- trunk/MagicSoft/Cosy/videodev/Camera.cc	(revision 808)
+++ trunk/MagicSoft/Cosy/videodev/Camera.cc	(revision 910)
@@ -187,7 +187,6 @@
 
 
-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,5 +246,5 @@
             if (!StartGrab(i&1))
                 break;
-            Execute(i, (byte*)fImg, &fTime);
+            ProcessFrame(i, (byte*)fImg, &fTime);
             i++;
         }
@@ -254,10 +253,10 @@
         {
             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++;
 
Index: trunk/MagicSoft/Cosy/videodev/Camera.h
===================================================================
--- trunk/MagicSoft/Cosy/videodev/Camera.h	(revision 808)
+++ trunk/MagicSoft/Cosy/videodev/Camera.h	(revision 910)
@@ -86,6 +86,6 @@
     // 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);
 
     //
Index: trunk/MagicSoft/Cosy/videodev/Writer.cc
===================================================================
--- trunk/MagicSoft/Cosy/videodev/Writer.cc	(revision 808)
+++ trunk/MagicSoft/Cosy/videodev/Writer.cc	(revision 910)
@@ -7,5 +7,5 @@
 #include <png.h>
 
-#include "timer.h"
+#include "base/timer.h"
 
 void Writer::Png(const char *fname, const byte *buf,
@@ -80,6 +80,6 @@
         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);