Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9390
Modified Files:
video.c
Log Message:
Make default behaviour consistent across Linux video libs.
Index: video.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoGStreamer/video.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** video.c 18 Sep 2006 04:48:33 -0000 1.5
--- video.c 18 Sep 2006 23:31:29 -0000 1.6
***************
*** 34,40 ****
int width, height;
! /* the actual video buffer */
ARUint8 *videoBuffer;
!
};
--- 34,40 ----
int width, height;
! /* the actual video buffer */
ARUint8 *videoBuffer;
!
};
***************
*** 181,185 ****
AR2VideoParamT*
! ar2VideoOpen(char *config ) {
AR2VideoParamT *vid = 0;
--- 181,185 ----
AR2VideoParamT*
! ar2VideoOpen(char *config_in ) {
AR2VideoParamT *vid = 0;
***************
*** 189,208 ****
GstXML *xml;
GstStateChangeReturn _ret;
! /* 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 {
! g_printf ("No config string supplied, please consult documentation\n");
}
! } else
! g_print ("Using supplied config string [%s]\n", config);
/* initialise GStreamer */
--- 189,209 ----
GstXML *xml;
GstStateChangeReturn _ret;
+ char *config;
! /* 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) {
config = envconf;
! g_printf ("Using config string from environment [%s].\n", envconf);
! } else {
! config = NULL;
! g_printf ("No video config string supplied, using defaults.\n");
}
! } else {
! config = config_in;
! g_printf ("Using supplied video config string [%s].\n", config_in);
! }
/* initialise GStreamer */
|
