mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 17:35:59 +00:00
Code Issues 1 Projects Releases Wiki Activity

Small fixes to pipeline and gstbin.

Browse source 
Original commit message from CVS:
Small fixes to pipeline and gstbin.
Fixed the xmmstest makefile entry
Removed the plugin_load statements in videotest
Applied the patch from Steve Baker for float args parsing
This commit is contained in:
Wim Taymans 2001-03-06 22:32:27 +00:00
parent 30685cb8c9
commit 031e0a3acb
7 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst/gstbin.c
View file

@ -260,6 +260,8 @@ gst_bin_change_state (GstElement *element)
if (!parent || !GST_IS_BIN (parent)) if (!parent || !GST_IS_BIN (parent))
gst_bin_create_plan (bin); gst_bin_create_plan (bin);
else
GST_DEBUG (0,"not creating plan for '%s'\n",GST_ELEMENT_NAME (bin));
break; break;
} }

1
gst/gstpipeline.c
View file

@ -158,7 +158,6 @@ gst_pipeline_typefind (GstPipeline *pipeline, GstElement *element)
gst_bin_add (GST_BIN (pipeline), typefind); gst_bin_add (GST_BIN (pipeline), typefind);
//gst_bin_create_plan (GST_BIN (pipeline)); //gst_bin_create_plan (GST_BIN (pipeline));
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_READY);
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
// keep pushing buffers... the have_type signal handler will set the found flag // keep pushing buffers... the have_type signal handler will set the found flag

6
gst/gstutils.c
View file

@ -247,9 +247,9 @@ void gst_util_set_object_arg (GtkObject *object, guchar *name, gchar *value)
break; break;
} }
case GTK_TYPE_DOUBLE: { case GTK_TYPE_DOUBLE: {
gdouble i; gfloat i;
sscanf (value, "%g", (float *)&i); sscanf (value, "%g", &i);
gtk_object_set (GTK_OBJECT (object), name, i, NULL); gtk_object_set (GTK_OBJECT (object), name, (gdouble)i, NULL);
break; break;
} }
default: default:

1
test/.gitignore vendored
View file

@ -45,3 +45,4 @@ mp2toavi
mp1tomp1 mp1tomp1
pipetest pipetest
mp3tovorbis mp3tovorbis
xmmstest

3
test/Makefile.am
View file

@ -1,10 +1,9 @@
# FIXME FIXME # FIXME FIXME
bin_PROGRAMS = xmmstest
noinst_PROGRAMS = qtest spectrum record wave mp3 teardown buffer mp3parse \ noinst_PROGRAMS = qtest spectrum record wave mp3 teardown buffer mp3parse \
mpeg2parse mp1parse mp3play ac3parse ac3play dvdcat fake cobin videotest \ mpeg2parse mp1parse mp3play ac3parse ac3play dvdcat fake cobin videotest \
aviparse vidcapture avi2mpg mp2tomp1 mp1tomp1 pipetest \ aviparse vidcapture avi2mpg mp2tomp1 mp1tomp1 pipetest \
vidcapture2 mp2toavi mp3tovorbis mpeg2parse2 vidcapture2 mp2toavi mp3tovorbis mpeg2parse2 xmmstest
SUBDIRS = xml bindings SUBDIRS = xml bindings

2
test/videotest.c
View file

@ -25,8 +25,6 @@ int main(int argc,char *argv[]) {
//_gst_plugin_spew = TRUE; //_gst_plugin_spew = TRUE;
gst_init(&argc,&argv); gst_init(&argc,&argv);
gst_plugin_load("v4lsrc");
gst_plugin_load("videosink");
gnome_init("Videotest","0.0.1",argc,argv); gnome_init("Videotest","0.0.1",argc,argv);

12
test/xmmstest.c
View file

@ -5,11 +5,12 @@ extern gboolean _gst_plugin_spew;
gboolean idle_func(gpointer data); gboolean idle_func(gpointer data);
GstElement *src;
int int
main (int argc,char *argv[]) main (int argc,char *argv[])
{ {
GstElement *bin; GstElement *bin;
GstElement *src;
GstElement *effect; GstElement *effect;
GstElement *audiosink; GstElement *audiosink;
@ -17,9 +18,9 @@ main (int argc,char *argv[])
bin = gst_bin_new("bin"); bin = gst_bin_new("bin");
src = gst_elementfactory_make("XMMS_INPUT_mpeg_layer_1/2/3_player_1.2.4", "xmms_plugin"); //src = gst_elementfactory_make("XMMS_INPUT_mpeg_layer_1/2/3_player_1.2.4", "xmms_plugin");
//src = gst_elementfactory_make("XMMS_INPUT_oggvorbis_player_0.1", "xmms_plugin"); //src = gst_elementfactory_make("XMMS_INPUT_oggvorbis_player_0.1", "xmms_plugin");
//src = gst_elementfactory_make("XMMS_INPUT_mikmod_player_1.2.4", "xmms_plugin"); src = gst_elementfactory_make("XMMS_INPUT_mikmod_player_1.2.4", "xmms_plugin");
//src = gst_elementfactory_make("XMMS_INPUT_tone_generator_1.2.4", "xmms_plugin"); //src = gst_elementfactory_make("XMMS_INPUT_tone_generator_1.2.4", "xmms_plugin");
g_return_val_if_fail(src != NULL, -1); g_return_val_if_fail(src != NULL, -1);
@ -31,6 +32,11 @@ main (int argc,char *argv[])
gtk_object_set (GTK_OBJECT (src), "location", argv[1], NULL); gtk_object_set (GTK_OBJECT (src), "location", argv[1], NULL);
//gtk_object_set (GTK_OBJECT (src), "filename", "tone://1000", NULL); //gtk_object_set (GTK_OBJECT (src), "filename", "tone://1000", NULL);
g_print ("Song Info (text:length): %s\n",gst_util_get_string_arg (GTK_OBJECT (src), "song_info"));
//gtk_object_set (GTK_OBJECT (src), "show_about", TRUE, NULL);
//gtk_object_set (GTK_OBJECT (src), "configure", TRUE, NULL);
//gtk_object_set (GTK_OBJECT (src), "show_file_info", TRUE, NULL);
audiosink = gst_elementfactory_make("audiosink", "audiosink"); audiosink = gst_elementfactory_make("audiosink", "audiosink");
g_return_val_if_fail(audiosink != NULL, -1); g_return_val_if_fail(audiosink != NULL, -1);