Merge from 1.2 main.

1 files changed, 3 insertions, 12 deletions

diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index d5895c9a8..14a924a2a 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -918,15 +918,6 @@ static input_plugin_t *vcd_class_get_instance (input_class_t *cls_gen, xine_stre
 /*
  * vcd input plugin class stuff
  */
-
-static const char *vcd_class_get_description (input_class_t *this_gen) {
-  return _("Video CD input plugin");
-}
-
-static const char *vcd_class_get_identifier (input_class_t *this_gen) {
-  return "vcdo";
-}
-
 static void vcd_class_dispose (input_class_t *this_gen) {
 
   vcd_input_class_t  *this = (vcd_input_class_t *) this_gen;
@@ -1087,8 +1078,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->input_class.get_instance       = vcd_class_get_instance;
-  this->input_class.get_identifier     = vcd_class_get_identifier;
-  this->input_class.get_description    = vcd_class_get_description;
+  this->input_class.identifier         = "vcdo";
+  this->input_class.description        = N_("Video CD input plugin");
   this->input_class.get_dir            = vcd_class_get_dir;
   this->input_class.get_autoplay_list  = vcd_class_get_autoplay_list;
   this->input_class.dispose            = vcd_class_dispose;
@@ -1116,6 +1107,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, "VCDO", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "VCDO", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };