gst_element_class_set_details => gst_element_class_set_details_simple

26 files changed, 136 insertions, 229 deletions

diff --git a/sys/acmenc/acmenc.c b/sys/acmenc/acmenc.c
index c1da855c4..558cda708 100644
--- a/sys/acmenc/acmenc.c
+++ b/sys/acmenc/acmenc.c
@@ -465,11 +465,11 @@ acmenc_class_init (ACMEncClass * klass)
 acmenc_base_init (ACMEncClass * klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstElementDetails details;
   ACMEncParams *params;
   ACMDRIVERDETAILS driverdetails;
-  gchar *shortname, *longname;
+  gchar *shortname, *longname, *detail, *description;
   MMRESULT res;
+
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&acmenc_sink_template));
   gst_element_class_add_pad_template (element_class,
@@ -490,17 +490,17 @@ acmenc_base_init (ACMEncClass * klass)
   longname =
       g_utf16_to_utf8 ((gunichar2 *) driverdetails.szLongName, -1, NULL, NULL,
       NULL);
-  details.longname = g_strdup_printf ("ACM Encoder: %s", (shortname
+  detail = g_strdup_printf ("ACM Encoder: %s", (shortname
           && *shortname) ? shortname : params->name);
-  details.klass = "Codec/Encoder/Audio";
-  details.description = g_strdup_printf ("ACM Encoder: %s", (longname
+  description = g_strdup_printf ("ACM Encoder: %s", (longname
           && *longname) ? longname : params->name);
-  details.author = "Pioneers of the Inevitable <songbird@songbirdnest.com>";
-  gst_element_class_set_details (element_class, &details);
+  gst_element_class_set_details_simple (element_class, detail,
+      "Codec/Encoder/Audio", description,
+      "Pioneers of the Inevitable <songbird@songbirdnest.com>");
   g_free (shortname);
   g_free (longname);
-  g_free (details.longname);
-  g_free (details.description);
+  g_free (description);
+  g_free (detail);
   klass->driverId = params->driverId;
 }
 
diff --git a/sys/acmmp3dec/acmmp3dec.c b/sys/acmmp3dec/acmmp3dec.c
index 3a158f731..d77dcca29 100644
--- a/sys/acmmp3dec/acmmp3dec.c
+++ b/sys/acmmp3dec/acmmp3dec.c
@@ -40,12 +40,6 @@
 #define GST_CAT_DEFAULT acmmp3dec_debug
 GST_DEBUG_CATEGORY_STATIC (acmmp3dec_debug);
 
-static const GstElementDetails acmmp3dec_details =
-GST_ELEMENT_DETAILS ("ACM MP3 decoder",
-    "Codec/Decoder/Audio",
-    "Decode MP3 using ACM decoder",
-    "Pioneers of the Inevitable <songbird@songbirdnest.com");
-
 static GstStaticPadTemplate acmmp3dec_src_template =
 GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_SRC,
@@ -413,7 +407,10 @@ acmmp3dec_base_init (gpointer klass)
       gst_static_pad_template_get (&acmmp3dec_sink_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&acmmp3dec_src_template));
-  gst_element_class_set_details (element_class, &acmmp3dec_details);
+  gst_element_class_set_details_simple (element_class, "ACM MP3 decoder",
+      "Codec/Decoder/Audio",
+      "Decode MP3 using ACM decoder",
+      "Pioneers of the Inevitable <songbird@songbirdnest.com");
 }
 
 static gboolean
diff --git a/sys/cdrom/gstcdplayer.c b/sys/cdrom/gstcdplayer.c
index a7debd24a..123517d07 100644
--- a/sys/cdrom/gstcdplayer.c
+++ b/sys/cdrom/gstcdplayer.c
@@ -58,14 +58,6 @@ static GstStateChangeReturn cdplayer_change_state (GstElement * element,
 static GstElementClass *parent_class;
 static guint cdplayer_signals[LAST_SIGNAL] = { 0 };
 
-static const GstElementDetails cdplayer_details =
-GST_ELEMENT_DETAILS ("CD Player",
-    "Generic/Bin",
-    "Play CD audio through the CD Drive",
-    "Charles Schmidt <cbschmid@uiuc.edu>, "
-    "Wim Taymans <wim.taymans@chello.be>");
-
-
 GType
 cdplayer_get_type (void)
 {
@@ -97,8 +89,13 @@ cdplayer_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &cdplayer_details);
+  gst_element_class_set_details_simple (element_class, "CD Player",
+      "Generic/Bin",
+      "Play CD audio through the CD Drive",
+      "Charles Schmidt <cbschmid@uiuc.edu>, "
+      "Wim Taymans <wim.taymans@chello.be>");
 }
+
 static void
 cdplayer_class_init (CDPlayerClass * klass)
 {
diff --git a/sys/directdraw/gstdirectdrawsink.c b/sys/directdraw/gstdirectdrawsink.c
index bb0332f84..8f73e28d1 100644
--- a/sys/directdraw/gstdirectdrawsink.c
+++ b/sys/directdraw/gstdirectdrawsink.c
@@ -48,13 +48,6 @@
 GST_DEBUG_CATEGORY_STATIC (directdrawsink_debug);
 #define GST_CAT_DEFAULT directdrawsink_debug
 
-/* elementfactory information */
-static const GstElementDetails gst_directdraw_sink_details =
-GST_ELEMENT_DETAILS ("Direct Draw Video Sink",
-    "Sink/Video",
-    "Output to a video card via Direct Draw",
-    "Sebastien Moutte <sebastien@moutte.net>");
-
 static void gst_directdraw_sink_init_interfaces (GType type);
 
 GST_BOILERPLATE_FULL (GstDirectDrawSink, gst_directdraw_sink, GstVideoSink,
@@ -387,7 +380,10 @@ gst_directdraw_sink_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &gst_directdraw_sink_details);
+  gst_element_class_set_details_simple (element_class, "Direct Draw Video Sink",
+      "Sink/Video",
+      "Output to a video card via Direct Draw",
+      "Sebastien Moutte <sebastien@moutte.net>");
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&directdrawsink_sink_factory));
 }
@@ -1730,9 +1726,9 @@ gst_directdraw_sink_get_depth (LPDDPIXELFORMAT lpddpfPixelFormat)
   gint order = 0, binary;
 
   binary =
-      lpddpfPixelFormat->dwRBitMask | lpddpfPixelFormat->
-      dwGBitMask | lpddpfPixelFormat->dwBBitMask | lpddpfPixelFormat->
-      dwRGBAlphaBitMask;
+      lpddpfPixelFormat->
+      dwRBitMask | lpddpfPixelFormat->dwGBitMask | lpddpfPixelFormat->
+      dwBBitMask | lpddpfPixelFormat->dwRGBAlphaBitMask;
   while (binary != 0) {
     if ((binary % 2) == 1)
       order++;
diff --git a/sys/directsound/gstdirectsoundsrc.c b/sys/directsound/gstdirectsoundsrc.c
index 76a3dcf4b..c6064bb87 100644
--- a/sys/directsound/gstdirectsoundsrc.c
+++ b/sys/directsound/gstdirectsoundsrc.c
@@ -63,12 +63,6 @@
 GST_DEBUG_CATEGORY_STATIC (directsoundsrc_debug);
 #define GST_CAT_DEFAULT directsoundsrc_debug
 
-static GstElementDetails gst_directsound_src_details =
-GST_ELEMENT_DETAILS ("Direct Sound Audio Src",
-    "Source/Audio",
-    "Capture from a soundcard via DIRECTSOUND",
-    "Joni Valtanen <joni.valtanen@movial.fi>");
-
 /* defaults here */
 #define DEFAULT_DEVICE 0
 
@@ -157,7 +151,10 @@ gst_directsound_src_base_init (gpointer g_class)
 
   GST_DEBUG ("initializing directsoundsrc base\n");
 
-  gst_element_class_set_details (element_class, &gst_directsound_src_details);
+  gst_element_class_set_details_simple (element_class, "Direct Sound Audio Src",
+      "Source/Audio",
+      "Capture from a soundcard via DIRECTSOUND",
+      "Joni Valtanen <joni.valtanen@movial.fi>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&directsound_src_src_factory));
diff --git a/sys/dshowdecwrapper/gstdshowaudiodec.cpp b/sys/dshowdecwrapper/gstdshowaudiodec.cpp
index fae5292dc..84f45277b 100644
--- a/sys/dshowdecwrapper/gstdshowaudiodec.cpp
+++ b/sys/dshowdecwrapper/gstdshowaudiodec.cpp
@@ -310,23 +310,19 @@ HRESULT AudioFakeSink::CheckMediaType(const CMediaType *pmt)
 static void
 gst_dshowaudiodec_base_init (gpointer klass)
 {
-  GstDshowAudioDecClass *audiodec_class = (GstDshowAudioDecClass *)klass;
+  GstDshowAudioDecClass *audiodec_class = (GstDshowAudioDecClass *) klass;
   GstPadTemplate *src, *sink;
   GstCaps *srccaps, *sinkcaps;
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstElementDetails details;
+  char *description;
 
   audiodec_class->entry = tmp;
-  details.longname = g_strdup_printf ("DirectShow %s Decoder Wrapper",
-      tmp->element_longname);
-  details.klass = g_strdup ("Codec/Decoder/Audio");
-  details.description = g_strdup_printf ("DirectShow %s Decoder Wrapper",
-      tmp->element_longname);
-  details.author = "Sebastien Moutte <sebastien@moutte.net>";
-  gst_element_class_set_details (element_class, &details);
-  g_free (details.longname);
-  g_free (details.klass);
-  g_free (details.description);
+  description = g_strdup_printf ("DirectShow %s Decoder Wrapper",
+      tmp->element_description);
+  gst_element_class_set_details_simple (element_class, description,
+      "Codec/Decoder/Audio", description,
+      "Sebastien Moutte <sebastien@moutte.net>");
+  g_free (description);
 
   sinkcaps = gst_caps_from_string (tmp->sinkcaps);
 
diff --git a/sys/dshowdecwrapper/gstdshowvideodec.cpp b/sys/dshowdecwrapper/gstdshowvideodec.cpp
index fab929147..c73aa9c52 100644
--- a/sys/dshowdecwrapper/gstdshowvideodec.cpp
+++ b/sys/dshowdecwrapper/gstdshowvideodec.cpp
@@ -365,24 +365,20 @@ HRESULT VideoFakeSink::CheckMediaType(const CMediaType *pmt)
 static void
 gst_dshowvideodec_base_init (gpointer klass)
 {
-  GstDshowVideoDecClass *videodec_class = (GstDshowVideoDecClass *)klass;
+  GstDshowVideoDecClass *videodec_class = (GstDshowVideoDecClass *) klass;
   GstPadTemplate *src, *sink;
   GstCaps *srccaps, *sinkcaps;
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
-  GstElementDetails details;
+  char *description;
 
   videodec_class->entry = tmp;
 
-  details.longname = g_strdup_printf ("DirectShow %s Decoder Wrapper",
+  description = g_strdup_printf ("DirectShow %s Decoder Wrapper",
       tmp->element_longname);
-  details.klass = g_strdup ("Codec/Decoder/Video");
-  details.description = g_strdup_printf ("DirectShow %s Decoder Wrapper",
-      tmp->element_longname);
-  details.author = "Sebastien Moutte <sebastien@moutte.net>";
-  gst_element_class_set_details (element_class, &details);
-  g_free (details.longname);
-  g_free (details.klass);
-  g_free (details.description);
+  gst_element_class_set_details_simple (element_class, description,
+      "Codec/Decoder/Video", description,
+      "Sebastien Moutte <sebastien@moutte.net>");
+  g_free (description);
 
   sinkcaps = gst_caps_from_string (tmp->sinkcaps);
   gst_caps_set_simple (sinkcaps,
diff --git a/sys/dshowsrcwrapper/gstdshowaudiosrc.cpp b/sys/dshowsrcwrapper/gstdshowaudiosrc.cpp
index bdf3c47b3..e7fbadaab 100644
--- a/sys/dshowsrcwrapper/gstdshowaudiosrc.cpp
+++ b/sys/dshowsrcwrapper/gstdshowaudiosrc.cpp
@@ -25,12 +25,6 @@
 
 #include "gstdshowaudiosrc.h"
 
-static const GstElementDetails gst_dshowaudiosrc_details =
-GST_ELEMENT_DETAILS ("Directshow audio capture source",
-    "Source/Audio",
-    "Receive data from a directshow audio capture graph",
-    "Sebastien Moutte <sebastien@moutte.net>");
-
 GST_DEBUG_CATEGORY_STATIC (dshowaudiosrc_debug);
 #define GST_CAT_DEFAULT dshowaudiosrc_debug
 
@@ -127,7 +121,10 @@ gst_dshowaudiosrc_base_init (gpointer klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
 
-  gst_element_class_set_details (element_class, &gst_dshowaudiosrc_details);
+  gst_element_class_set_details_simple (element_class,
+      "Directshow audio capture source", "Source/Audio",
+      "Receive data from a directshow audio capture graph",
+      "Sebastien Moutte <sebastien@moutte.net>");
 }
 
 static void
diff --git a/sys/dshowsrcwrapper/gstdshowvideosrc.cpp b/sys/dshowsrcwrapper/gstdshowvideosrc.cpp
index ef722c218..fd28ca657 100644
--- a/sys/dshowsrcwrapper/gstdshowvideosrc.cpp
+++ b/sys/dshowsrcwrapper/gstdshowvideosrc.cpp
@@ -28,12 +28,6 @@
 
 #include <gst/video/video.h>
 
-static const GstElementDetails gst_dshowvideosrc_details =
-GST_ELEMENT_DETAILS ("DirectShow video capture source",
-    "Source/Video",
-    "Receive data from a directshow video capture graph",
-    "Sebastien Moutte <sebastien@moutte.net>");
-
 GST_DEBUG_CATEGORY_STATIC (dshowvideosrc_debug);
 #define GST_CAT_DEFAULT dshowvideosrc_debug
 
@@ -134,7 +128,10 @@ gst_dshowvideosrc_base_init (gpointer klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
 
-  gst_element_class_set_details (element_class, &gst_dshowvideosrc_details);
+  gst_element_class_set_details_simple (element_class,
+      "DirectShow video capture source", "Source/Video",
+      "Receive data from a directshow video capture graph",
+      "Sebastien Moutte <sebastien@moutte.net>");
 }
 
 static void
diff --git a/sys/dshowvideosink/dshowvideosink.cpp b/sys/dshowvideosink/dshowvideosink.cpp
index bbde078f4..ab9aecd0d 100644
--- a/sys/dshowvideosink/dshowvideosink.cpp
+++ b/sys/dshowvideosink/dshowvideosink.cpp
@@ -28,13 +28,7 @@
 
 #include "windows.h"
 
-#define WM_GRAPH_NOTIFY WM_APP + 1 /* Private message */
-
-static const GstElementDetails gst_dshowvideosink_details =
-GST_ELEMENT_DETAILS ("DirectShow video sink",
-    "Sink/Video",
-    "Display data using a DirectShow video renderer",
-    "Pioneers of the Inevitable <songbird@songbirdnest.com>");
+#define WM_GRAPH_NOTIFY WM_APP + 1
 
 GST_DEBUG_CATEGORY (dshowvideosink_debug);
 #define GST_CAT_DEFAULT dshowvideosink_debug
@@ -145,7 +139,10 @@ gst_dshowvideosink_base_init (gpointer klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_template));
 
-  gst_element_class_set_details (element_class, &gst_dshowvideosink_details);
+  gst_element_class_set_details_simple (element_class, "DirectShow video sink",
+      "Sink/Video",
+      "Display data using a DirectShow video renderer",
+      "Pioneers of the Inevitable <songbird@songbirdnest.com>");
 }
 
 static void
diff --git a/sys/dvb/dvbbasebin.c b/sys/dvb/dvbbasebin.c
index ab4203d47..5118146eb 100644
--- a/sys/dvb/dvbbasebin.c
+++ b/sys/dvb/dvbbasebin.c
@@ -33,11 +33,6 @@
 GST_DEBUG_CATEGORY_STATIC (dvb_base_bin_debug);
 #define GST_CAT_DEFAULT dvb_base_bin_debug
 
-static GstElementDetails dvb_base_bin_details = GST_ELEMENT_DETAILS ("DVB bin",
-    "Source/Bin/Video",
-    "Access descramble and split DVB streams",
-    "Alessandro Decina <alessandro@nnva.org>");
-
 static GstStaticPadTemplate src_template =
 GST_STATIC_PAD_TEMPLATE ("src%d", GST_PAD_SRC,
     GST_PAD_REQUEST,
@@ -208,7 +203,10 @@ dvb_base_bin_base_init (gpointer klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
 
-  gst_element_class_set_details (element_class, &dvb_base_bin_details);
+  gst_element_class_set_details_simple (element_class, "DVB bin",
+      "Source/Bin/Video",
+      "Access descramble and split DVB streams",
+      "Alessandro Decina <alessandro@nnva.org>");
 }
 
 static void
diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
index ba96073e0..a9cda667e 100644
--- a/sys/dvb/gstdvbsrc.c
+++ b/sys/dvb/gstdvbsrc.c
@@ -68,15 +68,6 @@ GST_DEBUG_CATEGORY_STATIC (gstdvbsrc_debug);
 #define LOF1 (9750*1000UL)
 #define LOF2 (10600*1000UL)
 
-
-static GstElementDetails dvbsrc_details = {
-  "DVB Source",
-  "Source/Video",
-  "Digital Video Broadcast Source",
-  "P2P-VCR, C-Lab, University of Paderborn\n"
-      "Zaheer Abbas Merali <zaheerabbas at merali dot org>"
-};
-
 /* Arguments */
 enum
 {
@@ -305,7 +296,11 @@ gst_dvbsrc_base_init (gpointer gclass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&ts_src_factory));
 
-  gst_element_class_set_details (element_class, &dvbsrc_details);
+  gst_element_class_set_details_simple (element_class, "DVB Source",
+      "Source/Video",
+      "Digital Video Broadcast Source",
+      "P2P-VCR, C-Lab, University of Paderborn,"
+      "Zaheer Abbas Merali <zaheerabbas at merali dot org>");
 }
 
 
diff --git a/sys/dxr3/dxr3audiosink.c b/sys/dxr3/dxr3audiosink.c
index 284ced261..d7bd6881d 100644
--- a/sys/dxr3/dxr3audiosink.c
+++ b/sys/dxr3/dxr3audiosink.c
@@ -45,16 +45,6 @@
    the original AC3 stream.  The result is expressed as MPEG2. */
 #define TIME_FOR_BYTES(bytes) (((bytes) * 90) / 48)
 
-
-/* ElementFactory information. */
-static GstElementDetails dxr3audiosink_details = {
-  "dxr3/Hollywood+ mpeg decoder board audio plugin",
-  "Audio/Sink",
-  "Feeds audio to Sigma Designs em8300 based boards",
-  "Martin Soto <martinsoto@users.sourceforge.net>"
-};
-
-
 /* Dxr3AudioSink signals and args */
 enum
 {
@@ -162,7 +152,10 @@ dxr3audiosink_base_init (Dxr3AudioSinkClass * klass)
       gst_static_pad_template_get (&dxr3audiosink_pcm_sink_factory));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&dxr3audiosink_ac3_sink_factory));
-  gst_element_class_set_details (element_class, &dxr3audiosink_details);
+  gst_element_class_set_details_simple (element_class,
+      "dxr3/Hollywood+ mpeg decoder board audio plugin", "Audio/Sink",
+      "Feeds audio to Sigma Designs em8300 based boards",
+      "Martin Soto <martinsoto@users.sourceforge.net>");
 }
 
 static void
diff --git a/sys/dxr3/dxr3spusink.c b/sys/dxr3/dxr3spusink.c
index 0b220f8c7..0ea924390 100644
--- a/sys/dxr3/dxr3spusink.c
+++ b/sys/dxr3/dxr3spusink.c
@@ -38,16 +38,6 @@
 
 #include "dxr3common.h"
 
-
-/* ElementFactory information. */
-static GstElementDetails dxr3spusink_details = {
-  "dxr3/Hollywood+ mpeg decoder board subpicture element",
-  "Sink/Video",
-  "Feeds subpicture information to Sigma Designs em8300 based boards",
-  "Martin Soto <martinsoto@users.sourceforge.net>"
-};
-
-
 /* Dxr3SpuSink signals and args */
 enum
 {
@@ -138,7 +128,10 @@ dxr3spusink_base_init (Dxr3SpuSinkClass * klass)
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&dxr3spusink_sink_factory));
-  gst_element_class_set_details (element_class, &dxr3spusink_details);
+  gst_element_class_set_details_simple (element_class,
+      "dxr3/Hollywood+ mpeg decoder board subpicture element", "Sink/Video",
+      "Feeds subpicture information to Sigma Designs em8300 based boards",
+      "Martin Soto <martinsoto@users.sourceforge.net>");
 }
 
 static void
diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c
index 475cfbdd7..2f86f0681 100644
--- a/sys/dxr3/dxr3videosink.c
+++ b/sys/dxr3/dxr3videosink.c
@@ -38,16 +38,6 @@
 
 #include "dxr3common.h"
 
-
-/* ElementFactory information. */
-static GstElementDetails dxr3videosink_details = {
-  "dxr3/Hollywood+ mpeg decoder board video element",
-  "Sink/Video",
-  "Feeds MPEG2 video to Sigma Designs em8300 based boards",
-  "Martin Soto <martinsoto@users.sourceforge.net>"
-};
-
-
 /* Dxr3VideoSink signals and args */
 enum
 {
@@ -163,7 +153,10 @@ dxr3videosink_base_init (Dxr3VideoSinkClass * klass)
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&dxr3videosink_sink_factory));
-  gst_element_class_set_details (element_class, &dxr3videosink_details);
+  gst_element_class_set_details_simple (element_class,
+      "dxr3/Hollywood+ mpeg decoder board video element", "Sink/Video",
+      "Feeds MPEG2 video to Sigma Designs em8300 based boards",
+      "Martin Soto <martinsoto@users.sourceforge.net>");
 }
 
 static void
diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c
index 6975f55db..989d48f15 100644
--- a/sys/fbdev/gstfbdevsink.c
+++ b/sys/fbdev/gstfbdevsink.c
@@ -39,13 +39,6 @@
 
 #include "gstfbdevsink.h"
 
-/* elementfactory information */
-static const GstElementDetails gst_fbdevsink_details =
-GST_ELEMENT_DETAILS ("fbdev video sink",
-    "Sink/Video",
-    "A linux framebuffer videosink",
-    "Sean D'Epagnier <sean@depagnier.com>");
-
 enum
 {
   ARG_0,
@@ -97,7 +90,9 @@ gst_fbdevsink_base_init (gpointer g_class)
       GST_STATIC_CAPS (GST_FBDEV_TEMPLATE_CAPS)
       );
 
-  gst_element_class_set_details (element_class, &gst_fbdevsink_details);
+  gst_element_class_set_details_simple (element_class, "fbdev video sink",
+      "Sink/Video",
+      "A linux framebuffer videosink", "Sean D'Epagnier <sean@depagnier.com>");
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_template));
 }
diff --git a/sys/osxvideo/osxvideosrc.c b/sys/osxvideo/osxvideosrc.c
index f70fb588a..83a92cded 100644
--- a/sys/osxvideo/osxvideosrc.c
+++ b/sys/osxvideo/osxvideosrc.c
@@ -634,13 +634,6 @@ gst_osx_video_src_init_interfaces (GType type)
 static void
 gst_osx_video_src_base_init (gpointer gclass)
 {
-  static GstElementDetails element_details = {
-    "Video Source (OSX)",
-    "Source/Video",
-    "Reads raw frames from a capture device on OS X",
-    "Ole Andre Vadla Ravnaas <ole.andre.ravnas@tandberg.com>, "
-        "Ali Sabil <ali.sabil@tandberg.com>"
-  };
 
   GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
 
@@ -649,7 +642,11 @@ gst_osx_video_src_base_init (gpointer gclass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
 
-  gst_element_class_set_details (element_class, &element_details);
+  gst_element_class_set_details_simple (element_class, "Video Source (OSX)",
+      "Source/Video",
+      "Reads raw frames from a capture device on OS X",
+      "Ole Andre Vadla Ravnaas <ole.andre.ravnas@tandberg.com>, "
+      "Ali Sabil <ali.sabil@tandberg.com>");
 }
 
 static void
diff --git a/sys/qcam/gstqcamsrc.c b/sys/qcam/gstqcamsrc.c
index e757b6c86..76229ac76 100644
--- a/sys/qcam/gstqcamsrc.c
+++ b/sys/qcam/gstqcamsrc.c
@@ -33,13 +33,6 @@
 
 #include "qcamip.h"
 
-/* elementfactory information */
-static const GstElementDetails gst_qcamsrc_details =
-GST_ELEMENT_DETAILS ("QCam Source",
-    "Source/Video",
-    "Read from a QuickCam device",
-    "Wim Taymans <wim.taymans@chello.be>");
-
 #define AE_NONE                 3
 
 #define DEF_WIDTH               320
@@ -149,6 +142,7 @@ gst_qcamsrc_get_type (void)
   }
   return qcamsrc_type;
 }
+
 static void
 gst_qcamsrc_base_init (gpointer g_class)
 {
@@ -156,8 +150,11 @@ gst_qcamsrc_base_init (gpointer g_class)
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&gst_qcamsrc_src_factory));
-  gst_element_class_set_details (element_class, &gst_qcamsrc_details);
+  gst_element_class_set_details_simple (element_class, "QCam Source",
+      "Source/Video",
+      "Read from a QuickCam device", "Wim Taymans <wim.taymans@chello.be>");
 }
+
 static void
 gst_qcamsrc_class_init (GstQCamSrcClass * klass)
 {
diff --git a/sys/qtwrapper/audiodecoders.c b/sys/qtwrapper/audiodecoders.c
index e041286b7..bd8e73529 100644
--- a/sys/qtwrapper/audiodecoders.c
+++ b/sys/qtwrapper/audiodecoders.c
@@ -934,10 +934,10 @@ qtwrapper_audio_decoder_sink_event (GstPad * pad, GstEvent * event)
 static void
 qtwrapper_audio_decoder_base_init (QTWrapperAudioDecoderClass * klass)
 {
-  GstElementDetails details;
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
   gchar *name = NULL;
   gchar *info = NULL;
+  char *longname, *description;
   ComponentDescription desc;
   QTWrapperAudioDecoderParams *params;
 
@@ -949,19 +949,19 @@ qtwrapper_audio_decoder_base_init (QTWrapperAudioDecoderClass * klass)
   get_name_info_from_component (params->component, &desc, &name, &info);
 
   /* Fill in details */
-  details.longname = g_strdup_printf ("QTWrapper SCAudio Audio Decoder : %s",
+  longname =
+      g_strdup_printf ("QTWrapper SCAudio Audio Decoder : %s",
       GST_STR_NULL (name));
-  details.klass = "Codec/Decoder/Audio";
-  details.description =
+  description =
       g_strdup_printf ("QTWrapper SCAudio wrapper for decoder: %s",
       GST_STR_NULL (info));
-  details.author =
+  gst_element_class_set_details_simple (element_class,
+      longname "Codec/Decoder/Audio", description,
       "Fluendo <gstreamer@fluendo.com>, "
-      "Pioneers of the Inevitable <songbird@songbirdnest.com>";
-  gst_element_class_set_details (element_class, &details);
+      "Pioneers of the Inevitable <songbird@songbirdnest.com>");
 
-  g_free (details.longname);
-  g_free (details.description);
+  g_free (longname);
+  g_free (description);
   g_free (name);
   g_free (info);
 
diff --git a/sys/qtwrapper/videodecoders.c b/sys/qtwrapper/videodecoders.c
index a9c1c8846..b2e58e968 100644
--- a/sys/qtwrapper/videodecoders.c
+++ b/sys/qtwrapper/videodecoders.c
@@ -138,10 +138,10 @@ static void decompressCb (void *decompressionTrackingRefCon,
 static void
 qtwrapper_video_decoder_base_init (QTWrapperVideoDecoderClass * klass)
 {
-  GstElementDetails details;
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
   gchar *name = NULL;
   gchar *info = NULL;
+  char *longname, *description;
   ComponentDescription desc;
   QTWrapperVideoDecoderParams *params;
 
@@ -153,19 +153,17 @@ qtwrapper_video_decoder_base_init (QTWrapperVideoDecoderClass * klass)
   get_name_info_from_component (params->component, &desc, &name, &info);
 
   /* Fill in details */
-  details.longname =
+  longname =
       g_strdup_printf ("QTWrapper Video Decoder : %s", GST_STR_NULL (name));
-  details.klass = "Codec/Decoder/Video";
-  details.description =
+  description =
       g_strdup_printf ("QTWrapper SCAudio wrapper for decoder: %s",
       GST_STR_NULL (info));
-  details.author =
+  gst_element_class_set_details_simple (element_class, longname,
+      "Codec/Decoder/Video", description,
       "Fluendo <gstreamer@fluendo.com>, "
-      "Pioneers of the Inevitable <songbird@songbirdnest.com>";
-  gst_element_class_set_details (element_class, &details);
-
-  g_free (details.longname);
-  g_free (details.description);
+      "Pioneers of the Inevitable <songbird@songbirdnest.com>");
+  g_free (longname);
+  g_free (description);
   g_free (name);
   g_free (info);
 
diff --git a/sys/vcd/vcdsrc.c b/sys/vcd/vcdsrc.c
index a96efd70b..938b1b19e 100644
--- a/sys/vcd/vcdsrc.c
+++ b/sys/vcd/vcdsrc.c
@@ -36,12 +36,6 @@
 
 #include "vcdsrc.h"
 
-static const GstElementDetails gst_vcdsrc_details =
-GST_ELEMENT_DETAILS ("VCD Source",
-    "Source/File",
-    "Asynchronous read from VCD disk",
-    "Erik Walthinsen <omega@cse.ogi.edu>");
-
 /* VCDSrc signals and args */
 enum
 {
@@ -99,7 +93,9 @@ gst_vcdsrc_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_set_details (element_class, &gst_vcdsrc_details);
+  gst_element_class_set_details_simple (element_class, "VCD Source",
+      "Source/File",
+      "Asynchronous read from VCD disk", "Erik Walthinsen <omega@cse.ogi.edu>");
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&srctemplate));
diff --git a/sys/wasapi/gstwasapisink.c b/sys/wasapi/gstwasapisink.c
index f26e56d6d..3a3d9e906 100644
--- a/sys/wasapi/gstwasapisink.c
+++ b/sys/wasapi/gstwasapisink.c
@@ -64,16 +64,13 @@ static void
 gst_wasapi_sink_base_init (gpointer gclass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
-  static GstElementDetails element_details = {
-    "WasapiSrc",
-    "Sink/Audio",
-    "Stream audio to an audio capture device through WASAPI",
-    "Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>"
-  };
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&sink_template));
-  gst_element_class_set_details (element_class, &element_details);
+  gst_element_class_set_details_simple (element_class, "WasapiSrc",
+      "Sink/Audio",
+      "Stream audio to an audio capture device through WASAPI",
+      "Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>");
 }
 
 static void
diff --git a/sys/wasapi/gstwasapisrc.c b/sys/wasapi/gstwasapisrc.c
index 0a0edd2b7..7d04d0518 100644
--- a/sys/wasapi/gstwasapisrc.c
+++ b/sys/wasapi/gstwasapisrc.c
@@ -68,16 +68,13 @@ static void
 gst_wasapi_src_base_init (gpointer gclass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
-  static GstElementDetails element_details = {
-    "WasapiSrc",
-    "Source/Audio",
-    "Stream audio from an audio capture device through WASAPI",
-    "Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>"
-  };
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
-  gst_element_class_set_details (element_class, &element_details);
+  gst_element_class_set_details_simple (element_class, "WasapiSrc",
+      "Source/Audio",
+      "Stream audio from an audio capture device through WASAPI",
+      "Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>");
 }
 
 static void
diff --git a/sys/winks/gstksvideosrc.c b/sys/winks/gstksvideosrc.c
index ed1916226..e9053f15e 100644
--- a/sys/winks/gstksvideosrc.c
+++ b/sys/winks/gstksvideosrc.c
@@ -154,15 +154,12 @@ static void
 gst_ks_video_src_base_init (gpointer gclass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
-  static GstElementDetails element_details = {
-    "KsVideoSrc",
-    "Source/Video",
-    "Stream data from a video capture device through Windows kernel streaming",
-    "Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>\n"
-        "Haakon Sporsheim <hakon.sporsheim@tandberg.com>"
-  };
-
-  gst_element_class_set_details (element_class, &element_details);
+
+  gst_element_class_set_details (element_class, "KsVideoSrc",
+      "Source/Video",
+      "Stream data from a video capture device through Windows kernel streaming",
+      "Ole André Vadla Ravnås <ole.andre.ravnas@tandberg.com>, "
+      "Haakon Sporsheim <hakon.sporsheim@tandberg.com>");
 
   gst_element_class_add_pad_template (element_class,
       gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
diff --git a/sys/winscreencap/gstdx9screencapsrc.c b/sys/winscreencap/gstdx9screencapsrc.c
index c14f8d942..83bcea277 100644
--- a/sys/winscreencap/gstdx9screencapsrc.c
+++ b/sys/winscreencap/gstdx9screencapsrc.c
@@ -48,13 +48,6 @@
 
 GST_DEBUG_CATEGORY_STATIC (dx9screencapsrc_debug);
 
-static const GstElementDetails gst_dx9screencapsrc_details = {
-  "DirectX 9 screen capture source",
-  "Source/Video",
-  "Captures screen",
-  "Haakon Sporsheim <hakon.sporsheim@tandberg.com>"
-};
-
 #define GST_VIDEO_ALPHA_MASK_15_INT  0x8000
 
 static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
@@ -111,7 +104,9 @@ gst_dx9screencapsrc_base_init (gpointer klass)
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
 
-  gst_element_class_set_details (element_class, &gst_dx9screencapsrc_details);
+  gst_element_class_set_details_simple (element_class,
+      "DirectX 9 screen capture source", "Source/Video", "Captures screen",
+      "Haakon Sporsheim <hakon.sporsheim@tandberg.com>");
 }
 
 static void
@@ -461,9 +456,10 @@ gst_dx9screencapsrc_start (GstBaseSrc * bsrc)
   if (FAILED (res))
     return FALSE;
 
-  return SUCCEEDED (IDirect3DDevice9_CreateOffscreenPlainSurface (src->
-          d3d9_device, src->disp_mode.Width, src->disp_mode.Height,
-          D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &src->surface, NULL));
+  return
+      SUCCEEDED (IDirect3DDevice9_CreateOffscreenPlainSurface (src->d3d9_device,
+          src->disp_mode.Width, src->disp_mode.Height, D3DFMT_A8R8G8B8,
+          D3DPOOL_SYSTEMMEM, &src->surface, NULL));
 }
 
 static gboolean
diff --git a/sys/winscreencap/gstgdiscreencapsrc.c b/sys/winscreencap/gstgdiscreencapsrc.c
index b0109fbd9..3ead8a9a4 100644
--- a/sys/winscreencap/gstgdiscreencapsrc.c
+++ b/sys/winscreencap/gstgdiscreencapsrc.c
@@ -51,13 +51,6 @@
 
 GST_DEBUG_CATEGORY_STATIC (gdiscreencapsrc_debug);
 
-static const GstElementDetails gst_gdiscreencapsrc_details = {
-  "GDI screen capture source",
-  "Source/Video",
-  "Captures screen",
-  "Haakon Sporsheim <hakon.sporsheim@tandberg.com>"
-};
-
 static GstStaticPadTemplate src_template =
 GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
     GST_STATIC_CAPS (GST_VIDEO_CAPS_BGR));
@@ -106,7 +99,9 @@ gst_gdiscreencapsrc_base_init (gpointer klass)
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&src_template));
-  gst_element_class_set_details (element_class, &gst_gdiscreencapsrc_details);
+  gst_element_class_set_details_simple (element_class,
+      "GDI screen capture source", "Source/Video", "Captures screen",
+      "Haakon Sporsheim <hakon.sporsheim@tandberg.com>");
 }
 
 static void