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

3 files changed, 10 insertions, 46 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;