summaryrefslogtreecommitdiff
path: root/examples/mixer/mixer.c
diff options
context:
space:
mode:
authorErik Walthinsen <omega@temple-baptist.org>2001-06-25 01:20:11 +0000
committerErik Walthinsen <omega@temple-baptist.org>2001-06-25 01:20:11 +0000
commit7f8d8fe8d5c184f05ad388b3f2ea19383a2954f9 (patch)
tree5948ecb95948b38c7cdf316585a741c442d0a31e /examples/mixer/mixer.c
parent2703619624604e7cf1fc5e9cb5908f60cf5704c9 (diff)
Merged from GOBJECT1 to HEAD at 200106241GOBJECT1-200106241
Original commit message from CVS: Merged from GOBJECT1 to HEAD at 200106241
Diffstat (limited to 'examples/mixer/mixer.c')
-rw-r--r--examples/mixer/mixer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/mixer/mixer.c b/examples/mixer/mixer.c
index 4461d4796c..998bafb337 100644
--- a/examples/mixer/mixer.c
+++ b/examples/mixer/mixer.c
@@ -270,14 +270,14 @@ create_input_channel (int id, char* location)
g_assert(channel->disksrc != NULL);
GST_DEBUG(0, "c_i_p : setting location\n");
- gtk_object_set(GTK_OBJECT(channel->disksrc),"location", location, NULL);
+ g_object_set(G_OBJECT(channel->disksrc),"location", location, NULL);
/* add disksrc to the bin before autoplug */
gst_bin_add(GST_BIN(channel->pipe), channel->disksrc);
/* connect signal to eos of disksrc */
- gtk_signal_connect(GTK_OBJECT(channel->disksrc),"eos",
- GTK_SIGNAL_FUNC(eos),NULL);
+ g_signal_connectc (G_OBJECT(channel->disksrc),"eos",
+ G_CALLBACK(eos),NULL,FALSE);
#ifdef DEBUG
@@ -395,7 +395,7 @@ void env_register_cp (GstElement *volenv, double cp_time, double cp_level)
char buffer[30];
sprintf (buffer, "%f:%f", cp_time, cp_level);
- gtk_object_set(GTK_OBJECT(volenv), "controlpoint", buffer, NULL);
+ g_object_set(G_OBJECT(volenv), "controlpoint", buffer, NULL);
}