[libdv-cvs] CVS: libdv/encodedv Makefile.am,1.5,1.6 dvconnect.c,1.5,1.6

[Charles 'B. K. <kr...@us...>]

Update of /cvsroot/libdv/libdv/encodedv
In directory usw-pr-cvs1:/tmp/cvs-serv21216/encodedv

Modified Files:
	Makefile.am dvconnect.c 
Log Message:
Apply patches from Charlie Yates

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libdv/libdv/encodedv/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Makefile.am	26 May 2002 21:02:42 -0000	1.5
--- Makefile.am	11 Nov 2002 09:16:29 -0000	1.6
***************
*** 10,16 ****
  CLEANFILES                = 
  
! bin_PROGRAMS= encodedv
  
! noinst_PROGRAMS= insert_audio fix_headers scan_packet_headers steal_header ppmqscale dvconnect dvavi
  
  encodedv_SOURCES= encodedv.c 
--- 10,16 ----
  CLEANFILES                = 
  
! bin_PROGRAMS= encodedv dvconnect
  
! noinst_PROGRAMS= insert_audio fix_headers scan_packet_headers steal_header ppmqscale dvavi
  
  encodedv_SOURCES= encodedv.c 

Index: dvconnect.c
===================================================================
RCS file: /cvsroot/libdv/libdv/encodedv/dvconnect.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** dvconnect.c	4 Apr 2002 05:42:11 -0000	1.5
--- dvconnect.c	11 Nov 2002 09:16:29 -0000	1.6
***************
*** 34,37 ****
--- 34,38 ----
  #include <sys/resource.h>
  #include <string.h>
+ 
  #include <pthread.h>
  #include <signal.h>
***************
*** 335,339 ****
  
  int capture_raw(const char* filename, int channel, int nbuffers,
! 		int start_frame, int end_frame, int verbose_mode)
  {
          int viddev;
--- 336,341 ----
  
  int capture_raw(const char* filename, int channel, int nbuffers,
! 		int start_frame, int end_frame, int verbose_mode,
! 		char *device)
  {
          int viddev;
***************
*** 360,365 ****
  	}
  
!         if ((viddev = open("/dev/video1394", O_RDWR)) < 0) {
! 		perror("open /dev/video1394");
                  return -1;
          }
--- 362,367 ----
  	}
  
!         if ((viddev = open(device, O_RDWR)) < 0) {
! 		perror("open video1394 device");
                  return -1;
          }
***************
*** 497,500 ****
--- 499,503 ----
  static unsigned char * underrun_data_frame = NULL;
  static int underrun_frame_ispal = 0;
+ static unsigned char *device = NULL;
  
  static pthread_mutex_t  wakeup_rev_mutex;
***************
*** 678,682 ****
  int send_raw(const char* filename, int channel, int nbuffers, int start_frame,
  	     int end_frame, int verbose_mode, 
! 	     const char * underrun_data_filename)
  {
          int viddev;
--- 681,685 ----
  int send_raw(const char* filename, int channel, int nbuffers, int start_frame,
  	     int end_frame, int verbose_mode, 
! 	     const char * underrun_data_filename, char *device)
  {
          int viddev;
***************
*** 733,738 ****
  	}
  
!         if ((viddev = open("/dev/video1394",O_RDWR)) < 0) {
! 		perror("open /dev/video1394");
                  return -1;
          }
--- 736,741 ----
  	}
  
!         if ((viddev = open(device,O_RDWR)) < 0) {
! 		perror("open video1394 device");
                  return -1;
          }
***************
*** 900,904 ****
  #define DV_CONNECT_OPT_UNDERRUN_DATA    12
  #define DV_CONNECT_OPT_AUTOHELP         13
! #define DV_CONNECT_NUM_OPTS             14
  
  
--- 903,908 ----
  #define DV_CONNECT_OPT_UNDERRUN_DATA    12
  #define DV_CONNECT_OPT_AUTOHELP         13
! #define DV_CONNECT_OPT_DEVICE           14
! #define DV_CONNECT_NUM_OPTS             15
  
  
***************
*** 1030,1033 ****
--- 1034,1045 ----
          }; /* autohelp */
  
+         option_table[DV_CONNECT_OPT_DEVICE] = (struct poptOption) {
+                 longName:   "device", 
+                 shortName:  'd', 
+                 argInfo: POPT_ARG_STRING,
+                 arg:     &device,
+                 descrip: "Specify the video1394 device (default /dev/video1394)",
+         }; /* device */
+ 
          option_table[DV_CONNECT_NUM_OPTS] = (struct poptOption) { 
                  NULL, 0, 0, NULL, 0 };
***************
*** 1075,1084 ****
  	}
  
  	if (send_mode) {
  		send_raw(filename, channel, buffers, start, end, verbose_mode,
! 			 underrun_data);
  	} else {
  		capture_raw(filename, channel, buffers, start, end, 
! 			    verbose_mode);
  	}
  	return 0;
--- 1087,1099 ----
  	}
  
+ 	if ( device == NULL )
+                 device = "/dev/video1394";
+ 
  	if (send_mode) {
  		send_raw(filename, channel, buffers, start, end, verbose_mode,
! 			 underrun_data, device);
  	} else {
  		capture_raw(filename, channel, buffers, start, end, 
! 			    verbose_mode, device);
  	}
  	return 0;