Merge from 1.2 main.

1 files changed, 4 insertions, 16 deletions

diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/libspucmml/xine_cmml_decoder.c
index b684d21cb..6c045ee04 100644
--- a/src/libspucmml/xine_cmml_decoder.c
+++ b/src/libspucmml/xine_cmml_decoder.c
@@ -490,18 +490,6 @@ static spu_decoder_t *spucmml_class_open_plugin (spu_decoder_class_t *class_gen,
   return (spu_decoder_t *) this;
 }
 
-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,9 +505,9 @@ 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.dispose          = spucmml_class_dispose;
+  this->class.identifier       = "spucmml";
+  this->class.description      = N_("CMML subtitle decoder plugin");
+  this->class.dispose          = default_spu_decoder_class_dispose;
 
   this->xine                   = xine;
 
@@ -543,7 +531,7 @@ static const decoder_info_t spudec_info = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_SPU_DECODER, 16, "spucmml", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin },
+  { PLUGIN_SPU_DECODER, 17, "spucmml", XINE_VERSION_CODE, &spudec_info, &init_spu_decoder_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };