[artoolkit-commits] artoolkit/examples/simpleLite simpleLite.c, 1.15, 1.16

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

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

Modified Files:
	simpleLite.c 
Log Message:
Some cleanup of gstreamer addition, plus new fliph and flipv tokens for Mac video.

Index: simpleLite.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** simpleLite.c	28 May 2006 23:38:40 -0000	1.15
--- simpleLite.c	10 Jul 2006 04:35:17 -0000	1.16
***************
*** 413,423 ****
  	const char *cparam_name = 
  		"Data/camera_para.dat";
! 	char *vconf = // Camera configuration.
  #if defined(_WIN32)
  		"Data\\WDM_camera_flipV.xml";
  #elif defined(__APPLE__)
  		"";
! #else
  		"-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240";
  #endif
  	const char *patt_name  = "Data/patt.hiro";
--- 413,434 ----
  	const char *cparam_name = 
  		"Data/camera_para.dat";
! 	//
! 	// Camera configuration.
! 	//
! 	char *vconf = 
  #if defined(_WIN32)
  		"Data\\WDM_camera_flipV.xml";
  #elif defined(__APPLE__)
  		"";
! #elif defined(__linux)
! #  if defined(AR_INPUT_GSTREAMER)
! 		//"gst_arttoolkit.xml";
! 		//"filesrc location=gstreamer_test_xvid.avi ! decodebin ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink";
! 		" 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
  	const char *patt_name  = "Data/patt.hiro";