From 2ffcb159d717bfbc23726b01edd92c71c200ea44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 6 Jun 2010 17:57:03 +0200 Subject: [PATCH] sys: Don't use GST_DEBUG_FUNCPTR for GObject vfuncs --- sys/directsound/gstdirectsoundsink.c | 8 +++----- sys/oss/gstossdmabuffer.c | 4 ++-- sys/oss/gstosssink.c | 8 ++++---- sys/oss/gstosssrc.c | 9 ++++----- sys/oss4/oss4-sink.c | 8 ++++---- sys/oss4/oss4-source.c | 12 +++++------- sys/osxaudio/gstosxaudiosink.c | 6 ++---- sys/osxaudio/gstosxaudiosrc.c | 6 ++---- sys/osxaudio/gstosxringbuffer.c | 4 ++-- sys/sunaudio/gstsunaudiosink.c | 6 ++---- sys/sunaudio/gstsunaudiosrc.c | 8 +++----- sys/waveform/gstwaveformsink.c | 8 +++----- 12 files changed, 36 insertions(+), 51 deletions(-) diff --git a/sys/directsound/gstdirectsoundsink.c b/sys/directsound/gstdirectsoundsink.c index 0c2b1aa..3479d67 100644 --- a/sys/directsound/gstdirectsoundsink.c +++ b/sys/directsound/gstdirectsoundsink.c @@ -277,11 +277,9 @@ gst_directsound_sink_class_init (GstDirectSoundSinkClass * klass) parent_class = g_type_class_peek_parent (klass); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_directsound_sink_finalise); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_directsound_sink_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_directsound_sink_get_property); + gobject_class->finalize = gst_directsound_sink_finalise; + gobject_class->set_property = gst_directsound_sink_set_property; + gobject_class->get_property = gst_directsound_sink_get_property; gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_directsound_sink_getcaps); diff --git a/sys/oss/gstossdmabuffer.c b/sys/oss/gstossdmabuffer.c index f37cf36..5e2d46e 100644 --- a/sys/oss/gstossdmabuffer.c +++ b/sys/oss/gstossdmabuffer.c @@ -103,8 +103,8 @@ gst_ossdmabuffer_class_init (GstOssDMABufferClass * klass) parent_class = g_type_class_peek_parent (klass); - gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_ossdmabuffer_dispose); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_ossdmabuffer_finalize); + gobject_class->dispose = gst_ossdmabuffer_dispose; + gobject_class->finalize = gst_ossdmabuffer_finalize; gstringbuffer_class->acquire = gst_ossdmabuffer_acquire; gstringbuffer_class->release = gst_ossdmabuffer_release; diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c index 7dc7e32..1d6d103 100644 --- a/sys/oss/gstosssink.c +++ b/sys/oss/gstosssink.c @@ -198,10 +198,10 @@ gst_oss_sink_class_init (GstOssSinkClass * klass) parent_class = g_type_class_peek_parent (klass); - gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_oss_sink_dispose); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_oss_sink_finalise); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_oss_sink_get_property); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_oss_sink_set_property); + gobject_class->dispose = gst_oss_sink_dispose; + gobject_class->finalize = gst_oss_sink_finalise; + gobject_class->get_property = gst_oss_sink_get_property; + gobject_class->set_property = gst_oss_sink_set_property; g_object_class_install_property (gobject_class, PROP_DEVICE, g_param_spec_string ("device", "Device", diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c index 5d04aa9..46ea490 100644 --- a/sys/oss/gstosssrc.c +++ b/sys/oss/gstosssrc.c @@ -151,11 +151,10 @@ gst_oss_src_class_init (GstOssSrcClass * klass) gstbasesrc_class = (GstBaseSrcClass *) klass; gstaudiosrc_class = (GstAudioSrcClass *) klass; - gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_oss_src_dispose); - gobject_class->finalize = - (GObjectFinalizeFunc) GST_DEBUG_FUNCPTR (gst_oss_src_finalize); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_oss_src_get_property); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_oss_src_set_property); + gobject_class->dispose = gst_oss_src_dispose; + gobject_class->finalize = (GObjectFinalizeFunc) gst_oss_src_finalize; + gobject_class->get_property = gst_oss_src_get_property; + gobject_class->set_property = gst_oss_src_set_property; gstbasesrc_class->get_caps = GST_DEBUG_FUNCPTR (gst_oss_src_getcaps); diff --git a/sys/oss4/oss4-sink.c b/sys/oss4/oss4-sink.c index 2ebda3f..84a7d89 100644 --- a/sys/oss4/oss4-sink.c +++ b/sys/oss4/oss4-sink.c @@ -143,10 +143,10 @@ gst_oss4_sink_class_init (GstOss4SinkClass * klass) GstBaseSinkClass *basesink_class = (GstBaseSinkClass *) klass; GObjectClass *gobject_class = (GObjectClass *) klass; - gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_oss4_sink_dispose); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_oss4_sink_finalize); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_oss4_sink_get_property); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_oss4_sink_set_property); + gobject_class->dispose = gst_oss4_sink_dispose; + gobject_class->finalize = gst_oss4_sink_finalize; + gobject_class->get_property = gst_oss4_sink_get_property; + gobject_class->set_property = gst_oss4_sink_set_property; g_object_class_install_property (gobject_class, PROP_DEVICE, g_param_spec_string ("device", "Device", diff --git a/sys/oss4/oss4-source.c b/sys/oss4/oss4-source.c index d3b92f7..1d3fc8c 100644 --- a/sys/oss4/oss4-source.c +++ b/sys/oss4/oss4-source.c @@ -116,6 +116,7 @@ gst_oss4_source_base_init (gpointer g_class) gst_oss4_audio_get_template_caps ()); gst_element_class_add_pad_template (element_class, templ); } + static void gst_oss4_source_class_init (GstOss4SourceClass * klass) { @@ -131,13 +132,10 @@ gst_oss4_source_class_init (GstOss4SourceClass * klass) gstbaseaudiosrc_class = (GstBaseAudioSrcClass *) klass; gstaudiosrc_class = (GstAudioSrcClass *) klass; - gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_oss4_source_dispose); - gobject_class->finalize = - (GObjectFinalizeFunc) GST_DEBUG_FUNCPTR (gst_oss4_source_finalize); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_oss4_source_get_property); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_oss4_source_set_property); + gobject_class->dispose = gst_oss4_source_dispose; + gobject_class->finalize = (GObjectFinalizeFunc) gst_oss4_source_finalize; + gobject_class->get_property = gst_oss4_source_get_property; + gobject_class->set_property = gst_oss4_source_set_property; gstbasesrc_class->get_caps = GST_DEBUG_FUNCPTR (gst_oss4_source_getcaps); diff --git a/sys/osxaudio/gstosxaudiosink.c b/sys/osxaudio/gstosxaudiosink.c index 24c9120..5e66e94 100644 --- a/sys/osxaudio/gstosxaudiosink.c +++ b/sys/osxaudio/gstosxaudiosink.c @@ -166,10 +166,8 @@ gst_osx_audio_sink_class_init (GstOsxAudioSinkClass * klass) parent_class = g_type_class_peek_parent (klass); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_osx_audio_sink_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_osx_audio_sink_get_property); + gobject_class->set_property = gst_osx_audio_sink_set_property; + gobject_class->get_property = gst_osx_audio_sink_get_property; g_object_class_install_property (gobject_class, ARG_DEVICE, g_param_spec_int ("device", "Device ID", "Device ID of output device", diff --git a/sys/osxaudio/gstosxaudiosrc.c b/sys/osxaudio/gstosxaudiosrc.c index b7c8c6d..9e388fe 100644 --- a/sys/osxaudio/gstosxaudiosrc.c +++ b/sys/osxaudio/gstosxaudiosrc.c @@ -157,10 +157,8 @@ gst_osx_audio_src_class_init (GstOsxAudioSrcClass * klass) parent_class = g_type_class_peek_parent (klass); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_osx_audio_src_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_osx_audio_src_get_property); + gobject_class->set_property = gst_osx_audio_src_set_property; + gobject_class->get_property = gst_osx_audio_src_get_property; gstbasesrc_class->get_caps = GST_DEBUG_FUNCPTR (gst_osx_audio_src_get_caps); diff --git a/sys/osxaudio/gstosxringbuffer.c b/sys/osxaudio/gstosxringbuffer.c index 67abd4d..095efc1 100644 --- a/sys/osxaudio/gstosxringbuffer.c +++ b/sys/osxaudio/gstosxringbuffer.c @@ -105,8 +105,8 @@ gst_osx_ring_buffer_class_init (GstOsxRingBufferClass * klass) ring_parent_class = g_type_class_peek_parent (klass); - gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_osx_ring_buffer_dispose); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_osx_ring_buffer_finalize); + gobject_class->dispose = gst_osx_ring_buffer_dispose; + gobject_class->finalize = gst_osx_ring_buffer_finalize; gstringbuffer_class->open_device = GST_DEBUG_FUNCPTR (gst_osx_ring_buffer_open_device); diff --git a/sys/sunaudio/gstsunaudiosink.c b/sys/sunaudio/gstsunaudiosink.c index 145768a..1d6af04 100644 --- a/sys/sunaudio/gstsunaudiosink.c +++ b/sys/sunaudio/gstsunaudiosink.c @@ -175,10 +175,8 @@ gst_sunaudiosink_class_init (GstSunAudioSinkClass * klass) gobject_class->dispose = gst_sunaudiosink_dispose; gobject_class->finalize = gst_sunaudiosink_finalize; - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_sunaudiosink_set_property); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_sunaudiosink_get_property); + gobject_class->set_property = gst_sunaudiosink_set_property; + gobject_class->get_property = gst_sunaudiosink_get_property; gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_sunaudiosink_getcaps); diff --git a/sys/sunaudio/gstsunaudiosrc.c b/sys/sunaudio/gstsunaudiosrc.c index 91d2929..aff36e9 100644 --- a/sys/sunaudio/gstsunaudiosrc.c +++ b/sys/sunaudio/gstsunaudiosrc.c @@ -131,11 +131,9 @@ gst_sunaudiosrc_class_init (GstSunAudioSrcClass * klass) gstbaseaudiosrc_class = (GstBaseAudioSrcClass *) klass; gstaudiosrc_class = (GstAudioSrcClass *) klass; - gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_dispose); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_sunaudiosrc_get_property); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_sunaudiosrc_set_property); + gobject_class->dispose = gst_sunaudiosrc_dispose; + gobject_class->get_property = gst_sunaudiosrc_get_property; + gobject_class->set_property = gst_sunaudiosrc_set_property; gstbasesrc_class->get_caps = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_getcaps); diff --git a/sys/waveform/gstwaveformsink.c b/sys/waveform/gstwaveformsink.c index ea649f5..36542c1 100644 --- a/sys/waveform/gstwaveformsink.c +++ b/sys/waveform/gstwaveformsink.c @@ -131,11 +131,9 @@ gst_waveform_sink_class_init (GstWaveFormSinkClass * klass) parent_class = g_type_class_peek_parent (klass); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_waveform_sink_finalise); - gobject_class->get_property = - GST_DEBUG_FUNCPTR (gst_waveform_sink_get_property); - gobject_class->set_property = - GST_DEBUG_FUNCPTR (gst_waveform_sink_set_property); + gobject_class->finalize = gst_waveform_sink_finalise; + gobject_class->get_property = gst_waveform_sink_get_property; + gobject_class->set_property = gst_waveform_sink_set_property; gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_waveform_sink_getcaps); -- 2.7.4