Remove some broken windows stuff

fairclothjm · Feb 17, 2020 · a8e4a30 · a8e4a30
1 parent 6a30ca8
commit a8e4a30
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 57 deletions.
diff --git a/src/config.c b/src/config.c
@@ -8,11 +8,6 @@
 #include <ctype.h>		// to declare isupper(), tolower() 
 #include <stdlib.h>
 #include <string.h>
-#ifdef _WIN32
-#else
-    #include <dirent.h>
-    #include <unistd.h>
-#endif
 
 #include "imgcomp.h"
 #include "config.h"

diff --git a/src/main.c b/src/main.c
@@ -12,19 +12,8 @@
 #include <string.h>
 #include <time.h>
 #include <math.h>
-#ifdef _WIN32
-    #include "readdir.h"
-    #define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-    #define strdup(a) _strdup(a) 
-    extern void sleep(int);
-    extern void usleep(int);    
-    #define unlink(n) _unlink(n)
-    #define PATH_MAX _MAX_PATH
-#else
-    #include <dirent.h>
-    #include <unistd.h>
-    #include <errno.h>
-#endif
+#include <unistd.h>
+#include <errno.h>
 
 #include "imgcomp.h"
 #include "config.h"
@@ -89,8 +78,6 @@ static time_t NextTimelapsePix;
 static LastPic_t BaselinePic;
 
 time_t LastPic_mtime;
-struct timespec LastPic_mtime_ns;
-
 
 //-----------------------------------------------------------------------------------
 // Convert picture coordinates from 120 degree fishey lens
@@ -218,6 +205,7 @@ static int ProcessImage(LastPic_t * New, int DeleteProcessed)
 
 
         if (Trig.DiffLevel > Sensitivity && UdpDest[0]){
+            // For my cap shooter experiment.  Not useful for anything else.
             char showx[1001];
             int xs, a;
             const int colwidth=120;
@@ -236,9 +224,7 @@ static int ProcessImage(LastPic_t * New, int DeleteProcessed)
 
 			GeometryConvert(&Trig);
 
-            #ifndef _WIN32
-                if (UdpDest[0]) SendUDP(Trig.x, Trig.y, Trig.DiffLevel, Trig.Motion);
-            #endif
+            if (UdpDest[0]) SendUDP(Trig.x, Trig.y, Trig.DiffLevel, Trig.Motion);
         }
 
         Raspistill_restarted = 0;
@@ -266,7 +252,6 @@ static int ProcessImage(LastPic_t * New, int DeleteProcessed)
     }
 
     if (DeleteProcessed){
-        //printf("Delete %s\n",LastPics[2].Name);
         unlink(LastPics[2].Name);
     }
     return LastPics[0].IsMotion;
@@ -347,7 +332,6 @@ static int DoDirectoryFunc(char * Directory, int DeleteProcessed)
                 exit(1);
             }
             NewPic.mtime = (unsigned)statbuf.st_mtime;
-            LastPic_mtime_ns = statbuf.st_mtim;
         }
         LastPic_mtime = NewPic.mtime;
 
@@ -361,10 +345,6 @@ static int DoDirectoryFunc(char * Directory, int DeleteProcessed)
 
 	SinceMotionMs += MsPerCycle;
 
-    //if (SawMotion){
-    //    run_blink_program();
-    //}
-
     return SawMotion;
 }
 
@@ -599,9 +579,7 @@ int main(int argc, char **argv)
         LogFileMaintain(0);
     }
 
-    #ifndef _WIN32
     if (UdpDest[0]) InitUDP(UdpDest);
-    #endif
 
     // Adjust region of interest to scale.
     ScaleRegion(&Regions.DetectReg, ScaleDenom);
@@ -684,8 +662,3 @@ int main(int argc, char **argv)
     return 0;
 }
 
-// Features to consider adding:
-//--------------------------------------------------------
-// Polling same file mode (for use with  uvccapture)
-// Dynamic thresholding if too much is happening?
-
diff --git a/src/start_raspistill.c b/src/start_raspistill.c
@@ -10,15 +10,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-
-#ifdef _WIN32
-    typedef int pid_t;
-    #define execvp(a,b)
-    #define fork() 1
-#else
-    #include <unistd.h>
-    #include <sys/wait.h>
-#endif
+#include <unistd.h>
+#include <sys/wait.h>
 
 #include "imgcomp.h"
 #include "jhead.h"
@@ -72,9 +65,6 @@ static void do_launch_program(char * cmd_string)
 // Parse command line and launch.
 //-----------------------------------------------------------------------------------
 static int launch_raspistill(void)
-#ifdef _WIN32
-{ return 0; }
-#else
 {
     pid_t pid;
     int ignore;
@@ -112,8 +102,6 @@ static int launch_raspistill(void)
     }
     return 0;
 }
-#endif
-
 
 //-----------------------------------------------------------------------------------
 // Parse command line and launch.
@@ -225,9 +213,7 @@ int manage_raspistill(int NewImages)
         // trigger signals.  In this mode, it does running exposure adjustments, but
         // only takes pictures when it receives a signal.
         fprintf(Log,"send signal to raspistill (pid=%d)\n",raspistill_pid);
-        #ifndef _WIN32
         kill(raspistill_pid, SIGUSR1);
-        #endif
     }
     return 0;
 

diff --git a/src/timer_stepper.c b/src/timer_stepper.c
@@ -581,8 +581,3 @@ void ReadTimer(void)
         printf(" l=%d\n",longest);
     }
 }
-
-// Notes:
-// Calling CheckUdp adds about 650 microseconds!
-// Calling uSleep adds 60 microseconds + specified time.
-