[artoolkit-commits] artoolkit/lib/SRC/VideoLinuxV4L video.c, 1.5, 1.6
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
From: Hartmut S. <ret...@us...> - 2006-09-18 05:24:09
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10204/lib/SRC/VideoLinuxV4L Modified Files: video.c Log Message: V4L now also configurable through ARTOOLKIT_CONFIG Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L/video.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** video.c 21 Apr 2006 04:35:20 -0000 1.5 --- video.c 18 Sep 2006 05:24:06 -0000 1.6 *************** *** 153,156 **** --- 153,175 ---- int i; int adjust = 1; + + + /* following plainly copied from Wayne :) */ + /* If no config string is supplied, we should use the environment variable otherwise set a sane default */ + if (!strcmp (config, "")) { + + /* None suppplied, lets see if the user supplied one from the shell */ + char *envconf = getenv ("ARTOOLKIT_CONFIG"); + if ((envconf != NULL) && (strcmp (envconf, ""))) { + config = envconf; + printf ("Using config string from environment [%s]\n", config); + } + else { + printf ("No config string supplied, please consult documentation\n"); + } + } else + printf ("Using supplied config string [%s]\n", config); + + arMalloc( vid, AR2VideoParamT, 1 ); |