summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2009-06-16 14:05:04 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2009-06-16 14:14:26 +0100
commit70089160f84d882d1ee7cd1708df1ee87bf69b08 (patch)
tree8120dc5429ff4ebe46a2719240b681b5ac1c75f5
parent3767cb60053eb12d346c815fbe695a1d2ec265b0 (diff)
audiosink, audiosrc: do the class_ref()s in the right class_init functions
Spotted by Philip Jägenstedt. Hopefully fixes #585970 for real.
-rw-r--r--gst-libs/gst/audio/gstaudiosink.c6
-rw-r--r--gst-libs/gst/audio/gstaudiosrc.c6
2 files changed, 4 insertions, 8 deletions
diff --git a/gst-libs/gst/audio/gstaudiosink.c b/gst-libs/gst/audio/gstaudiosink.c
index 479267e41..2d4bfe530 100644
--- a/gst-libs/gst/audio/gstaudiosink.c
+++ b/gst-libs/gst/audio/gstaudiosink.c
@@ -191,10 +191,6 @@ gst_audioringbuffer_class_init (GstAudioRingBufferClass * klass)
gstringbuffer_class->delay = GST_DEBUG_FUNCPTR (gst_audioringbuffer_delay);
gstringbuffer_class->activate =
GST_DEBUG_FUNCPTR (gst_audioringbuffer_activate);
-
- /* ref class from a thread-safe context to work around missing bit of
- * thread-safety in GObject */
- g_type_class_ref (GST_TYPE_AUDIORING_BUFFER);
}
typedef guint (*WriteFunc) (GstAudioSink * sink, gpointer data, guint length);
@@ -596,6 +592,8 @@ gst_audio_sink_class_init (GstAudioSinkClass * klass)
gstbaseaudiosink_class->create_ringbuffer =
GST_DEBUG_FUNCPTR (gst_audio_sink_create_ringbuffer);
+
+ g_type_class_ref (GST_TYPE_AUDIORING_BUFFER);
}
static void
diff --git a/gst-libs/gst/audio/gstaudiosrc.c b/gst-libs/gst/audio/gstaudiosrc.c
index ff183b888..602673438 100644
--- a/gst-libs/gst/audio/gstaudiosrc.c
+++ b/gst-libs/gst/audio/gstaudiosrc.c
@@ -183,10 +183,6 @@ gst_audioringbuffer_class_init (GstAudioRingBufferClass * klass)
gstringbuffer_class->stop = GST_DEBUG_FUNCPTR (gst_audioringbuffer_stop);
gstringbuffer_class->delay = GST_DEBUG_FUNCPTR (gst_audioringbuffer_delay);
-
- /* ref class from a thread-safe context to work around missing bit of
- * thread-safety in GObject */
- g_type_class_ref (GST_TYPE_AUDIORING_BUFFER);
}
typedef guint (*ReadFunc) (GstAudioSrc * src, gpointer data, guint length);
@@ -510,6 +506,8 @@ gst_audio_src_class_init (GstAudioSrcClass * klass)
gstbaseaudiosrc_class->create_ringbuffer =
GST_DEBUG_FUNCPTR (gst_audio_src_create_ringbuffer);
+
+ g_type_class_ref (GST_TYPE_AUDIORING_BUFFER);
}
static void