[artoolkit-commits] artoolkit/lib/SRC/VideoWin32DirectShow videoWin32DirectShow.cpp, 1.11, 1.12

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

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

Modified Files:
	videoWin32DirectShow.cpp 
Log Message:
Tidy up config handling in videoWin32DSVL.

Index: videoWin32DirectShow.cpp
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow/videoWin32DirectShow.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** videoWin32DirectShow.cpp	23 Jan 2007 00:39:28 -0000	1.11
--- videoWin32DirectShow.cpp	6 Aug 2007 02:34:40 -0000	1.12
***************
*** 156,169 ****
  	vid->graphManager = new DSVL_VideoSource();
  	if (!config) {
- 
  		config = getenv("ARTOOLKIT_CONFIG");
! 
! 		if (config == NULL) {
! 			config = &config_default[0];
! 		}
  		if (FAILED(vid->graphManager->BuildGraphFromXMLString(config))) return(NULL);
- 
  	} else {
! 		if (strncmp(config, "<?xml", 5) == 0) {
  			if (FAILED(vid->graphManager->BuildGraphFromXMLString(config))) return(NULL);
  		} else {
--- 156,166 ----
  	vid->graphManager = new DSVL_VideoSource();
  	if (!config) {
  		config = getenv("ARTOOLKIT_CONFIG");
! 		if (!config) config = config_default;
  		if (FAILED(vid->graphManager->BuildGraphFromXMLString(config))) return(NULL);
  	} else {
! 		if (!config[0]) {
! 			if (FAILED(vid->graphManager->BuildGraphFromXMLString(config_default))) return(NULL);
! 		} else if (strncmp(config, "<?xml", 5) == 0) {
  			if (FAILED(vid->graphManager->BuildGraphFromXMLString(config))) return(NULL);
  		} else {