Update all misc plugins to the new identifier/description interface. Add _() where missing, for i18n.

22 files changed, 53 insertions, 269 deletions

diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index 139939d8e..ac0908266 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.c
@@ -80,8 +80,6 @@ const plugin_info_t xine_plugin_info[] EXPORTED = {
 
 /* plugin class functions */
 static spu_decoder_t *dxr3_spudec_open_plugin(spu_decoder_class_t *class_gen, xine_stream_t *stream);
-static char          *dxr3_spudec_get_identifier(spu_decoder_class_t *class_gen);
-static char          *dxr3_spudec_get_description(spu_decoder_class_t *class_gen);
 static void           dxr3_spudec_class_dispose(spu_decoder_class_t *class_gen);
 
 /* plugin instance functions */
@@ -155,8 +153,8 @@ static inline int dxr3_present(xine_stream_t *stream)
     node = (plugin_node_t *)stream->video_driver->node;
     if (node->plugin_class) {
       vo_class = (video_driver_class_t *)node->plugin_class;
-      if (vo_class->get_identifier)
-        present = (strcmp(vo_class->get_identifier(vo_class), DXR3_VO_ID) == 0);
+      if (vo_class->identifier)
+        present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0);
     }
   }
   llprintf(LOG_SPU, "dxr3 %s\n", present ? "present" : "not present");
@@ -202,8 +200,8 @@ static void *dxr3_spudec_init_plugin(xine_t *xine, void* data)
   if (!this) return NULL;
   
   this->spu_decoder_class.open_plugin     = dxr3_spudec_open_plugin;
-  this->spu_decoder_class.get_identifier  = dxr3_spudec_get_identifier;
-  this->spu_decoder_class.get_description = dxr3_spudec_get_description;
+  this->spu_decoder_class.identifier      = "dxr3-spudec";
+  this->spu_decoder_class.description     = _("subtitle decoder plugin using the hardware decoding capabilities of a DXR3 decoder card");
   this->spu_decoder_class.dispose         = dxr3_spudec_class_dispose;
   
   this->instance                          = 0;
@@ -275,16 +273,6 @@ static spu_decoder_t *dxr3_spudec_open_plugin(spu_decoder_class_t *class_gen, xi
   return &this->spu_decoder;
 }
 
-static char *dxr3_spudec_get_identifier(spu_decoder_class_t *class_gen)
-{
-  return "dxr3-spudec";
-}
-
-static char *dxr3_spudec_get_description(spu_decoder_class_t *class_gen)
-{
-  return "subtitle decoder plugin using the hardware decoding capabilities of a DXR3 decoder card";
-}
-
 static void dxr3_spudec_class_dispose(spu_decoder_class_t *class_gen)
 {
   free(class_gen);
diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c
index 3f1c273ff..71c7fe8d7 100644
--- a/src/dxr3/dxr3_decode_video.c
+++ b/src/dxr3/dxr3_decode_video.c
@@ -81,8 +81,6 @@ const plugin_info_t xine_plugin_info[] EXPORTED = {
 
 /* plugin class functions */
 static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_stream_t *stream);
-static char            *dxr3_get_identifier(video_decoder_class_t *class_gen);
-static char            *dxr3_get_description(video_decoder_class_t *class_gen);
 static void             dxr3_class_dispose(video_decoder_class_t *class_gen);
 
 /* plugin instance functions */
@@ -169,8 +167,8 @@ static inline int dxr3_present(xine_stream_t *stream)
     node = (plugin_node_t *)stream->video_driver->node;
     if (node->plugin_class) {
       vo_class = (video_driver_class_t *)node->plugin_class;
-      if (vo_class->get_identifier)
-        present = (strcmp(vo_class->get_identifier(vo_class), DXR3_VO_ID) == 0);
+      if (vo_class->identifier)
+        present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0);
     }
   }
   llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present");
@@ -197,8 +195,8 @@ static void *dxr3_init_plugin(xine_t *xine, void *data)
   if (!this) return NULL;
   
   this->video_decoder_class.open_plugin     = dxr3_open_plugin;
-  this->video_decoder_class.get_identifier  = dxr3_get_identifier;
-  this->video_decoder_class.get_description = dxr3_get_description;
+  this->video_decoder_class.identifier      = "dxr3-mpeg2";
+  this->video_decoder_class.description     = _("MPEGI/II decoder plugin using the hardware decoding capabilities of a DXR3 decoder card.");
   this->video_decoder_class.dispose         = dxr3_class_dispose;
   
   this->instance                            = 0;
@@ -299,16 +297,6 @@ static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_
   return &this->video_decoder;
 }
 
-static char *dxr3_get_identifier(video_decoder_class_t *class_gen)
-{
-  return "dxr3-mpeg2";
-}
-
-static char *dxr3_get_description(video_decoder_class_t *class_gen)
-{
-  return "MPEGI/II decoder plugin using the hardware decoding capabilities of a DXR3 decoder card.";
-}
-
 static void dxr3_class_dispose(video_decoder_class_t *class_gen)
 {
   free(class_gen);
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 73eb133e1..c8b95febd 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -101,8 +101,6 @@ const plugin_info_t      xine_plugin_info[] EXPORTED = {
 
 /* plugin class functions */
 static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const void *visual);
-static char        *dxr3_vo_get_identifier(video_driver_class_t *class_gen);
-static char        *dxr3_vo_get_description(video_driver_class_t *class_gen);
 static void         dxr3_vo_class_dispose(video_driver_class_t *class_gen);
 
 /* plugin instance functions */
@@ -176,8 +174,8 @@ static dxr3_driver_class_t *dxr3_vo_init_plugin(xine_t *xine, void *visual_gen)
     CONF_KEY, 0, CONF_NAME, CONF_HELP, 10, NULL, NULL);
 
   this->video_driver_class.open_plugin     = dxr3_vo_open_plugin;
-  this->video_driver_class.get_identifier  = dxr3_vo_get_identifier;
-  this->video_driver_class.get_description = dxr3_vo_get_description;
+  this->video_driver_class.identifier      = DXR3_VO_ID;
+  this->video_driver_class.description     = _("video output plugin displaying images through your DXR3 decoder card");
   this->video_driver_class.dispose         = dxr3_vo_class_dispose;
   
   this->xine                               = xine;
@@ -189,16 +187,6 @@ static dxr3_driver_class_t *dxr3_vo_init_plugin(xine_t *xine, void *visual_gen)
   return this;
 }
 
-static char *dxr3_vo_get_identifier(video_driver_class_t *class_gen)
-{
-  return DXR3_VO_ID;
-}
-
-static char *dxr3_vo_get_description(video_driver_class_t *class_gen)
-{
-  return "video output plugin displaying images through your DXR3 decoder card";
-}
-
 static void dxr3_vo_class_dispose(video_driver_class_t *class_gen)
 {
   dxr3_driver_class_t *class = (dxr3_driver_class_t *)class_gen;
diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c
index b9762c66b..bbfb07c6e 100644
--- a/src/libffmpeg/ff_audio_decoder.c
+++ b/src/libffmpeg/ff_audio_decoder.c
@@ -415,14 +415,6 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen,
   return &this->audio_decoder;
 }
 
-static char *ff_audio_get_identifier (audio_decoder_class_t *this) {
-  return "ffmpeg audio";
-}
-
-static char *ff_audio_get_description (audio_decoder_class_t *this) {
-  return "ffmpeg based audio decoder plugin";
-}
-
 static void ff_audio_dispose_class (audio_decoder_class_t *this) {
   free (this);
 }
@@ -434,8 +426,8 @@ void *init_audio_plugin (xine_t *xine, void *data) {
   this = (ff_audio_class_t *) xine_xmalloc (sizeof (ff_audio_class_t));
 
   this->decoder_class.open_plugin     = ff_audio_open_plugin;
-  this->decoder_class.get_identifier  = ff_audio_get_identifier;
-  this->decoder_class.get_description = ff_audio_get_description;
+  this->decoder_class.identifier      = "ffmpeg audio";
+  this->decoder_class.description     = _("ffmpeg based audio decoder plugin");
   this->decoder_class.dispose         = ff_audio_dispose_class;
 
   pthread_once( &once_control, init_once_routine );
diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c
index 08ddf4e30..0eb0d2732 100644
--- a/src/libffmpeg/ff_dvaudio_decoder.c
+++ b/src/libffmpeg/ff_dvaudio_decoder.c
@@ -377,14 +377,6 @@ static audio_decoder_t *dvaudio_open_plugin (audio_decoder_class_t *class_gen, x
   return &this->audio_decoder;
 }
 
-static char *dvaudio_get_identifier (audio_decoder_class_t *this) {
-  return "dv audio";
-}
-
-static char *dvaudio_get_description (audio_decoder_class_t *this) {
-  return "dv audio decoder plugin";
-}
-
 static void dvaudio_dispose_class (audio_decoder_class_t *this) {
   free (this);
 }
@@ -396,8 +388,8 @@ static void *init_dvaudio_plugin (xine_t *xine, void *data) {
   this = (dvaudio_class_t *) xine_xmalloc (sizeof (dvaudio_class_t));
 
   this->decoder_class.open_plugin     = dvaudio_open_plugin;
-  this->decoder_class.get_identifier  = dvaudio_get_identifier;
-  this->decoder_class.get_description = dvaudio_get_description;
+  this->decoder_class.identifier      = "dv audio";
+  this->decoder_class.description     = _("dv audio decoder plugin");
   this->decoder_class.dispose         = dvaudio_dispose_class;
 
   return this;
diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c
index df0973030..9b55db919 100644
--- a/src/libffmpeg/ff_video_decoder.c
+++ b/src/libffmpeg/ff_video_decoder.c
@@ -1524,14 +1524,6 @@ static video_decoder_t *ff_video_open_plugin (video_decoder_class_t *class_gen,
   return &this->video_decoder;
 }
 
-static char *ff_video_get_identifier (video_decoder_class_t *this) {
-  return "ffmpeg video";
-}
-
-static char *ff_video_get_description (video_decoder_class_t *this) {
-  return "ffmpeg based video decoder plugin";
-}
-
 static void ff_video_dispose_class (video_decoder_class_t *this) {
   free (this);
 }
@@ -1544,8 +1536,8 @@ void *init_video_plugin (xine_t *xine, void *data) {
   this = (ff_video_class_t *) xine_xmalloc (sizeof (ff_video_class_t));
 
   this->decoder_class.open_plugin     = ff_video_open_plugin;
-  this->decoder_class.get_identifier  = ff_video_get_identifier;
-  this->decoder_class.get_description = ff_video_get_description;
+  this->decoder_class.identifier      = "ffmpeg video";
+  this->decoder_class.description     = _("ffmpeg based video decoder plugin");
   this->decoder_class.dispose         = ff_video_dispose_class;
   this->xine                          = xine;
 
diff --git a/src/libmpeg2/xine_mpeg2_decoder.c b/src/libmpeg2/xine_mpeg2_decoder.c
index 4c4cc8654..ea3af9762 100644
--- a/src/libmpeg2/xine_mpeg2_decoder.c
+++ b/src/libmpeg2/xine_mpeg2_decoder.c
@@ -139,14 +139,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
  * mpeg2 plugin class
  */
 
-static char *get_identifier (video_decoder_class_t *this) {
-  return "mpeg2dec";
-}
-
-static char *get_description (video_decoder_class_t *this) {
-  return "mpeg2 based video decoder plugin";
-}
-
 static void dispose_class (video_decoder_class_t *this) {
   free (this);
 }
@@ -158,8 +150,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = (mpeg2_class_t *) xine_xmalloc (sizeof (mpeg2_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
-  this->decoder_class.get_identifier  = get_identifier;
-  this->decoder_class.get_description = get_description;
+  this->decoder_class.identifier      = "mpeg2dec";
+  this->decoder_class.description     = _("mpeg2 based video decoder plugin");
   this->decoder_class.dispose         = dispose_class;
 
   return this;
diff --git a/src/libmpeg2new/xine_mpeg2new_decoder.c b/src/libmpeg2new/xine_mpeg2new_decoder.c
index 7ceac9178..8443eca79 100644
--- a/src/libmpeg2new/xine_mpeg2new_decoder.c
+++ b/src/libmpeg2new/xine_mpeg2new_decoder.c
@@ -474,14 +474,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
  * mpeg2 plugin class
  */
 
-static char *get_identifier (video_decoder_class_t *this) {
-  return "mpeg2new";
-}
-
-static char *get_description (video_decoder_class_t *this) {
-  return "mpeg2 based video decoder plugin";
-}
-
 static void dispose_class (video_decoder_class_t *this) {
   free (this);
 }
@@ -493,8 +485,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = (mpeg2_class_t *) xine_xmalloc (sizeof (mpeg2_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
-  this->decoder_class.get_identifier  = get_identifier;
-  this->decoder_class.get_description = get_description;
+  this->decoder_class.identifier      = "mpeg2new";
+  this->decoder_class.description     = _("mpeg2 based video decoder plugin");
   this->decoder_class.dispose         = dispose_class;
 
   return this;
diff --git a/src/libreal/xine_real_audio_decoder.c b/src/libreal/xine_real_audio_decoder.c
index 1b21de2d0..ddf399b54 100644
--- a/src/libreal/xine_real_audio_decoder.c
+++ b/src/libreal/xine_real_audio_decoder.c
@@ -583,14 +583,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen,
  * real plugin class
  */
 
-static char *get_identifier (audio_decoder_class_t *this) {
-  return "realadec";
-}
-
-static char *get_description (audio_decoder_class_t *this) {
-  return "real binary-only codec based audio decoder plugin";
-}
-
 static void dispose_class (audio_decoder_class_t *this) {
   free (this);
 }
@@ -603,8 +595,8 @@ void *init_realadec (xine_t *xine, void *data) {
   this = (real_class_t *) xine_xmalloc (sizeof (real_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
-  this->decoder_class.get_identifier  = get_identifier;
-  this->decoder_class.get_description = get_description;
+  this->decoder_class.identifier      = "realadec";
+  this->decoder_class.description     = _("real binary-only codec based audio decoder plugin");
   this->decoder_class.dispose         = dispose_class;
 
   _x_real_codecs_init(xine);
diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c
index d68c7390e..7763cf680 100644
--- a/src/libreal/xine_real_video_decoder.c
+++ b/src/libreal/xine_real_video_decoder.c
@@ -511,14 +511,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
  * real plugin class
  */
 
-static char *get_identifier (video_decoder_class_t *this) {
-  return "realvdec";
-}
-
-static char *get_description (video_decoder_class_t *this) {
-  return "real binary-only codec based video decoder plugin";
-}
-
 static void dispose_class (video_decoder_class_t *this) {
   free (this);
 }
@@ -531,8 +523,8 @@ void *init_realvdec (xine_t *xine, void *data) {
   this = (real_class_t *) xine_xmalloc (sizeof (real_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
-  this->decoder_class.get_identifier  = get_identifier;
-  this->decoder_class.get_description = get_description;
+  this->decoder_class.identifier      = "realvdec";
+  this->decoder_class.description     = _("real binary-only codec based video decoder plugin");
   this->decoder_class.dispose         = dispose_class;
 
   _x_real_codecs_init(xine);
diff --git a/src/libspucc/xine_cc_decoder.c b/src/libspucc/xine_cc_decoder.c
index 9cdb4c4ea..3891fb76a 100644
--- a/src/libspucc/xine_cc_decoder.c
+++ b/src/libspucc/xine_cc_decoder.c
@@ -321,14 +321,6 @@ static spu_decoder_t *spudec_open_plugin (spu_decoder_class_t *class, xine_strea
   return &this->spu_decoder;
 }
 
-static char *spudec_get_identifier(spu_decoder_class_t *class) {
-  return "spucc";
-}
-
-static char *spudec_get_description(spu_decoder_class_t *class) {
-  return "closed caption decoder plugin";
-}
-
 static void spudec_class_dispose(spu_decoder_class_t *class) {
   free(class);
 }
@@ -341,8 +333,8 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) {
   this = (spucc_class_t *) xine_xmalloc (sizeof (spucc_class_t));
 
   this->spu_class.open_plugin      = spudec_open_plugin;
-  this->spu_class.get_identifier   = spudec_get_identifier;
-  this->spu_class.get_description  = spudec_get_description;
+  this->spu_class.identifier       = "spucc";
+  this->spu_class.description      = _("closed caption decoder plugin");
   this->spu_class.dispose          = spudec_class_dispose;
 
   spucc_register_cfg_vars(this, xine->config);
diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/libspucmml/xine_cmml_decoder.c
index b684d21cb..5daf5e7fc 100644
--- a/src/libspucmml/xine_cmml_decoder.c
+++ b/src/libspucmml/xine_cmml_decoder.c
@@ -494,14 +494,6 @@ static void spucmml_class_dispose (spu_decoder_class_t *this) {
   free (this);
 }
 
-static char *spucmml_class_get_identifier (spu_decoder_class_t *this) {
-  return "spucmml";
-}
-
-static char *spucmml_class_get_description (spu_decoder_class_t *this) {
-  return "CMML subtitle decoder plugin";
-}
-
 static void update_src_encoding(void *this_gen, xine_cfg_entry_t *entry)
 {
   spucmml_class_t *this = (spucmml_class_t *)this_gen;
@@ -517,8 +509,8 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) {
   this = (spucmml_class_t *) xine_xmalloc (sizeof (spucmml_class_t));
 
   this->class.open_plugin      = spucmml_class_open_plugin;
-  this->class.get_identifier   = spucmml_class_get_identifier;
-  this->class.get_description  = spucmml_class_get_description;
+  this->class.identifier       = "spucmml";
+  this->class.description      = _("CMML subtitle decoder plugin");
   this->class.dispose          = spucmml_class_dispose;
 
   this->xine                   = xine;
diff --git a/src/libspudec/xine_spu_decoder.c b/src/libspudec/xine_spu_decoder.c
index 0ab91d906..cac5a8d09 100644
--- a/src/libspudec/xine_spu_decoder.c
+++ b/src/libspudec/xine_spu_decoder.c
@@ -350,20 +350,6 @@ static spu_decoder_t *open_plugin (spu_decoder_class_t *class_gen, xine_stream_t
   return &this->spu_decoder;
 }
 
-static char *get_identifier (spu_decoder_class_t *this) {
-#ifdef LOG_DEBUG
-  printf ("libspudec:get_identifier called\n");
-#endif
-  return "spudec";
-}
-
-static char *get_description (spu_decoder_class_t *this) {
-#ifdef LOG_DEBUG
-  printf ("libspudec:get_description called\n");
-#endif
-  return "DVD/VOB SPU decoder plugin";
-}
-
 static void dispose_class (spu_decoder_class_t *this) {
 #ifdef LOG_DEBUG
   printf ("libspudec:dispose_class called\n");
@@ -379,8 +365,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = (spudec_class_t *) xine_xmalloc (sizeof (spudec_class_t));
 
   this->decoder_class.open_plugin     = open_plugin;
-  this->decoder_class.get_identifier  = get_identifier;
-  this->decoder_class.get_description = get_description;
+  this->decoder_class.identifier      = "spudec";
+  this->decoder_class.description     = _("DVD/VOB SPU decoder plugin");
   this->decoder_class.dispose         = dispose_class;
 
   lprintf ("libspudec:init_plugin called\n");
diff --git a/src/libspudvb/xine_spudvb_decoder.c b/src/libspudvb/xine_spudvb_decoder.c
index af9000a0b..29554699a 100644
--- a/src/libspudvb/xine_spudvb_decoder.c
+++ b/src/libspudvb/xine_spudvb_decoder.c
@@ -971,16 +971,6 @@ static void dvb_spu_class_dispose (spu_decoder_class_t * this)
   free (this);
 }
 
-static char *dvb_spu_class_get_identifier (spu_decoder_class_t * this)
-{
-  return "spudvb";
-}
-
-static char *dvb_spu_class_get_description (spu_decoder_class_t * this)
-{
-  return "DVB subtitle decoder plugin";
-}
-
 static void *init_spu_decoder_plugin (xine_t * xine, void *data)
 {
 
@@ -988,8 +978,8 @@ static void *init_spu_decoder_plugin (xine_t * xine, void *data)
   this = (dvb_spu_class_t *) xine_xmalloc (sizeof (dvb_spu_class_t));
 
   this->class.open_plugin = dvb_spu_class_open_plugin;
-  this->class.get_identifier = dvb_spu_class_get_identifier;
-  this->class.get_description = dvb_spu_class_get_description;
+  this->class.identifier  = "spudvb";
+  this->class.description = _("DVB subtitle decoder plugin");
   this->class.dispose = dvb_spu_class_dispose;
 
   this->xine = xine;
diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c
index 502ef6580..161bb10d3 100644
--- a/src/libsputext/demux_sputext.c
+++ b/src/libsputext/demux_sputext.c
@@ -1488,8 +1488,8 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) {
   this = xine_xmalloc (sizeof (demux_sputext_class_t));
 
   this->demux_class.open_plugin     = open_demux_plugin;
-  this->demux_class.get_description = get_demux_description;
-  this->demux_class.get_identifier  = get_demux_identifier;
+  this->demux_class.description     = FLAMEFIXMEget_demux_description;
+  this->demux_class.identifier      = FLAMEFIXMEget_demux_identifier;
   this->demux_class.get_mimetypes   = get_demux_mimetypes;
   this->demux_class.get_extensions  = get_demux_extensions;
   this->demux_class.dispose         = demux_class_dispose;
diff --git a/src/libsputext/xine_sputext_decoder.c b/src/libsputext/xine_sputext_decoder.c
index dabb2dddc..d21e8dd6f 100644
--- a/src/libsputext/xine_sputext_decoder.c
+++ b/src/libsputext/xine_sputext_decoder.c
@@ -887,14 +887,6 @@ static void sputext_class_dispose (spu_decoder_class_t *class_gen) {
   free (this);
 }
 
-static char *sputext_class_get_identifier (spu_decoder_class_t *this) {
-  return "sputext";
-}
-
-static char *sputext_class_get_description (spu_decoder_class_t *this) {
-  return "external subtitle decoder plugin";
-}
-
 static void update_src_encoding(void *class_gen, xine_cfg_entry_t *entry)
 {
   sputext_class_t *class = (sputext_class_t *)class_gen;
@@ -915,8 +907,8 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) {
   this = (sputext_class_t *) xine_xmalloc (sizeof (sputext_class_t));
 
   this->class.open_plugin      = sputext_class_open_plugin;
-  this->class.get_identifier   = sputext_class_get_identifier;
-  this->class.get_description  = sputext_class_get_description;
+  this->class.identifier       = "sputext";
+  this->class.description      = _("external subtitle decoder plugin");
   this->class.dispose          = sputext_class_dispose;
 
   this->xine                   = xine;
diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c
index 3053b2b68..2bb5286b2 100644
--- a/src/libw32dll/qt_decoder.c
+++ b/src/libw32dll/qt_decoder.c
@@ -570,14 +570,6 @@ static audio_decoder_t *qta_open_plugin (audio_decoder_class_t *class_gen,
  * qta plugin class
  */
 
-static char *qta_get_identifier (audio_decoder_class_t *this) {
-  return "qta";
-}
-
-static char *qta_get_description (audio_decoder_class_t *this) {
-  return "quicktime audio decoder plugin";
-}
-
 static void qta_dispose_class (audio_decoder_class_t *this) {
   free (this);
 }
@@ -595,8 +587,8 @@ static void *qta_init_class (xine_t *xine, void *data) {
   this = (qta_class_t *) xine_xmalloc (sizeof (qta_class_t));
 
   this->decoder_class.open_plugin     = qta_open_plugin;
-  this->decoder_class.get_identifier  = qta_get_identifier;
-  this->decoder_class.get_description = qta_get_description;
+  this->decoder_class.identifier      = "qta";
+  this->decoder_class.description     = _("quicktime audio decoder plugin");
   this->decoder_class.dispose         = qta_dispose_class;
 
   return this;
@@ -1081,14 +1073,6 @@ static video_decoder_t *qtv_open_plugin (video_decoder_class_t *class_gen,
  * qtv plugin class
  */
 
-static char *qtv_get_identifier (video_decoder_class_t *this) {
-  return "qtvdec";
-}
-
-static char *qtv_get_description (video_decoder_class_t *this) {
-  return "quicktime binary-only codec based video decoder plugin";
-}
-
 static void qtv_dispose_class (video_decoder_class_t *this) {
   free (this);
 }
@@ -1119,8 +1103,8 @@ static void *qtv_init_class (xine_t *xine, void *data) {
   this = (qtv_class_t *) xine_xmalloc (sizeof (qtv_class_t));
 
   this->decoder_class.open_plugin     = qtv_open_plugin;
-  this->decoder_class.get_identifier  = qtv_get_identifier;
-  this->decoder_class.get_description = qtv_get_description;
+  this->decoder_class.identifier      = "qtvdec";
+  this->decoder_class.description     = _("quicktime binary-only codec based video decoder plugin");
   this->decoder_class.dispose         = qtv_dispose_class;
 
   return this;
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index 88790ebc7..48556f4ad 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -1568,14 +1568,6 @@ static video_decoder_t *open_video_decoder_plugin (video_decoder_class_t *class_
  * video decoder class
  */
 
-static char *get_video_identifier (video_decoder_class_t *this) {
-  return "w32v";
-}
-
-static char *get_video_description (video_decoder_class_t *this) {
-  return "win32 binary video codec plugin";
-}
-
 static void dispose_video_class (video_decoder_class_t *this) {
   free (this);
 }
@@ -1596,8 +1588,8 @@ static void *init_video_decoder_class (xine_t *xine, void *data) {
   this = (w32v_class_t *) xine_xmalloc (sizeof (w32v_class_t));
 
   this->decoder_class.open_plugin     = open_video_decoder_plugin;
-  this->decoder_class.get_identifier  = get_video_identifier;
-  this->decoder_class.get_description = get_video_description;
+  this->decoder_class.identifier      = "w32v";
+  this->decoder_class.description     = _("win32 binary video codec plugin");
   this->decoder_class.dispose         = dispose_video_class;
 
   pthread_once (&once_control, init_routine);
@@ -1635,14 +1627,6 @@ static audio_decoder_t *open_audio_decoder_plugin (audio_decoder_class_t *class_
  * audio decoder plugin class
  */
 
-static char *get_identifier (audio_decoder_class_t *this) {
-  return "win32 audio";
-}
-
-static char *get_description (audio_decoder_class_t *this) {
-  return "win32 binary audio codec plugin";
-}
-
 static void dispose_class (audio_decoder_class_t *this) {
   free (this);
 }
@@ -1658,8 +1642,8 @@ static void *init_audio_decoder_class (xine_t *xine, void *data) {
   this = (w32a_class_t *) xine_xmalloc (sizeof (w32a_class_t));
 
   this->decoder_class.open_plugin     = open_audio_decoder_plugin;
-  this->decoder_class.get_identifier  = get_identifier;
-  this->decoder_class.get_description = get_description;
+  this->decoder_class.identifier      = "win32 audio";
+  this->decoder_class.description     = _("win32 binary audio codec plugin");
   this->decoder_class.dispose         = dispose_class;
 
   pthread_once (&once_control, init_routine);
diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c
index 069eb734a..9a1ec0f8e 100644
--- a/src/vdr/input_vdr.c
+++ b/src/vdr/input_vdr.c
@@ -2628,16 +2628,6 @@ static input_plugin_t *vdr_class_get_instance(input_class_t *cls_gen, xine_strea
  * vdr input plugin class stuff
  */
 
-static const char *vdr_class_get_description(input_class_t *this_gen)
-{
-  return _("VDR display device plugin");
-}
-
-static const char *vdr_class_get_identifier (input_class_t *this_gen)
-{
-  return "VDR";
-}
-
 static void vdr_class_dispose (input_class_t *this_gen)
 {
   vdr_input_class_t *this = (vdr_input_class_t *)this_gen;
@@ -2668,8 +2658,8 @@ static void *init_class(xine_t *xine, void *data)
   this->mrls[ 1 ] = 0;
 
   this->input_class.get_instance      = vdr_class_get_instance;
-  this->input_class.get_identifier    = vdr_class_get_identifier;
-  this->input_class.get_description   = vdr_class_get_description;
+  this->input_class.identifier        = "VDR";
+  this->input_class.description       = _("VDR display device plugin");
   this->input_class.get_dir           = NULL;
   this->input_class.get_autoplay_list = vdr_class_get_autoplay_list;
   this->input_class.dispose           = vdr_class_dispose;
diff --git a/src/vdr/post_vdr.h b/src/vdr/post_vdr.h
index b16a2d2df..46aa8dcb3 100644
--- a/src/vdr/post_vdr.h
+++ b/src/vdr/post_vdr.h
@@ -62,19 +62,9 @@ inline static int vdr_is_vdr_stream(xine_stream_t *stream)
     return 0;
   }
 
-  {
-    input_class_t *input_class = stream->input_plugin->input_class;
-
-    if (input_class->get_identifier)
-    {
-      const char *identifier = input_class->get_identifier(input_class);
-      if (identifier
-          && 0 == strcmp(identifier, "VDR"))
-      {
-        return 1;
-      }
-    }
-  }
+  if (stream->input_plugin->input_class->identifier &&
+      strcmp(stream->input_plugin->input_class->identifier, "VDR"))
+    return 1;
 
   return 0;
 }
diff --git a/src/vdr/post_vdr_audio.c b/src/vdr/post_vdr_audio.c
index 9248e9c45..6ebefd70e 100644
--- a/src/vdr/post_vdr_audio.c
+++ b/src/vdr/post_vdr_audio.c
@@ -58,8 +58,6 @@ static void vdr_audio_select_audio(vdr_audio_post_plugin_t *this, uint8_t channe
 static post_plugin_t *vdr_audio_open_plugin(post_class_t *class_gen, int inputs,
                                             xine_audio_port_t **audio_target,
                                             xine_video_port_t **video_target);
-static char          *vdr_audio_get_identifier(post_class_t *class_gen);
-static char          *vdr_audio_get_description(post_class_t *class_gen);
 static void           vdr_audio_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
@@ -80,8 +78,8 @@ void *vdr_audio_init_plugin(xine_t *xine, void *data)
     return NULL;
   
   class->open_plugin     = vdr_audio_open_plugin;
-  class->get_identifier  = vdr_audio_get_identifier;
-  class->get_description = vdr_audio_get_description;
+  class->identifier      = "vdr_audio";
+  class->description     = _("modifies every audio frame as requested by VDR");
   class->dispose         = vdr_audio_class_dispose;
   
   return class;
@@ -120,16 +118,6 @@ fprintf(stderr, "~~~~~~~~~~ vdr open plugin\n");
   return &this->post_plugin;
 }
 
-static char *vdr_audio_get_identifier(post_class_t *class_gen)
-{
-  return "vdr_audio";
-}
-
-static char *vdr_audio_get_description(post_class_t *class_gen)
-{
-  return "modifies every audio frame as requested by VDR";
-}
-
 static void vdr_audio_class_dispose(post_class_t *class_gen)
 {
   free(class_gen);
diff --git a/src/vdr/post_vdr_video.c b/src/vdr/post_vdr_video.c
index 85536819a..ae02c31e0 100644
--- a/src/vdr/post_vdr_video.c
+++ b/src/vdr/post_vdr_video.c
@@ -81,8 +81,6 @@ static void vdr_video_set_video_window(vdr_video_post_plugin_t *this, int32_t x,
 static post_plugin_t *vdr_video_open_plugin(post_class_t *class_gen, int inputs,
                                             xine_audio_port_t **audio_target,
                                             xine_video_port_t **video_target);
-static char          *vdr_video_get_identifier(post_class_t *class_gen);
-static char          *vdr_video_get_description(post_class_t *class_gen);
 static void           vdr_video_class_dispose(post_class_t *class_gen);
 
 /* plugin instance functions */
@@ -103,8 +101,8 @@ void *vdr_video_init_plugin(xine_t *xine, void *data)
     return NULL;
   
   class->open_plugin     = vdr_video_open_plugin;
-  class->get_identifier  = vdr_video_get_identifier;
-  class->get_description = vdr_video_get_description;
+  class->identifier      = "vdr";
+  class->description     = _("modifies every video frame as requested by VDR");
   class->dispose         = vdr_video_class_dispose;
   
   return class;
@@ -146,16 +144,6 @@ static post_plugin_t *vdr_video_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post_plugin;
 }
 
-static char *vdr_video_get_identifier(post_class_t *class_gen)
-{
-  return "vdr";
-}
-
-static char *vdr_video_get_description(post_class_t *class_gen)
-{
-  return "modifies every video frame as requested by VDR";
-}
-
 static void vdr_video_class_dispose(post_class_t *class_gen)
 {
   free(class_gen);