From c31cccf01ca4b18da57daaf5eae2db63950f4cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Tue, 11 Dec 2007 12:58:07 +0100
Subject: Update all demux plugins to the new identifier/description interface.
 Add _() where missing, for i18n.

---
 src/demuxers/demux_4xm.c        | 12 ++----------
 src/demuxers/demux_aac.c        | 12 ++----------
 src/demuxers/demux_ac3.c        | 12 ++----------
 src/demuxers/demux_aiff.c       | 12 ++----------
 src/demuxers/demux_asf.c        | 12 ++----------
 src/demuxers/demux_aud.c        | 12 ++----------
 src/demuxers/demux_avi.c        | 13 ++-----------
 src/demuxers/demux_cdda.c       | 12 ++----------
 src/demuxers/demux_dts.c        | 12 ++----------
 src/demuxers/demux_eawve.c      | 12 ++----------
 src/demuxers/demux_elem.c       | 12 ++----------
 src/demuxers/demux_film.c       | 12 ++----------
 src/demuxers/demux_flac.c       | 12 ++----------
 src/demuxers/demux_fli.c        | 12 ++----------
 src/demuxers/demux_flv.c        | 12 ++----------
 src/demuxers/demux_idcin.c      | 12 ++----------
 src/demuxers/demux_iff.c        | 12 ++----------
 src/demuxers/demux_image.c      | 12 ++----------
 src/demuxers/demux_ipmovie.c    | 12 ++----------
 src/demuxers/demux_matroska.c   | 15 ++-------------
 src/demuxers/demux_mng.c        | 12 ++----------
 src/demuxers/demux_mod.c        | 12 ++----------
 src/demuxers/demux_mpc.c        | 12 ++----------
 src/demuxers/demux_mpeg.c       | 12 ++----------
 src/demuxers/demux_mpeg_block.c | 12 ++----------
 src/demuxers/demux_mpeg_pes.c   | 12 ++----------
 src/demuxers/demux_mpgaudio.c   | 12 ++----------
 src/demuxers/demux_nsv.c        | 12 ++----------
 src/demuxers/demux_playlist.c   | 12 ++----------
 src/demuxers/demux_pva.c        | 12 ++----------
 src/demuxers/demux_qt.c         | 12 ++----------
 src/demuxers/demux_rawdv.c      | 12 ++----------
 src/demuxers/demux_real.c       | 12 ++----------
 src/demuxers/demux_realaudio.c  | 12 ++----------
 src/demuxers/demux_roq.c        | 12 ++----------
 src/demuxers/demux_shn.c        | 12 ++----------
 src/demuxers/demux_slave.c      | 12 ++----------
 src/demuxers/demux_smjpeg.c     | 12 ++----------
 src/demuxers/demux_snd.c        | 12 ++----------
 src/demuxers/demux_str.c        | 12 ++----------
 src/demuxers/demux_ts.c         | 12 ++----------
 src/demuxers/demux_tta.c        | 12 ++----------
 src/demuxers/demux_vmd.c        | 12 ++----------
 src/demuxers/demux_voc.c        | 12 ++----------
 src/demuxers/demux_vox.c        | 12 ++----------
 src/demuxers/demux_vqa.c        | 12 ++----------
 src/demuxers/demux_wav.c        | 12 ++----------
 src/demuxers/demux_wc3movie.c   | 12 ++----------
 src/demuxers/demux_yuv4mpeg2.c  | 12 ++----------
 src/demuxers/demux_yuv_frames.c | 12 ++----------
 50 files changed, 100 insertions(+), 504 deletions(-)

diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c
index 24aee1ac4..9e4197652 100644
--- a/src/demuxers/demux_4xm.c
+++ b/src/demuxers/demux_4xm.c
@@ -521,14 +521,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "4X Technologies (4xm) demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "4X Technologies";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "4xm";
 }
@@ -549,8 +541,8 @@ void *demux_fourxm_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_fourxm_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("4X Technologies (4xm) demux plugin");
+  this->demux_class.identifier      = "4X Technologies";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c
index d80413f83..8e65098bc 100644
--- a/src/demuxers/demux_aac.c
+++ b/src/demuxers/demux_aac.c
@@ -308,14 +308,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "ADIF/ADTS AAC demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "AAC";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "aac";
 }
@@ -336,8 +328,8 @@ void *demux_aac_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_aac_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("ADIF/ADTS AAC demux plugin");
+  this->demux_class.identifier      = "AAC";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c
index c0fae275b..86e3082a0 100644
--- a/src/demuxers/demux_ac3.c
+++ b/src/demuxers/demux_ac3.c
@@ -466,14 +466,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Raw AC3 demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "AC3";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "ac3";
 }
@@ -494,8 +486,8 @@ void *demux_ac3_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_ac3_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Raw AC3 demux plugin");
+  this->demux_class.identifier      = "AC3";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c
index 7fcaea70e..27f04bf89 100644
--- a/src/demuxers/demux_aiff.c
+++ b/src/demuxers/demux_aiff.c
@@ -386,14 +386,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "AIFF file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "AIFF";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "aif aiff";
 }
@@ -416,8 +408,8 @@ void *demux_aiff_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_aiff_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("AIFF file demux plugin");
+  this->demux_class.identifier      = "AIFF";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 742fa6541..35c126044 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -2096,14 +2096,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "ASF demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "ASF";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   /* asx, wvx, wax are metafile or playlist */
   return "asf wmv wma asx wvx wax";
@@ -2137,8 +2129,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("ASF demux plugin");
+  this->demux_class.identifier      = "ASF";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c
index 6223a4068..44378d9dc 100644
--- a/src/demuxers/demux_aud.c
+++ b/src/demuxers/demux_aud.c
@@ -318,14 +318,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Westwood Studios AUD file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "Westwood Studios AUD";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "aud";
 }
@@ -346,8 +338,8 @@ void *demux_aud_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_aud_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Westwood Studios AUD file demux plugin");
+  this->demux_class.identifier      = "Westwood Studios AUD";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 544c19d76..5e8e44168 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -2310,15 +2310,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 /*
  * demux avi class
  */
-
-static const char *get_description (demux_class_t *this_gen) {
-  return "AVI/RIFF demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "AVI";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "avi";
 }
@@ -2340,8 +2331,8 @@ static void *init_class (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_avi_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("AVI/RIFF demux plugin");
+  this->demux_class.identifier      = "AVI";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c
index 0f34a7cec..8946bdb44 100644
--- a/src/demuxers/demux_cdda.c
+++ b/src/demuxers/demux_cdda.c
@@ -225,14 +225,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "CD Digital Audio demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "CDDA";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return NULL;
 }
@@ -253,8 +245,8 @@ void *demux_cdda_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_cdda_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("CD Digital Audio demux plugin");
+  this->demux_class.identifier      = "CDDA";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c
index 7c9b47fcd..d39d8a234 100644
--- a/src/demuxers/demux_dts.c
+++ b/src/demuxers/demux_dts.c
@@ -393,14 +393,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Raw DTS demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "DTS";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "dts";
 }
@@ -421,8 +413,8 @@ void *demux_dts_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_dts_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Raw DTS demux plugin");
+  this->demux_class.identifier      = "DTS";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c
index 2359d3baf..7dd8757b3 100644
--- a/src/demuxers/demux_eawve.c
+++ b/src/demuxers/demux_eawve.c
@@ -398,14 +398,6 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre
   return &this->demux_plugin;
 }
 
-static const char *get_description(demux_class_t *this_gen){
-  return "Electronics Arts WVE format demux plugin";
-}
-
-static const char *get_identifier(demux_class_t *this_gen){
-  return "EA WVE";
-}
-
 static const char *get_extensions(demux_class_t *this_gen){
   return "wve";
 }
@@ -424,8 +416,8 @@ void *demux_eawve_init_plugin(xine_t *xine, void *data) {
   this = xine_xmalloc(sizeof(demux_eawve_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Electronics Arts WVE format demux plugin");
+  this->demux_class.identifier      = "EA WVE";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index d0a821504..49e802daa 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -259,14 +259,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Elementary MPEG stream demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "MPEG_ELEM";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "mpv";
 }
@@ -287,8 +279,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_mpeg_elem_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Elementary MPEG stream demux plugin");
+  this->demux_class.identifier      = "MPEG_ELEM";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 26a7a9713..585bd5ccb 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -902,14 +902,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "FILM (CPK) demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "FILM (CPK)";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "cpk cak film";
 }
@@ -930,8 +922,8 @@ void *demux_film_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_film_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("FILM (CPK) demux plugin");
+  this->demux_class.identifier      = "FILM (CPK)";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c
index 9bf78ff38..3698bfcf0 100644
--- a/src/demuxers/demux_flac.c
+++ b/src/demuxers/demux_flac.c
@@ -530,14 +530,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Free Lossless Audio Codec (flac) demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "FLAC";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "flac";
 }
@@ -558,8 +550,8 @@ void *demux_flac_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_flac_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Free Lossless Audio Codec (flac) demux plugin");
+  this->demux_class.identifier      = "FLAC";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index 99843a68c..dd82bf12e 100644
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -352,14 +352,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Autodesk Animator FLI/FLC demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "FLI/FLC";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "fli flc";
 }
@@ -380,8 +372,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_fli_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Autodesk Animator FLI/FLC demux plugin");
+  this->demux_class.identifier      = "FLI/FLC";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c
index adb29d69d..a8317f0be 100644
--- a/src/demuxers/demux_flv.c
+++ b/src/demuxers/demux_flv.c
@@ -879,14 +879,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Flash Video file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "FLV";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "flv";
 }
@@ -907,8 +899,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_flv_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Flash Video file demux plugin");
+  this->demux_class.identifier      = "FLV";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
index 11cb8cb9e..a295fc39c 100644
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -523,14 +523,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 }
 
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Id Quake II Cinematic file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "Id CIN";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "cin";
 }
@@ -551,8 +543,8 @@ void *demux_idcin_init_plugin (xine_t *xine, void *data) {
   this         = xine_xmalloc (sizeof (demux_idcin_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Id Quake II Cinematic file demux plugin");
+  this->demux_class.identifier      = "Id CIN";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c
index d914405db..30d8ed5b7 100644
--- a/src/demuxers/demux_iff.c
+++ b/src/demuxers/demux_iff.c
@@ -1283,14 +1283,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "IFF demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "IFF";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "iff svx 8svx 16sv ilbm ham ham6 ham8 anim anim3 anim5 anim7 anim8";
 }
@@ -1318,8 +1310,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_iff_class_t));
 
   this->demux_class.open_plugin         = open_plugin;
-  this->demux_class.get_description     = get_description;
-  this->demux_class.get_identifier      = get_identifier;
+  this->demux_class.description         = _("IFF demux plugin");
+  this->demux_class.identifier          = "IFF";
   this->demux_class.get_mimetypes       = get_mimetypes;
   this->demux_class.get_extensions      = get_extensions;
   this->demux_class.dispose             = class_dispose;
diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c
index 9f53e4173..741a4c17c 100644
--- a/src/demuxers/demux_image.c
+++ b/src/demuxers/demux_image.c
@@ -223,14 +223,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
  * image demuxer class
  */
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "image demux plugin";
-}
- 
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "imagedmx";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "png gif jpg jpeg";
 }
@@ -252,8 +244,8 @@ static void *init_class (xine_t *xine, void *data) {
   this  = xine_xmalloc (sizeof (demux_image_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("image demux plugin");
+  this->demux_class.identifier      = "imagedmx";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c
index cd21896c0..d78877b62 100644
--- a/src/demuxers/demux_ipmovie.c
+++ b/src/demuxers/demux_ipmovie.c
@@ -721,14 +721,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Interplay MVE Movie demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "Interplay MVE";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "mve mv8";
 }
@@ -749,8 +741,8 @@ void *demux_ipmovie_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_ipmovie_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Interplay MVE Movie demux plugin");
+  this->demux_class.identifier      = "Interplay MVE";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index 0169651a0..e00efb426 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -2861,17 +2861,6 @@ error:
 /*
  * demux matroska class
  */
-
-static const char *get_description (demux_class_t *this_gen) {
-  return "matroska demux plugin";
-}
-
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "matroska";
-}
-
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "mkv";
 }
@@ -2897,8 +2886,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("matroska demux plugin");
+  this->demux_class.identifier      = "matroska";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c
index 12da8ca86..ca1fc0108 100644
--- a/src/demuxers/demux_mng.c
+++ b/src/demuxers/demux_mng.c
@@ -334,14 +334,6 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre
   return &this->demux_plugin;
 }
 
-static const char *get_description(demux_class_t *this_gen){
-  return "Multiple-image Network Graphics demux plugin";
-}
-
-static const char *get_identifier(demux_class_t *this_gen){
-  return "MNG";
-}
-
 static const char *get_extensions(demux_class_t *this_gen){
   return "png mng";
 }
@@ -363,8 +355,8 @@ static void *init_plugin(xine_t *xine, void *data){
   this  = xine_xmalloc (sizeof (demux_mng_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Multiple-image Network Graphics demux plugin");
+  this->demux_class.identifier      = "MNG";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c
index 397a952c0..4c15c7c6d 100644
--- a/src/demuxers/demux_mod.c
+++ b/src/demuxers/demux_mod.c
@@ -352,14 +352,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "ModPlug Amiga MOD Music file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "mod";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "mod it stm s3m 669 amf med mdl xm";
 }
@@ -380,8 +372,8 @@ static void *demux_mod_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_mod_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("ModPlug Amiga MOD Music file demux plugin");
+  this->demux_class.identifier      = "mod";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c
index 346f0c2e6..a8fb500e3 100644
--- a/src/demuxers/demux_mpc.c
+++ b/src/demuxers/demux_mpc.c
@@ -372,14 +372,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Musepack demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "Musepack";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "mpc mp+";
 }
@@ -400,8 +392,8 @@ void *demux_mpc_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_mpc_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Musepack demux plugin");
+  this->demux_class.identifier      = "Musepack";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 4419f8404..72fe97473 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -1220,14 +1220,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "MPEG program stream demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "MPEG";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "mpg mpeg";
 }
@@ -1249,8 +1241,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_mpeg_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("MPEG program stream demux plugin");
+  this->demux_class.identifier      = "MPEG";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 32638129d..e9f7226ee 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -1513,14 +1513,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "DVD/VOB demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "MPEG_BLOCK";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "vob";
 }
@@ -1545,8 +1537,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("DVD/VOB demux plugin");
+  this->demux_class.identifier      = "MPEG_BLOCK";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index 423da5e24..85a8fa14d 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -1760,14 +1760,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "mpeg pes demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "MPEG_PES";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "pes";
 }
@@ -1791,8 +1783,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("mpeg pes demux plugin");
+  this->demux_class.identifier      = "MPEG_PES";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 9c997c9f5..6bfa0d770 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -1031,14 +1031,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
  * demux mpegaudio class
  */
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "MPEG audio demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "MPEGAUDIO";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   demux_mpgaudio_class_t *this = (demux_mpgaudio_class_t *) this_gen;
   
@@ -1081,8 +1073,8 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("MPEG audio demux plugin");
+  this->demux_class.identifier      = "MPEGAUDIO";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c
index 44bb18c79..88d4c6ea5 100644
--- a/src/demuxers/demux_nsv.c
+++ b/src/demuxers/demux_nsv.c
@@ -643,14 +643,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Nullsoft Video demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "Nullsoft NSV";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "nsv";
 }
@@ -671,8 +663,8 @@ static void *demux_nsv_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_nsv_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Nullsoft Video demux plugin");
+  this->demux_class.identifier      = "Nullsoft NSV";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c
index bbe6998e6..138c0491d 100644
--- a/src/demuxers/demux_playlist.c
+++ b/src/demuxers/demux_playlist.c
@@ -686,14 +686,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Playlist demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "playlist";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "m3u ram pls asx wax wvx smi smil qtl xspf rss";
 }
@@ -723,8 +715,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof(demux_playlist_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Playlist demux plugin");
+  this->demux_class.identifier      = "playlist";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c
index 298d936b5..0100c19b8 100644
--- a/src/demuxers/demux_pva.c
+++ b/src/demuxers/demux_pva.c
@@ -478,14 +478,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "TechnoTrend PVA demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "TechnoTrend PVA";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "pva";
 }
@@ -506,8 +498,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_pva_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("TechnoTrend PVA demux plugin");
+  this->demux_class.identifier      = "TechnoTrend PVA";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 89d0283ac..4bc9eb890 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -3122,14 +3122,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Apple Quicktime (MOV) and MPEG-4 demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "MOV/MPEG-4";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "mov qt mp4 m4a m4b";
 }
@@ -3157,8 +3149,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = ("Apple Quicktime (MOV) and MPEG-4 demux plugin");
+  this->demux_class.identifier      = "MOV/MPEG-4";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c
index 2d21f080d..db59e831e 100644
--- a/src/demuxers/demux_rawdv.c
+++ b/src/demuxers/demux_rawdv.c
@@ -411,14 +411,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Raw DV Video stream";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "raw_dv";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "dv dif";
 }
@@ -439,8 +431,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_raw_dv_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Raw DV Video stream");
+  this->demux_class.identifier      = "raw_dv";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 60fa91451..4a5b2cae7 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -1616,14 +1616,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "RealMedia file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "Real";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "rm rmvb ram";
 }
@@ -1647,8 +1639,8 @@ static void *init_class (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_real_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("RealMedia file demux plugin");
+  this->demux_class.identifier      = "Real";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c
index 1e7c3c7de..c24a8c247 100644
--- a/src/demuxers/demux_realaudio.c
+++ b/src/demuxers/demux_realaudio.c
@@ -377,14 +377,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "RealAudio file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "RA";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "ra";
 }
@@ -405,8 +397,8 @@ void *demux_realaudio_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_ra_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("RealAudio file demux plugin");
+  this->demux_class.identifier      = "RA";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index 18edaea87..0c89d9b5a 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -460,14 +460,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Id RoQ file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "RoQ";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "roq";
 }
@@ -488,8 +480,8 @@ void *demux_roq_init_plugin (xine_t *xine, void *data) {
   this  = xine_xmalloc (sizeof (demux_roq_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Id RoQ file demux plugin");
+  this->demux_class.identifier      = "RoQ";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c
index 87324ab45..19b55cd20 100644
--- a/src/demuxers/demux_shn.c
+++ b/src/demuxers/demux_shn.c
@@ -228,14 +228,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Shorten demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "Shorten";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "shn";
 }
@@ -256,8 +248,8 @@ void *demux_shn_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_shn_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Shorten demux plugin");
+  this->demux_class.identifier      = "Shorten";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c
index 436d37579..22eed6973 100644
--- a/src/demuxers/demux_slave.c
+++ b/src/demuxers/demux_slave.c
@@ -389,14 +389,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "slave";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "";
 }
@@ -417,8 +409,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_slave_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = "";
+  this->demux_class.identifier      = "slave";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 899fbf7e3..a715f2309 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -449,14 +449,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "SMJPEG file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "SMJPEG";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "mjpg";
 }
@@ -477,8 +469,8 @@ void *demux_smjpeg_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_smjpeg_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("SMJPEG file demux plugin");
+  this->demux_class.identifier      = "SMJPEG";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c
index 0965a75ae..79b7412e7 100644
--- a/src/demuxers/demux_snd.c
+++ b/src/demuxers/demux_snd.c
@@ -367,14 +367,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "SND/AU file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "SND/AU";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "snd au";
 }
@@ -398,8 +390,8 @@ void *demux_snd_init_plugin (xine_t *xine, void *data) {
   this  = xine_xmalloc (sizeof (demux_snd_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("SND/AU file demux plugin");
+  this->demux_class.identifier      = "SND/AU";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index 2cf542014..51a2b324d 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -603,14 +603,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Sony Playstation STR file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "PSX STR";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   /* also .mov, but we don't want to hijack that extension */
   return "str iki ik2 dps dat xa xa1 xa2 xas xap";
@@ -631,8 +623,8 @@ void *demux_str_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_str_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Sony Playstation STR file demux plugin");
+  this->demux_class.identifier      = "PSX STR";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 19826bf71..f4a0a1b10 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -2263,14 +2263,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
  * ts demuxer class
  */
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "MPEG Transport Stream demuxer";
-}
- 
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "MPEG_TS";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "ts m2t trp";
 }
@@ -2295,8 +2287,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("MPEG Transport Stream demuxer");
+  this->demux_class.identifier      = "MPEG_TS";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c
index 9b2730018..0d8efd10d 100644
--- a/src/demuxers/demux_tta.c
+++ b/src/demuxers/demux_tta.c
@@ -281,14 +281,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "True Audio demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "True Audio";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "tta";
 }
@@ -309,8 +301,8 @@ void *demux_tta_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_tta_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("True Audio demux plugin");
+  this->demux_class.identifier      = "True Audio";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c
index 8b0087417..f83e1976d 100644
--- a/src/demuxers/demux_vmd.c
+++ b/src/demuxers/demux_vmd.c
@@ -470,14 +470,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Sierra VMD file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "VMD";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "vmd";
 }
@@ -498,8 +490,8 @@ void *demux_vmd_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_vmd_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Sierra VMD file demux plugin");
+  this->demux_class.identifier      = "VMD";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
index 0439980f8..1b38e2116 100644
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -345,14 +345,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "VOC file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "VOC";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "voc";
 }
@@ -373,8 +365,8 @@ void *demux_voc_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_voc_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("VOC file demux plugin");
+  this->demux_class.identifier      = "VOC";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c
index 3ce2ad705..d68bcc0d6 100644
--- a/src/demuxers/demux_vox.c
+++ b/src/demuxers/demux_vox.c
@@ -222,14 +222,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Dialogic VOX file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "VOX";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "vox";
 }
@@ -250,8 +242,8 @@ void *demux_vox_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_vox_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Dialogic VOX file demux plugin");
+  this->demux_class.identifier      = "VOX";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c
index 40242476b..f06a936af 100644
--- a/src/demuxers/demux_vqa.c
+++ b/src/demuxers/demux_vqa.c
@@ -383,14 +383,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Westwood Studios VQA file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "VQA";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "vqa";
 }
@@ -411,8 +403,8 @@ void *demux_vqa_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_vqa_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Westwood Studios VQA file demux plugin");
+  this->demux_class.identifier      = "VQA";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c
index 9b46336fe..8647d12ae 100644
--- a/src/demuxers/demux_wav.c
+++ b/src/demuxers/demux_wav.c
@@ -391,14 +391,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "WAV file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "WAV";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "wav";
 }
@@ -422,8 +414,8 @@ void *demux_wav_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_wav_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("WAV file demux plugin");
+  this->demux_class.identifier      = "WAV";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c
index a69c6b46a..34f0b6a8b 100644
--- a/src/demuxers/demux_wc3movie.c
+++ b/src/demuxers/demux_wc3movie.c
@@ -714,14 +714,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "Wing Commander III Movie (MVE) demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "WC3 Movie";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "mve";
 }
@@ -742,8 +734,8 @@ void *demux_wc3movie_init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_mve_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("Wing Commander III Movie (MVE) demux plugin");
+  this->demux_class.identifier      = "WC3 Movie";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c
index 9c5856710..b44e9719d 100644
--- a/src/demuxers/demux_yuv4mpeg2.c
+++ b/src/demuxers/demux_yuv4mpeg2.c
@@ -452,14 +452,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "YUV4MPEG2 file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "YUV4MPEG2";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "y4m";
 }
@@ -480,8 +472,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_yuv4mpeg2_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("YUV4MPEG2 file demux plugin");
+  this->demux_class.identifier      = "YUV4MPEG2";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c
index 774329c05..661f10342 100644
--- a/src/demuxers/demux_yuv_frames.c
+++ b/src/demuxers/demux_yuv_frames.c
@@ -228,14 +228,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
  * demuxer class
  */
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "YUV frames dummy demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "YUV_FRAMES";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return NULL;
 }
@@ -256,8 +248,8 @@ static void *init_class (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_yuv_frames_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.description     = _("YUV frames dummy demux plugin");
+  this->demux_class.identifier      = "YUV_FRAMES";
   this->demux_class.get_mimetypes   = get_mimetypes;
   this->demux_class.get_extensions  = get_extensions;
   this->demux_class.dispose         = class_dispose;
-- 
cgit v1.2.3