ext/taglib/: Work around compiler warnings with g++-4.2 when assigning a string const...

Original commit message from CVS:
* ext/taglib/gstapev2mux.cc:
* ext/taglib/gstid3v2mux.cc:
Work around compiler warnings with g++-4.2 when assigning a
string constant to a gchar * (partially fixes #478092).

diff --git a/ChangeLog b/ChangeLog
index 61ee58756cf93822fd759d3fa03eb7ad29cf7193..ac2905cc15b959624bca44dacdbc2d857ba09980 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-18  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * ext/taglib/gstapev2mux.cc:
+       * ext/taglib/gstid3v2mux.cc:
+         Work around compiler warnings with g++-4.2 when assigning a
+         string constant to a gchar * (partially fixes #478092).
+
 2007-09-18  Tim-Philipp Müller  <tim at centricular dot net>
 
        * configure.ac:

diff --git a/ext/taglib/gstapev2mux.cc b/ext/taglib/gstapev2mux.cc
index fcc6f5fb119dc9b51ba64cc8aaaa88dea0b23dcc..3b848618d949c2d954a9f09c083a04638c77130f 100644 (file)
--- a/ext/taglib/gstapev2mux.cc
+++ b/ext/taglib/gstapev2mux.cc
@@ -64,18 +64,11 @@ using namespace TagLib;
 GST_DEBUG_CATEGORY_STATIC (gst_apev2_mux_debug);
 #define GST_CAT_DEFAULT gst_apev2_mux_debug
 
-static const GstElementDetails gst_apev2_mux_details =
-GST_ELEMENT_DETAILS ("TagLib-based APEv2 Muxer",
-    "Formatter/Metadata",
-    "Adds an APEv2 header to the beginning of files using taglib",
-    "Sebastian Dröge <slomo@circular-chaos.org>");
-
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("application/x-apetag"));
 
-
 GST_BOILERPLATE (GstApev2Mux, gst_apev2_mux, GstTagLibMux,
     GST_TYPE_TAG_LIB_MUX);
 
@@ -90,7 +83,10 @@ gst_apev2_mux_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
 
-  gst_element_class_set_details (element_class, &gst_apev2_mux_details);
+  gst_element_class_set_details_simple (element_class,
+      "TagLib-based APEv2 Muxer", "Formatter/Metadata",
+      "Adds an APEv2 header to the beginning of files using taglib",
+      "Sebastian Dröge <slomo@circular-chaos.org>");
 
   GST_DEBUG_CATEGORY_INIT (gst_apev2_mux_debug, "apev2mux", 0,
       "taglib-based APEv2 tag muxer");

diff --git a/ext/taglib/gstid3v2mux.cc b/ext/taglib/gstid3v2mux.cc
index 7494427b75faa120d27ce9bdc7afab89ac023c5b..60cc3f7f56d8287f204141f08f32ae91029b67ab 100644 (file)
--- a/ext/taglib/gstid3v2mux.cc
+++ b/ext/taglib/gstid3v2mux.cc
@@ -69,12 +69,6 @@ using namespace TagLib;
 GST_DEBUG_CATEGORY_STATIC (gst_id3v2_mux_debug);
 #define GST_CAT_DEFAULT gst_id3v2_mux_debug
 
-static const GstElementDetails gst_id3v2_mux_details =
-GST_ELEMENT_DETAILS ("TagLib-based ID3v2 Muxer",
-    "Formatter/Metadata",
-    "Adds an ID3v2 header to the beginning of MP3 files using taglib",
-    "Christophe Fergeau <teuf@gnome.org>");
-
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
@@ -95,7 +89,10 @@ gst_id3v2_mux_base_init (gpointer g_class)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
 
-  gst_element_class_set_details (element_class, &gst_id3v2_mux_details);
+  gst_element_class_set_details_simple (element_class,
+      "TagLib-based ID3v2 Muxer", "Formatter/Metadata",
+      "Adds an ID3v2 header to the beginning of MP3 files using taglib",
+      "Christophe Fergeau <teuf@gnome.org>");
 
   GST_DEBUG_CATEGORY_INIT (gst_id3v2_mux_debug, "id3v2mux", 0,
       "taglib-based ID3v2 tag muxer");