[gst-cvs] CVS: gstreamer/gstplay gstplay.c,1.35,1.36 main.c,1.12,1.13

[Erik Walthinsen]

Update of /cvsroot/gstreamer/gstreamer/gstplay
In directory usw-pr-cvs1:/tmp/cvs-serv21419/gstplay

Modified Files:
	gstplay.c main.c 
Log Message:
merge from EVENTS1 on 20011016

Index: gstplay.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gstplay/gstplay.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- gstplay.c	2001/08/22 21:47:51	1.35
+++ gstplay.c	2001/10/17 10:21:24	1.36
@@ -402,7 +402,7 @@
 	}
 	
 	if (priv->src == NULL) {
-		priv->src = gst_elementfactory_make ("disksrc", "srcelement");
+		priv->src = gst_elementfactory_make ("filesrc", "srcelement");
 	}
 	
 	priv->uri = g_strdup (uri);

Index: main.c
===================================================================
RCS file: /cvsroot/gstreamer/gstreamer/gstplay/main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- main.c	2001/08/15 22:32:30	1.12
+++ main.c	2001/10/17 10:21:24	1.13
@@ -25,7 +25,9 @@
 		}
 	}
 	
+#ifndef GST_DISABLE_LOADSAVE
 	xmlSaveFile ("gstmediaplay.gst", gst_xml_write (gst_play_get_pipeline (play->play)));
+#endif
 	
 	gdk_threads_enter();
 	gst_main();