[artoolkit-commits] artoolkit/lib/SRC/VideoLinux1394Cam video.c,1.2,1.3

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30532

Modified Files:
	video.c 
Log Message:
Support version 11 of libdc1394.


Index: video.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam/video.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** video.c	22 Nov 2004 02:32:48 -0000	1.2
--- video.c	13 Mar 2005 23:32:25 -0000	1.3
***************
*** 13,16 ****
--- 13,19 ----
   *   - Support for changing of various 1394 camera properties
   *
+  *   Revision 1.1.1  Date: 2005/03/14
+  *   Patch by Henrik Erkkonen to support version 11 of libdc1394.
+  *
   */
  
***************
*** 38,41 ****
--- 41,45 ----
  #undef  LIBDC_9
  #undef  LIBDC_10
+ #undef  LIBDC_11
  #undef  LIBDC_DEF
  
***************
*** 46,50 ****
  // #define LIBDC_8
  // #define LIBDC_9
! #define LIBDC_10
  /* ----------------------- MAKE ANY #define CHANGES HERE ONLY -------------------------------- */
  
--- 50,55 ----
  // #define LIBDC_8
  // #define LIBDC_9
! // #define LIBDC_10
! #define LIBDC_11
  /* ----------------------- MAKE ANY #define CHANGES HERE ONLY -------------------------------- */
  
***************
*** 72,77 ****
  #endif
  
  #ifndef LIBDC_DEF
! #error One of the LIBDC_[8,9,10] macros must be defined to compile this code properly!
  #endif
  
--- 77,87 ----
  #endif
  
+ #ifdef LIBDC_11
+ #warning Compiling using the 1.0.0 libDC library
+ #define LIBDC_DEF
+ #endif
+ 
  #ifndef LIBDC_DEF
! #error One of the LIBDC_[8,9,10,11] macros must be defined to compile this code properly!
  #endif
  
***************
*** 429,433 ****
  				 0, /* do_extra_buffering */
  #endif
! #ifndef LIBDC_8
  				 1, video1394devname, /* drop_frames, dma_device_file */
  #endif
--- 439,443 ----
  				 0, /* do_extra_buffering */
  #endif
! #if !defined(LIBDC_8) || defined(LIBDC_11)
  				 1, video1394devname, /* drop_frames, dma_device_file */
  #endif
***************
*** 500,504 ****
  				     0, /* do_extra_buffering */
  #endif
! #ifndef LIBDC_8
  				     1, video1394devname, /* drop_frames, dma_device_file */
  #endif
--- 510,514 ----
  				     0, /* do_extra_buffering */
  #endif
! #if !defined(LIBDC_8) || defined(LIBDC_11)
  				     1, video1394devname, /* drop_frames, dma_device_file */
  #endif