summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2002-06-12 03:32:02 +0000
committerAndy Wingo <wingo@pobox.com>2002-06-12 03:32:02 +0000
commitdb515dbd19baf2d2d1fe4b653f4de5f728c274d1 (patch)
tree881cd51e04f686bfc371870f72db860c72c3657f /gst
parent9f08fd8e6a90f42cca922d6b92412fbbed4cc597 (diff)
downloadgst-plugins-bad-db515dbd19baf2d2d1fe4b653f4de5f728c274d1.tar.gz
gst-plugins-bad-db515dbd19baf2d2d1fe4b653f4de5f728c274d1.tar.bz2
gst-plugins-bad-db515dbd19baf2d2d1fe4b653f4de5f728c274d1.zip
working jack elements (fixed a problem in upstream jack) random other fixen...
Original commit message from CVS: * working jack elements (fixed a problem in upstream jack) * random other fixen...
Diffstat (limited to 'gst')
-rw-r--r--gst/speed/Makefile.am2
-rw-r--r--gst/speed/demo-mp3.c17
2 files changed, 6 insertions, 13 deletions
diff --git a/gst/speed/Makefile.am b/gst/speed/Makefile.am
index 6a75868f..7ab9f2cb 100644
--- a/gst/speed/Makefile.am
+++ b/gst/speed/Makefile.am
@@ -10,7 +10,7 @@ libgstspeed_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstspeed.h filter.func
if HAVE_GTK
-noinst_PROGRAMS = demo_mp3
+noinst_PROGRAMS = demo-mp3
endif
demo_mp3_SOURCES = demo-mp3.c
diff --git a/gst/speed/demo-mp3.c b/gst/speed/demo-mp3.c
index 31f15da9..3e81853b 100644
--- a/gst/speed/demo-mp3.c
+++ b/gst/speed/demo-mp3.c
@@ -4,7 +4,7 @@
void set_speed (GtkAdjustment *adj, gpointer data)
{
GstElement *speed = GST_ELEMENT(data);
- gtk_object_set(GTK_OBJECT(speed), "speed", adj->value, NULL);
+ g_object_set (speed, "speed", adj->value, NULL);
}
int main(int argc, char **argv)
@@ -41,22 +41,15 @@ int main(int argc, char **argv)
stereo2mono = gst_element_factory_make("stereo2mono", "stereo2mono");
speed = gst_element_factory_make("speed", "speed");
osssink = gst_element_factory_make("osssink", "osssink");
- gtk_object_set(GTK_OBJECT(osssink), "fragment", 0x00180008, NULL);
+ g_object_set(osssink, "fragment", 0x00180008, NULL);
gtk_signal_connect(GTK_OBJECT(gtk_range_get_adjustment(GTK_RANGE(hscale))),
"value_changed", G_CALLBACK (set_speed), speed);
pipeline = gst_pipeline_new("app");
- gst_bin_add(GST_BIN(pipeline), filesrc);
- gst_bin_add(GST_BIN(pipeline), mad);
- gst_bin_add(GST_BIN(pipeline), stereo2mono);
- gst_bin_add(GST_BIN(pipeline), speed);
- gst_bin_add(GST_BIN(pipeline), osssink);
- gst_element_connect(filesrc, mad);
- gst_element_connect(mad, stereo2mono);
- gst_element_connect(stereo2mono, speed);
- gst_element_connect(speed, osssink);
- gtk_object_set(GTK_OBJECT(filesrc), "location", argv[1], NULL);
+ gst_bin_add_many (GST_BIN(pipeline), filesrc, mad, stereo2mono, speed, osssink, NULL);
+ gst_element_connect_many (filesrc, mad, stereo2mono, speed, osssink, NULL);
+ g_object_set(G_OBJECT(filesrc), "location", argv[1], NULL);
gst_element_set_state(pipeline, GST_STATE_PLAYING);