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

1 files changed, 4 insertions, 16 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);