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

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

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxDV
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30169

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/VideoLinuxDV/video.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** video.c	5 Apr 2006 05:47:24 -0000	1.2
--- video.c	19 Sep 2006 03:12:35 -0000	1.3
***************
*** 107,115 ****
  }
  
! AR2VideoParamT *ar2VideoOpen( char *config )
  {
      struct raw1394_portinfo    g_pinf[16];
      AR2VideoParamT            *vid;
!     char                      *a, line[256];
      int                        numcards;
      int                        i;
--- 107,115 ----
  }
  
! AR2VideoParamT *ar2VideoOpen( char *config_in )
  {
      struct raw1394_portinfo    g_pinf[16];
      AR2VideoParamT            *vid;
!     char                      *config, *a, line[256];
      int                        numcards;
      int                        i;
***************
*** 120,123 ****
--- 120,139 ----
      vid->status     = 0;
  
+ 	/* 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);
+ 	}
+ 	
      a = config;
      if( a != NULL) {