tpm gst-plugins-ugly: gst-plugins-ugly/ gst-plugins-ugly/gst/mpegaudioparse/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-ugly
Changes by:     tpm
Date:           Wed Dec 10 2008  15:42:35 UTC

Log message:
	* gst/mpegaudioparse/gstmpegaudioparse.c: (channel_mode_class),
	  (GST_TYPE_MP3_CHANNEL_MODE), (mp3_type_frame_length_from_header),
	  (gst_mp3parse_emit_frame), (mp3parse_get_query_types):
	* gst/mpegaudioparse/gstmpegaudioparse.h:
	  Do an initial class_ref on an internal enum type from within the
	  class_init function so that there aren't any issues when multiple
	  mp3parse elements are started in separate threads at the same
	  time. (Why we use an enum type here if the tag is registered as
	  a string type, I don't know). Also remove custom UNUSED macro
	  and use GLib's instead.

Modified files:
    .               : ChangeLog
    gst/mpegaudioparse: gstmpegaudioparse.c gstmpegaudioparse.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/ChangeLog.diff?r1=1.2441&r2=1.2442
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/gst/mpegaudioparse/gstmpegaudioparse.c.diff?r1=1.104&r2=1.105
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-ugly/gst/mpegaudioparse/gstmpegaudioparse.h.diff?r1=1.24&r2=1.25

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-ugly/ChangeLog,v
retrieving revision 1.2441
retrieving revision 1.2442
diff -u -d -r1.2441 -r1.2442
--- ChangeLog	4 Dec 2008 20:11:31 -0000	1.2441
+++ ChangeLog	10 Dec 2008 15:42:20 -0000	1.2442
@@ -1,3 +1,16 @@
+2008-12-10  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+	* gst/mpegaudioparse/gstmpegaudioparse.c: (channel_mode_class),
+	  (GST_TYPE_MP3_CHANNEL_MODE), (mp3_type_frame_length_from_header),
+	  (gst_mp3parse_emit_frame), (mp3parse_get_query_types):
+	* gst/mpegaudioparse/gstmpegaudioparse.h:
+	  Do an initial class_ref on an internal enum type from within the
+	  class_init function so that there aren't any issues when multiple
+	  mp3parse elements are started in separate threads at the same
+	  time. (Why we use an enum type here if the tag is registered as
+	  a string type, I don't know). Also remove custom UNUSED macro
+	  and use GLib's instead.
 2008-12-04  Sebastian Dröge  <[email protected]>
 
 	* configure.ac:
Index: gstmpegaudioparse.c
RCS file: /cvs/gstreamer/gst-plugins-ugly/gst/mpegaudioparse/gstmpegaudioparse.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- gstmpegaudioparse.c	14 Oct 2008 19:28:05 -0000	1.104
+++ gstmpegaudioparse.c	10 Dec 2008 15:42:20 -0000	1.105
@@ -136,12 +136,10 @@
 static gboolean
 mp3parse_total_time (GstMPEGAudioParse * mp3parse, GstClockTime * total);
-/* static guint gst_mp3parse_signals[LAST_SIGNAL] = { 0 }; */
-
 GST_BOILERPLATE (GstMPEGAudioParse, gst_mp3parse, GstElement, GST_TYPE_ELEMENT);
 #define GST_TYPE_MP3_CHANNEL_MODE (gst_mp3_channel_mode_get_type())
-G_GNUC_UNUSED static GType
+static GType
 gst_mp3_channel_mode_get_type (void)
 {
   static GType mp3_channel_mode_type = 0;
@@ -234,7 +232,7 @@
   }
   mode_enum =
-      g_enum_get_value (g_type_class_ref (GST_TYPE_MP3_CHANNEL_MODE), mode);
+      g_enum_get_value (g_type_class_peek (GST_TYPE_MP3_CHANNEL_MODE), mode);
   GST_DEBUG_OBJECT (mp3parse, "Calculated mp3 frame length of %u bytes",
       length);
@@ -328,6 +326,8 @@
       "has crc", "Using CRC", NULL);
   gst_tag_register (GST_TAG_MODE, GST_TAG_FLAG_ENCODED, G_TYPE_STRING,
       "channel mode", "MPEG audio channel mode", NULL);
+  g_type_class_ref (GST_TYPE_MP3_CHANNEL_MODE);
 }
 static void
@@ -766,8 +766,8 @@
     }
     mp3parse->last_posted_channel_mode = mode;
-    mode_enum = g_enum_get_value (g_type_class_ref (GST_TYPE_MP3_CHANNEL_MODE),
-        mp3parse->last_posted_channel_mode);
+    mode_enum =
+        g_enum_get_value (g_type_class_peek (GST_TYPE_MP3_CHANNEL_MODE), mode);
     gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_MODE,
         mode_enum->value_nick, NULL);
@@ -1968,7 +1968,7 @@
 static const GstQueryType *
-mp3parse_get_query_types (GstPad * pad ATTR_UNUSED)
+mp3parse_get_query_types (GstPad * pad G_GNUC_UNUSED)
   static const GstQueryType query_types[] = {
     GST_QUERY_POSITION,
Index: gstmpegaudioparse.h
RCS file: /cvs/gstreamer/gst-plugins-ugly/gst/mpegaudioparse/gstmpegaudioparse.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gstmpegaudioparse.h	27 Feb 2008 13:18:57 -0000	1.24
+++ gstmpegaudioparse.h	10 Dec 2008 15:42:21 -0000	1.25
@@ -131,12 +131,6 @@
 GType gst_mp3parse_get_type(void);
-#ifdef __GCC__
-#define ATTR_UNUSED __attribute__ ((unused)
-#else
-#define ATTR_UNUSED 
-#endif
 G_END_DECLS
 #endif /* __MP3PARSE_H__ */

------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose