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

6 files changed, 12 insertions, 68 deletions

diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c
index b6940813f..1c7f387c6 100644
--- a/src/libxinevdec/bitplane.c
+++ b/src/libxinevdec/bitplane.c
@@ -1544,14 +1544,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
   return &this->video_decoder;
 }
 
-static char *get_identifier (video_decoder_class_t *this) {
-  return "bitplane";
-}
-
-static char *get_description (video_decoder_class_t *this) {
-  return "Raw bitplane video decoder plugin";
-}
-
 static void dispose_class (video_decoder_class_t *this) {
   free (this);
 }
@@ -1561,8 +1553,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   bitplane_class_t *this                = (bitplane_class_t *) xine_xmalloc (sizeof (bitplane_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        = "bitplane";
+  this->decoder_class.description       = _("Raw bitplane video decoder plugin");
   this->decoder_class.dispose           = dispose_class;
 
   return this;
diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c
index 98e0ebc0b..dfcb8630d 100644
--- a/src/libxinevdec/foovideo.c
+++ b/src/libxinevdec/foovideo.c
@@ -225,22 +225,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
 }
 
 /*
- * This function returns a brief string that describes (usually with the
- * decoder's most basic name) the video decoder plugin.
- */
-static char *get_identifier (video_decoder_class_t *this) {
-  return "foovideo";
-}
-
-/*
- * This function returns a slightly longer string describing the video
- * decoder plugin.
- */
-static char *get_description (video_decoder_class_t *this) {
-  return "foovideo: reference xine video decoder plugin";
-}
-
-/*
  * This function frees the video decoder class and any other memory that was
  * allocated.
  */
@@ -259,8 +243,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = (foovideo_class_t *) xine_xmalloc (sizeof (foovideo_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      = "foovideo";
+  this->decoder_class.description     = _("foovideo: reference xine video decoder plugin");
   this->decoder_class.dispose         = dispose_class;
 
   return this;
diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c
index b5acdfa42..bbd66f42f 100644
--- a/src/libxinevdec/gdkpixbuf.c
+++ b/src/libxinevdec/gdkpixbuf.c
@@ -257,14 +257,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
  * image plugin class
  */
 
-static char *get_identifier (video_decoder_class_t *this) {
-  return "gdkpixbuf";
-}
-
-static char *get_description (video_decoder_class_t *this) {
-  return "gdk-pixbuf image video decoder plugin";
-}
-
 static void dispose_class (video_decoder_class_t *this_gen) {
   image_class_t   *this = (image_class_t *) this_gen;
 
@@ -280,8 +272,8 @@ static void *init_class (xine_t *xine, void *data) {
   this = (image_class_t *) xine_xmalloc (sizeof (image_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      = "gdkpixbuf";
+  this->decoder_class.description     = _("gdk-pixbuf image video decoder plugin");
   this->decoder_class.dispose         = dispose_class;
 
   /*
diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c
index a338e3cab..2807fc5d6 100644
--- a/src/libxinevdec/image.c
+++ b/src/libxinevdec/image.c
@@ -235,14 +235,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen,
  * image plugin class
  */
 
-static char *get_identifier (video_decoder_class_t *this) {
-  return "imagevdec";
-}
-
-static char *get_description (video_decoder_class_t *this) {
-  return "image video decoder plugin";
-}
-
 static void dispose_class (video_decoder_class_t *this_gen) {
   image_class_t   *this = (image_class_t *) this_gen;
 
@@ -258,8 +250,8 @@ static void *init_class (xine_t *xine, void *data) {
   this = (image_class_t *) xine_xmalloc (sizeof (image_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      = "imagevdec";
+  this->decoder_class.description     = _("image video decoder plugin");
   this->decoder_class.dispose         = dispose_class;
 
   /*
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index 0e7be4c18..54adeeec1 100644
--- a/src/libxinevdec/rgb.c
+++ b/src/libxinevdec/rgb.c
@@ -416,14 +416,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
   return &this->video_decoder;
 }
 
-static char *get_identifier (video_decoder_class_t *this) {
-  return "RGB";
-}
-
-static char *get_description (video_decoder_class_t *this) {
-  return "Raw RGB video decoder plugin";
-}
-
 static void dispose_class (video_decoder_class_t *this) {
   free (this);
 }
@@ -435,8 +427,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = (rgb_class_t *) xine_xmalloc (sizeof (rgb_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      = "RGB";
+  this->decoder_class.description     = _("Raw RGB video decoder plugin");
   this->decoder_class.dispose         = dispose_class;
 
   return this;
diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c
index 2b8657685..bcbb4bbe7 100644
--- a/src/libxinevdec/yuv.c
+++ b/src/libxinevdec/yuv.c
@@ -339,14 +339,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre
   return &this->video_decoder;
 }
 
-static char *get_identifier (video_decoder_class_t *this) {
-  return "YUV";
-}
-
-static char *get_description (video_decoder_class_t *this) {
-  return "Raw YUV video decoder plugin";
-}
-
 static void dispose_class (video_decoder_class_t *this) {
   free (this);
 }
@@ -358,8 +350,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this = (yuv_class_t *) xine_xmalloc (sizeof (yuv_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      = "YUV";
+  this->decoder_class.description     = _("Raw YUV video decoder plugin");
   this->decoder_class.dispose         = dispose_class;
 
   return this;