Merge from 1.2 main.

1 files changed, 3 insertions, 11 deletions

diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index 0b726fef0..0b9e6c7f2 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -436,14 +436,6 @@ static input_plugin_t *mms_class_get_instance (input_class_t *cls_gen, xine_stre
  * mms input plugin class stuff
  */
 
-static const char *mms_class_get_description (input_class_t *this_gen) {
-  return _("mms streaming input plugin");
-}
-
-static const char *mms_class_get_identifier (input_class_t *this_gen) {
-  return "mms";
-}
-
 static void mms_class_dispose (input_class_t *this_gen) {
   mms_input_class_t  *this = (mms_input_class_t *) this_gen;
 
@@ -464,8 +456,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->ip                             = NULL;
 
   this->input_class.get_instance       = mms_class_get_instance;
-  this->input_class.get_identifier     = mms_class_get_identifier;
-  this->input_class.get_description    = mms_class_get_description;
+  this->input_class.identifier         = "mms";
+  this->input_class.description        = N_("mms streaming input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = mms_class_dispose;
@@ -497,6 +489,6 @@ static void *init_class (xine_t *xine, void *data) {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "mms", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "mms", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };