[xiph-cvs] cvs commit: snatch Snatch x11.c

[Monty]

xiphmont    01/11/13 21:56:25

  Modified:    .        Snatch x11.c
  Log:
  Snatch overthought the recording restarts

Revision  Changes    Path
1.3       +1 -9      snatch/Snatch

Index: Snatch
===================================================================
RCS file: /usr/local/cvsroot/snatch/Snatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Snatch	2001/11/14 04:12:52	1.2
+++ Snatch	2001/11/14 05:56:24	1.3
@@ -15,7 +15,7 @@
     exit 1;
 }
 
-$version="Snatch 20011113";
+$version="Snatch 20011114";
 $configdir=$HOME."/.snatch";
 $configfile=$configdir."/config.txt";
 $historyfile=$configdir."/history.txt";
@@ -561,7 +561,6 @@
 
 sub Robot_Stop{
     $last_timer_event=time();
-    $recording_restart=0;
     my $stopcode=join "",("Ks",pack ("S",4));
     syswrite COMM_SOCK,$stopcode;
 }
@@ -573,7 +572,6 @@
 }
 
 sub Robot_Active{
-    $recording_restart=0;
     $last_timer_event=0;
     $next_timer_event=0;
     if(defined($timer_callback) && !recording_active){
@@ -596,7 +594,6 @@
 }
 
 sub Robot_Inactive{
-    $recording_restart=0;
     $last_timer_event=0;
     $next_timer_event=0;
     if(defined($timer_callback)){
@@ -638,7 +635,6 @@
        $password,$outfile,$url)=SplitTimerEntry($line);
 
     $recording_pending=1;
-    $recording_restart=1;
     $last_timer_event=$start;
     $next_timer_event=$start+$duration-1; # the -1 is important; makes sure contiguous
                                           # but nonoverlapping events don't interfere
@@ -1078,10 +1074,6 @@
         if($line=~/Capture stopped/){
             $recording_active=0;
             $recording_pending=0;
-
-	    if($recording_restart){
-		SetupTimerDispatch();
-	    }
         }
 
         if($line=~/Capturing/){

1.22      +2 -2      snatch/x11.c

Index: x11.c
===================================================================
RCS file: /usr/local/cvsroot/snatch/x11.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- x11.c	2001/11/14 04:12:52	1.21
+++ x11.c	2001/11/14 05:56:25	1.22
@@ -521,7 +521,7 @@
     videocount++;
 
     pthread_mutex_lock(&output_mutex);
-    if(videocount>5 && outfile_fd<0)OpenOutputFile();
+    if(outfile_fd<0)OpenOutputFile();
     pthread_mutex_unlock(&output_mutex);
     /* only do 24 bit zPixmaps for now */
 
@@ -754,7 +754,7 @@
     videocount++;
 
     pthread_mutex_lock(&output_mutex);
-    if(videocount>5 && outfile_fd<0)OpenOutputFile();
+    if(outfile_fd<0)OpenOutputFile();
     pthread_mutex_unlock(&output_mutex);
 
     /* only do 24 bit zPixmaps for now */

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.