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

Monty xiphmont at xiph.org
Sun Nov 25 21:45:04 PST 2001



xiphmont    01/11/25 21:45:03

  Modified:    .        Snatch libsnatch.c
  Log:
  Bugfix to capture restart

Revision  Changes    Path
1.6       +3 -3      snatch/Snatch

Index: Snatch
===================================================================
RCS file: /usr/local/cvsroot/snatch/Snatch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Snatch	2001/11/16 04:19:14	1.5
+++ Snatch	2001/11/26 05:45:02	1.6
@@ -15,7 +15,7 @@
     exit 1;
 }
 
-$version="Snatch 20011116";
+$version="Snatch 20011125";
 $configdir=$HOME."/.snatch";
 $configfile=$configdir."/config.txt";
 $historyfile=$configdir."/history.txt";
@@ -339,10 +339,10 @@
         $pattern=~s/^(\s+).*//;
         $pattern=~s/(\s+)$//;
         
-	my at result=bsd_glob($pattern,GLOB_TILDE|GLOB_BRACE);
+	my at result=File::Glob::glob($pattern,GLOB_TILDE|GLOB_BRACE);
 
         if(!defined($result[0])){
-	    @result=bsd_glob($pattern,GLOB_TILDE|GLOB_BRACE|GLOB_NOCHECK);
+	    @result=File::Glob::glob($pattern,GLOB_TILDE|GLOB_BRACE|GLOB_NOCHECK);
         }
         $result[0];
 

1.33      +4 -4      snatch/libsnatch.c

Index: libsnatch.c
===================================================================
RCS file: /usr/local/cvsroot/snatch/libsnatch.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- libsnatch.c	2001/11/16 04:19:14	1.32
+++ libsnatch.c	2001/11/26 05:45:02	1.33
@@ -633,7 +633,7 @@
       outfile_fd=STDOUT_FILENO;
       if(debug)fprintf(stderr,"    ...: Capturing to stdout\n");
 
-      if(videocount){
+      if(videocount || output_video_p){
         output_video_p=1;
         if(audio_channels){
           output_audio_p=1;
@@ -662,7 +662,7 @@
         nows=time(NULL);
         now=localtime(&nows);
         strftime(buf1,256,"%Y%m%d_%H:%M:%S",now);
-	if(videocount){
+	if(videocount || output_video_p){
           if(audio_channels){
             sprintf(buf2,"%s/%s_%s%dHz_%dx%d_AV.snatch",
                     outpath,
@@ -699,7 +699,7 @@
           if(debug)fprintf(stderr,"    ...: Capturing to file %s\n",buf2);
         }
         
-	if(videocount){
+	if(videocount || output_video_p){
           output_video_p=1;
           if(audio_channels){
             output_audio_p=1;
@@ -725,7 +725,7 @@
         }else{
           if(debug)fprintf(stderr,"    ...: Capturing to file %s\n",outpath);
           
-	  if(videocount){
+	  if(videocount || output_video_p){
             output_video_p=1;
             if(audio_channels){
               output_audio_p=1;

--- >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.



More information about the commits mailing list