From: <al...@fr...> - 2006-01-12 16:48:28
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: alima Date: Wed Jan 11 2006 06:41:36 PST Log message: Replaced wrong style code by GST_BOILERPLATE. Modified files: . : ChangeLog ext/sdl : sdlaudiosink.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.1941&r2=1.1942 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ext/sdl/sdlaudiosink.c.diff?r1=1.1&r2=1.2 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.1941 retrieving revision 1.1942 diff -u -d -r1.1941 -r1.1942 --- ChangeLog 11 Jan 2006 11:04:03 -0000 1.1941 +++ ChangeLog 11 Jan 2006 14:41:24 -0000 1.1942 @@ -1,3 +1,8 @@ +2006-01-11 Edgard Lima <edg...@in...> + + * ext/sdl/sdlaudiosink.c: + Replaced wrong style code by GST_BOILERPLATE. + 2006-01-11 Fabrizio Gennari <fab...@ti...> reviewed by: Edward Hervey <ed...@fl...> @@ -6,7 +11,7 @@ Add support for Indeo3 video in Quicktime files. Closes #326524 -2006-01-09 Edgard Lima <edg...@in...> +2006-01-09 Edgard Lima <edg...@in...> * configure.ac: * ext/sdl/Makefile.am: Index: sdlaudiosink.c RCS file: /cvs/gstreamer/gst-plugins-bad/ext/sdl/sdlaudiosink.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- sdlaudiosink.c 9 Jan 2006 18:20:56 -0000 1.1 +++ sdlaudiosink.c 11 Jan 2006 14:41:24 -0000 1.2 @@ -33,9 +33,6 @@ "Output to a sound card via SDLAUDIO", "Edgard Lima <edg...@in...>"); -static void gst_sdlaudio_sink_base_init (gpointer g_class); -static void gst_sdlaudio_sink_class_init (GstSDLAudioSinkClass * klass); -static void gst_sdlaudio_sink_init (GstSDLAudioSink * sdlaudiosink); static void gst_sdlaudio_sink_dispose (GObject * object); static void gst_sdlaudio_sink_get_property (GObject * object, guint prop_id, @@ -134,36 +131,10 @@ "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]") ); -static GstElementClass *parent_class = NULL; - -GType -gst_sdlaudio_sink_get_type (void) -{ - static GType sdlaudiosink_type = 0; - if (!sdlaudiosink_type) { - static const GTypeInfo sdlaudiosink_info = { - sizeof (GstSDLAudioSinkClass), - gst_sdlaudio_sink_base_init, - NULL, - (GClassInitFunc) gst_sdlaudio_sink_class_init, - sizeof (GstSDLAudioSink), - 0, - (GInstanceInitFunc) gst_sdlaudio_sink_init, - }; - sdlaudiosink_type = - g_type_register_static (GST_TYPE_AUDIO_SINK, "GstSDLAudioSink", - &sdlaudiosink_info, 0); - } - return sdlaudiosink_type; -} +GST_BOILERPLATE (GstSDLAudioSink, gst_sdlaudio_sink, GstAudioSink, + GST_TYPE_AUDIO_SINK) -static void -gst_sdlaudio_sink_dispose (GObject * object) + static void gst_sdlaudio_sink_dispose (GObject * object) { GstSDLAudioSink *sdlaudiosink = GST_SDLAUDIOSINK (object); @@ -175,7 +146,6 @@ g_free (sdlaudiosink->buffer); } - G_OBJECT_CLASS (parent_class)->dispose (object); } static void @@ -203,8 +173,6 @@ gstbaseaudiosink_class = (GstBaseAudioSinkClass *) klass; gstaudiosink_class = (GstAudioSinkClass *) klass; - parent_class = g_type_class_ref (GST_TYPE_BASE_AUDIO_SINK); gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_sdlaudio_sink_dispose); gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_sdlaudio_sink_getcaps); @@ -224,7 +192,8 @@ -gst_sdlaudio_sink_init (GstSDLAudioSink * sdlaudiosink) +gst_sdlaudio_sink_init (GstSDLAudioSink * sdlaudiosink, + GstSDLAudioSinkClass * g_class) GST_DEBUG ("initializing sdlaudiosink"); @@ -235,7 +204,7 @@ SEMAPHORE_INIT (sdlaudiosink->semA, TRUE); - SEMAPHORE_INIT (sdlaudiosink->semB, TRUE); + SEMAPHORE_INIT (sdlaudiosink->semB, FALSE); |