[artoolkit-commits] artoolkit/examples/simple simpleTest.c, 1.8, 1.9

[Wayne P. <ti...@us...>]

Update of /cvsroot/artoolkit/artoolkit/examples/simple
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv15899/examples/simple

Modified Files:
	simpleTest.c 
Log Message:
Rather than hard coding config strings into each test application, we will
now be moving towards putting defaults into each video module and then just
overriding them where needed. I have made the changes for the 1394DC code
as a proof of concept, and fixed up simpleTest to do it this way. Also, on
Linux we can use ARTOOLKIT_CONFIG to override the video string from the
command line if there is nothing supplied by default in the calling app, this
is nice for changing camera parameters without needing a recompile.


Index: simpleTest.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/simple/simpleTest.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** simpleTest.c	4 Aug 2006 06:40:46 -0000	1.8
--- simpleTest.c	15 Sep 2006 03:41:14 -0000	1.9
***************
*** 24,29 ****
  #elif defined(__APPLE__)
  	"";
! #elif defined(__linux)
! #  if defined(AR_INPUT_GSTREAMER)
  /* possible streams
   "filesrc location=gstreamer_test_xvid.avi ! decodebin ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink";
--- 24,29 ----
  #elif defined(__APPLE__)
  	"";
! #elif defined (__linux)
! #if defined (AR_INPUT_GSTREAMER)
  /* possible streams
   "filesrc location=gstreamer_test_xvid.avi ! decodebin ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink";
***************
*** 31,39 ****
  */
  	" videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink";
! #  else
  	"-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240";
! #  endif
  #else
! 	"";
  #endif
  
--- 31,45 ----
  */
  	" videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink";
! #elif defined (AR_INPUT_V4L)
  	"-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240";
! #elif defined (AR_INPUT_DV)
!         "";
! #elif defined (AR_INPUT_1394CAM)
!         "";
  #else
! #error Unknown Linux video interface type
! #endif /* __linux */
! #else
! #error Unknown system type (Win32, Apple, SGI, or Linux only)
  #endif