Merge from 1.2 main.

1 files changed, 16 insertions, 9 deletions

diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index 3f59bab6c..2917721c9 100644
--- a/src/input/input_plugin.h
+++ b/src/input/input_plugin.h
@@ -35,7 +35,7 @@
 #  include <xine/configfile.h>
 #endif
 
-#define INPUT_PLUGIN_IFACE_VERSION   17
+#define INPUT_PLUGIN_IFACE_VERSION   18
  
 typedef struct input_class_s input_class_t ;
 typedef struct input_plugin_s input_plugin_t;
@@ -48,18 +48,23 @@ struct input_class_s {
    */
   input_plugin_t* (*get_instance) (input_class_t *this, xine_stream_t *stream, const char *mrl);
 
-  /*
-   * return short, human readable identifier for this plugin class
-   * The returned string should not be malloc'd as it is not freed.
+  /**
+   * @brief short human readable identifier for this plugin class
    */
-  const char* (*get_identifier) (input_class_t *this);
+  const char *identifier;
 
-  /*
-   * return human readable (verbose = 1 line) description for 
-   * this plugin class
+  /**
+   * @brief human readable (verbose = 1 line) description for this plugin class
+   *
+   * The description is passed to gettext() to internationalise.
    */
-  const char* (*get_description) (input_class_t *this);
+  const char *description;
 
+  /**
+   * @brief Optional non-standard catalog to use with dgettext() for description.
+   */
+  const char *textdomain;
+  
   /*
    * ls function, optional: may be NULL
    * return value: NULL => filename is a file, **char=> filename is a dir
@@ -85,6 +90,8 @@ struct input_class_s {
   int (*eject_media) (input_class_t *this);
 };
 
+#define default_input_class_dispose (void (*) (input_class_t *this))free
+
 struct input_plugin_s {
 
   /*