Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30621
Modified Files:
video.c
Log Message:
Add back in check for empty environment string. Check on Mac OS X and Linux DV video libs also.
Index: video.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** video.c 10 Jul 2006 04:35:17 -0000 1.21
--- video.c 19 Sep 2006 03:13:20 -0000 1.22
***************
*** 1244,1248 ****
! AR2VideoParamT *ar2VideoOpen(char *config)
{
static int initF = 0;
--- 1244,1248 ----
! AR2VideoParamT *ar2VideoOpen(char *config_in)
{
static int initF = 0;
***************
*** 1259,1263 ****
int err_i = 0;
AR2VideoParamT *vid = NULL;
! char *a, line[256];
#ifdef AR_VIDEO_SUPPORT_OLD_QUICKTIME
int weLocked = 0;
--- 1259,1263 ----
int err_i = 0;
AR2VideoParamT *vid = NULL;
! char *config, *a, line[256];
#ifdef AR_VIDEO_SUPPORT_OLD_QUICKTIME
int weLocked = 0;
***************
*** 1269,1272 ****
--- 1269,1288 ----
long cpuType;
+ /* If no config string is supplied, we should use the environment variable, otherwise set a sane default */
+ if (!config_in || !(config_in[0])) {
+ /* None suppplied, lets see if the user supplied one from the shell */
+ char *envconf = getenv ("ARTOOLKIT_CONFIG");
+ if (envconf && envconf[0]) {
+ config = envconf;
+ printf ("Using config string from environment [%s].\n", envconf);
+ } else {
+ config = NULL;
+ printf ("No video config string supplied, using defaults.\n");
+ }
+ } else {
+ config = config_in;
+ printf ("Using supplied video config string [%s].\n", config_in);
+ }
+
// Process configuration options.
a = config;
|
