Merge with 1.2-plugins-changes.

1 files changed, 8 insertions, 27 deletions

diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index b9ac7296a..ff9ea87d0 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1900,25 +1900,6 @@ static input_plugin_t *v4l_class_get_radio_instance (input_class_t *cls_gen,
 /*
  * v4l input plugin class stuff
  */
-
-static char *v4l_class_get_video_description (input_class_t *this_gen) {
-  return _("v4l tv input plugin");
-}
-
-static char *v4l_class_get_radio_description (input_class_t *this_gen) {
-  return _("v4l radio input plugin");
-}
-
-static const char *v4l_class_get_identifier (input_class_t *this_gen) {
-  return "v4l";
-}
-
-static void v4l_class_dispose (input_class_t *this_gen) {
-  v4l_input_class_t  *this = (v4l_input_class_t *) this_gen;
-  
-  free (this);
-}
-
 static void *init_video_class (xine_t *xine, void *data)
 {
   v4l_input_class_t  *this;
@@ -1929,11 +1910,11 @@ static void *init_video_class (xine_t *xine, void *data)
   this->xine                           = xine;
   
   this->input_class.get_instance       = v4l_class_get_video_instance;
-  this->input_class.get_identifier     = v4l_class_get_identifier;
-  this->input_class.get_description    = v4l_class_get_video_description;
+  this->input_class.identifier         = "v4l";
+  this->input_class.description        = N_("v4l tv input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
-  this->input_class.dispose            = v4l_class_dispose;
+  this->input_class.dispose            = default_input_class_dispose;
   this->input_class.eject_media        = NULL;
   
   config->register_filename (config, "media.video4linux.video_device",
@@ -1961,11 +1942,11 @@ static void *init_radio_class (xine_t *xine, void *data)
   this->xine                           = xine;
   
   this->input_class.get_instance       = v4l_class_get_radio_instance;
-  this->input_class.get_identifier     = v4l_class_get_identifier;
-  this->input_class.get_description    = v4l_class_get_radio_description;
+  this->input_class.identifier         = "v4l";
+  this->input_class.description        = N_("v4l radio input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
-  this->input_class.dispose            = v4l_class_dispose;
+  this->input_class.dispose            = default_input_class_dispose;
   this->input_class.eject_media        = NULL;
   
   config->register_filename (config, "media.video4linux.radio_device",
@@ -1983,8 +1964,8 @@ static void *init_radio_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, "v4l_radio", XINE_VERSION_CODE, NULL, init_radio_class },
-  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, "v4l_tv", XINE_VERSION_CODE, NULL, init_video_class },
+  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "v4l_radio", XINE_VERSION_CODE, NULL, init_radio_class },
+  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "v4l_tv", XINE_VERSION_CODE, NULL, init_video_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };