From 90b866329e8962a3f1f03dc8172cf75ccc9d2b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Tue, 11 Dec 2007 10:49:51 +0100
Subject: Replace get_identifier/get_description functions with strings.

This is the start of a new experimental branch, with the first objective being
the replacement of the get_description and get_identifier functions with
direct-access strings.

The reason for this change is to reduce code size and time of execution.
By replacing the functions with direct-access strings there is one less call
to be done in those cases where the description has to be fetched.

The solution is not yet definitive though, there are a couple of problems to
take care of:

 - the use of N_() still makes it easy to internationalise the strings, but it
   requires for the string to be found on libxine2 catalog, which is not
   exactly a nice solution for external plugins;
 - it would be simpler to re-use the id field in plugin_info_t, and then move
   description there; it should reduce memory usage for the class structures;
 - I'm not really aware of any reason why get_description and get_identifier
   were used beside the idea of making i18n simpler.

This probably would break a couple of frontends, especially if they have some
internal plugins (like post-plugins), so it needs to be reviewed carefully
before merging in 1.2 branch. My current goal is to get this in before 1.2
though, rather than waiting for 1.3.
---
 src/input/input_plugin.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/input')

diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index 3f59bab6c..31a4f9846 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,17 +48,17 @@ 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;
 
   /*
    * ls function, optional: may be NULL
-- 
cgit v1.2.3


From 8837a03dc8f5127d71c2a5640bb4cd7c9fe4242c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Tue, 11 Dec 2007 12:26:40 +0100
Subject: Update all input plugins to the new identifier/description interface.

---
 src/input/input_cdda.c           | 12 ++----------
 src/input/input_dvb.c            | 13 ++-----------
 src/input/input_dvd.c            | 16 ++--------------
 src/input/input_file.c           | 12 ++----------
 src/input/input_gnome_vfs.c      | 16 ++--------------
 src/input/input_http.c           | 12 ++----------
 src/input/input_mms.c            | 12 ++----------
 src/input/input_net.c            | 12 ++----------
 src/input/input_pnm.c            | 12 ++----------
 src/input/input_pvr.c            | 14 ++------------
 src/input/input_rtp.c            | 13 ++-----------
 src/input/input_rtsp.c           | 12 ++----------
 src/input/input_smb.c            | 16 ++--------------
 src/input/input_stdin_fifo.c     | 13 ++-----------
 src/input/input_v4l.c            | 20 ++++----------------
 src/input/input_vcd.c            | 13 ++-----------
 src/input/vcd/xineplug_inp_vcd.c | 29 ++---------------------------
 17 files changed, 36 insertions(+), 211 deletions(-)

(limited to 'src/input')

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 621aff14a..0cd8982e1 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -2679,14 +2679,6 @@ static input_plugin_t *cdda_class_get_instance (input_class_t *cls_gen, xine_str
 }
 
 
-static const char *cdda_class_get_identifier (input_class_t *this_gen) {
-  return "cdda";
-}
-
-static const char *cdda_class_get_description (input_class_t *this_gen) {
-  return _("CD Digital Audio (aka. CDDA)");
-}
-
 static void cdda_class_dispose (input_class_t *this_gen) {
   cdda_input_class_t  *this = (cdda_input_class_t *) this_gen;
   config_values_t     *config = this->xine->config;
@@ -2722,8 +2714,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   config       = xine->config;
 
   this->input_class.get_instance       = cdda_class_get_instance;
-  this->input_class.get_identifier     = cdda_class_get_identifier;
-  this->input_class.get_description    = cdda_class_get_description;
+  this->input_class.identifier         = "cdda";
+  this->input_class.description        = _("CD Digital Audio (aka. CDDA)");
   /* this->input_class.get_dir            = cdda_class_get_dir; */
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = cdda_class_get_autoplay_list;
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index fbfc62921..1409e9c05 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -3141,15 +3141,6 @@ static input_plugin_t *dvb_class_get_instance (input_class_t *class_gen,
  * dvb input plugin class stuff
  */
 
-static const char *dvb_class_get_description (input_class_t *this_gen) {
-  return _("DVB (Digital TV) input plugin");
-}
-
-static const char *dvb_class_get_identifier (input_class_t *this_gen) {
-  return "dvb";
-}
-
-
 static void dvb_class_dispose(input_class_t * this_gen)
 {
     dvb_input_class_t *class = (dvb_input_class_t *) this_gen;
@@ -3252,8 +3243,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->input_class.get_instance       = dvb_class_get_instance;
-  this->input_class.get_identifier     = dvb_class_get_identifier;
-  this->input_class.get_description    = dvb_class_get_description;
+  this->input_class.identifier         = "dvb";
+  this->input_class.description        = _("DVB (Digital TV) input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = dvb_class_get_autoplay_list;
   this->input_class.dispose            = dvb_class_dispose;
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 55e975eab..e2c0277c9 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1686,18 +1686,6 @@ static input_plugin_t *dvd_class_get_instance (input_class_t *class_gen, xine_st
   return &this->input_plugin;
 }
 
-static const char *dvd_class_get_description (input_class_t *this_gen) {
-  trace_print("Called\n");
-
-  return "DVD Navigator";
-}
-
-static const char *dvd_class_get_identifier (input_class_t *this_gen) {
-  trace_print("Called\n");
-
-  return "DVD";
-}
-
 /* FIXME: adapt to new api. */
 #if 0
 static xine_mrl_t **dvd_class_get_dir (input_class_t *this_gen, 
@@ -1770,8 +1758,8 @@ static void *init_class (xine_t *xine, void *data) {
     return NULL;
   
   this->input_class.get_instance       = dvd_class_get_instance;
-  this->input_class.get_identifier     = dvd_class_get_identifier;
-  this->input_class.get_description    = dvd_class_get_description;
+  this->input_class.identifier         = "DVD";
+  this->input_class.description        = _("DVD Navigator");
 /*
   this->input_class.get_dir            = dvd_class_get_dir;
 */
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 0ed4ab682..d29a1270b 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -635,14 +635,6 @@ static off_t get_file_size(char *filepathname, char *origin) {
   return pstat.st_size;
 }
 
-static const char *file_class_get_description (input_class_t *this_gen) {
-  return _("file input plugin");
-}
-
-static const char *file_class_get_identifier (input_class_t *this_gen) {
-  return "file";
-}
-
 static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, 
 					const char *filename, int *nFiles) {
 
@@ -987,8 +979,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   config       = xine->config;
   
   this->input_class.get_instance       = file_class_get_instance;
-  this->input_class.get_identifier     = file_class_get_identifier;
-  this->input_class.get_description    = file_class_get_description;
+  this->input_class.identifier         = "file";
+  this->input_class.description        = _("file input plugin");
   this->input_class.get_dir            = file_class_get_dir;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = file_class_dispose;
diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c
index 3315a52ea..24ef652c7 100644
--- a/src/input/input_gnome_vfs.c
+++ b/src/input/input_gnome_vfs.c
@@ -211,18 +211,6 @@ gnomevfs_plugin_get_mrl (input_plugin_t *this_gen)
 	return this->mrl;
 }
 
-static const char
-*gnomevfs_klass_get_description (input_class_t *this_gen)
-{
-	return _("gnome-vfs input plugin as shipped with xine");
-}
-
-static const char
-*gnomevfs_klass_get_identifier (input_class_t *this_gen)
-{
-	return "gnomevfs";
-}
-
 static int
 gnomevfs_plugin_get_optional_data (input_plugin_t *this_gen, 
 		void *data, int data_type)
@@ -375,8 +363,8 @@ static void
 	this->xine = xine;
 
 	this->input_class.get_instance       = gnomevfs_klass_get_instance;
-	this->input_class.get_identifier     = gnomevfs_klass_get_identifier;
-	this->input_class.get_description    = gnomevfs_klass_get_description;
+	this->input_class.identifier         = "gnomevfs";
+	this->input_class.description        = _("gnome-vfs input plugin as shipped with xine");
 	this->input_class.get_dir            = NULL;
 	this->input_class.get_autoplay_list  = NULL;
 	this->input_class.dispose            = gnomevfs_klass_dispose;
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 328ab523e..ffeb79bd7 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -1065,14 +1065,6 @@ static input_plugin_t *http_class_get_instance (input_class_t *cls_gen, xine_str
   return &this->input_plugin;
 }
 
-static const char *http_class_get_description (input_class_t *this_gen) {
-  return _("http input plugin");
-}
-
-static const char *http_class_get_identifier (input_class_t *this_gen) {
-  return "http";
-}
-
 static void http_class_dispose (input_class_t *this_gen) {
   http_input_class_t  *this = (http_input_class_t *) this_gen;
   
@@ -1094,8 +1086,8 @@ static void *init_class (xine_t *xine, void *data) {
   config       = xine->config;
 
   this->input_class.get_instance       = http_class_get_instance;
-  this->input_class.get_identifier     = http_class_get_identifier;
-  this->input_class.get_description    = http_class_get_description;
+  this->input_class.identifier         = "http";
+  this->input_class.description        = _("http input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = http_class_dispose;
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index 3e4b7172c..7adf929b4 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -438,14 +438,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;
 
@@ -466,8 +458,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        = _("mms streaming input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = mms_class_dispose;
diff --git a/src/input/input_net.c b/src/input/input_net.c
index b3d7a5396..68cf5ab97 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -505,14 +505,6 @@ static input_plugin_t *net_class_get_instance (input_class_t *cls_gen, xine_stre
  *  net plugin class
  */
  
-static const char *net_class_get_description (input_class_t *this_gen) {
-	return _("net input plugin as shipped with xine");
-}
-
-static const char *net_class_get_identifier (input_class_t *this_gen) {
-  return "TCP";
-}
-
 static void net_class_dispose (input_class_t *this_gen) {
   net_input_class_t  *this = (net_input_class_t *) this_gen;
 
@@ -528,8 +520,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->input_class.get_instance      = net_class_get_instance;
-  this->input_class.get_description   = net_class_get_description;
-  this->input_class.get_identifier    = net_class_get_identifier;
+  this->input_class.description       = _("net input plugin as shipped with xine");
+  this->input_class.identifier        = "TCP";
   this->input_class.get_dir           = NULL;
   this->input_class.get_autoplay_list = NULL;
   this->input_class.dispose           = net_class_dispose;
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index b49060faa..c90fadd31 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -259,14 +259,6 @@ static input_plugin_t *pnm_class_get_instance (input_class_t *cls_gen, xine_stre
  * pnm input plugin class stuff
  */
 
-static const char *pnm_class_get_description (input_class_t *this_gen) {
-  return _("pnm streaming input plugin");
-}
-
-static const char *pnm_class_get_identifier (input_class_t *this_gen) {
-  return "pnm";
-}
-
 static void pnm_class_dispose (input_class_t *this_gen) {
   pnm_input_class_t  *this = (pnm_input_class_t *) this_gen;
 
@@ -282,8 +274,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->input_class.get_instance       = pnm_class_get_instance;
-  this->input_class.get_identifier     = pnm_class_get_identifier;
-  this->input_class.get_description    = pnm_class_get_description;
+  this->input_class.identifier         = "pnm";
+  this->input_class.description        = _("pnm streaming input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = pnm_class_dispose;
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 84b8468db..f6f7d51c9 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -1522,16 +1522,6 @@ static input_plugin_t *pvr_class_get_instance (input_class_t *cls_gen, xine_stre
 /*
  * plugin class functions
  */
-
-static const char *pvr_class_get_description (input_class_t *this_gen) {
-  return _("WinTV-PVR 250/350 input plugin");
-}
-
-static const char *pvr_class_get_identifier (input_class_t *this_gen) {
-  return "pvr";
-}
-
-
 static void pvr_class_dispose (input_class_t *this_gen) {
   pvr_input_class_t  *this = (pvr_input_class_t *) this_gen;
 
@@ -1556,8 +1546,8 @@ static void *init_plugin (xine_t *xine, void *data) {
 				    NULL);
 
   this->input_class.get_instance       = pvr_class_get_instance;
-  this->input_class.get_identifier     = pvr_class_get_identifier;
-  this->input_class.get_description    = pvr_class_get_description;
+  this->input_class.identifier         = "pvr";
+  this->input_class.description        = _("WinTV-PVR 250/350 input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = pvr_class_dispose;
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index 1a57b7a6d..12e97bd02 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -765,15 +765,6 @@ static input_plugin_t *rtp_class_get_instance (input_class_t *cls_gen,
 /*
  *  net plugin class
  */
- 
-static const char *rtp_class_get_description (input_class_t *this_gen) {
-	return _("RTP and UDP input plugin as shipped with xine");
-}
-
-static const char *rtp_class_get_identifier (input_class_t *this_gen) {
-  return "RTP/UDP";
-}
-
 static void rtp_class_dispose (input_class_t *this_gen) {
   rtp_input_class_t  *this = (rtp_input_class_t *) this_gen;
 
@@ -790,8 +781,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->input_class.get_instance      = rtp_class_get_instance;
-  this->input_class.get_description   = rtp_class_get_description;
-  this->input_class.get_identifier    = rtp_class_get_identifier;
+  this->input_class.description       = _("RTP and UDP input plugin as shipped with xine");
+  this->input_class.identifier        = "RTP/UDP";
   this->input_class.get_dir           = NULL;
   this->input_class.get_autoplay_list = NULL;
   this->input_class.dispose           = rtp_class_dispose;
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index 318659b88..266ff6f6e 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -280,14 +280,6 @@ static input_plugin_t *rtsp_class_get_instance (input_class_t *cls_gen, xine_str
  * rtsp input plugin class stuff
  */
 
-static const char *rtsp_class_get_description (input_class_t *this_gen) {
-  return _("rtsp streaming input plugin");
-}
-
-static const char *rtsp_class_get_identifier (input_class_t *this_gen) {
-  return "rtsp";
-}
-
 static void rtsp_class_dispose (input_class_t *this_gen) {
   rtsp_input_class_t  *this = (rtsp_input_class_t *) this_gen;
 
@@ -303,8 +295,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->input_class.get_instance       = rtsp_class_get_instance;
-  this->input_class.get_identifier     = rtsp_class_get_identifier;
-  this->input_class.get_description    = rtsp_class_get_description;
+  this->input_class.identifier         = "rtsp";
+  this->input_class.description        = _("rtsp streaming input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = rtsp_class_dispose;
diff --git a/src/input/input_smb.c b/src/input/input_smb.c
index 9fd4e50c8..d0e81ae32 100644
--- a/src/input/input_smb.c
+++ b/src/input/input_smb.c
@@ -151,18 +151,6 @@ static uint32_t smb_plugin_get_blocksize (input_plugin_t *this_gen) {
   return 0;
 }
 
-static char
-*smb_class_get_description (input_class_t *this_gen)
-{
-	return _("CIFS/SMB input plugin based on libsmbclient");
-}
-
-static const char
-*smb_class_get_identifier (input_class_t *this_gen)
-{
-	return "smb";
-}
-
 /*
  * Sorting function, it comes from GNU fileutils package.
  */
@@ -519,8 +507,8 @@ static void
 	this->xine = xine;
 
 	this->input_class.get_instance       = smb_class_get_instance;
-	this->input_class.get_identifier     = smb_class_get_identifier;
-	this->input_class.get_description    = smb_class_get_description;
+	this->input_class.identifier         = "smb";
+	this->input_class.description        = _("CIFS/SMB input plugin based on libsmbclient");
 	this->input_class.get_dir            = smb_class_get_dir;
 	this->input_class.get_autoplay_list  = NULL;
 	this->input_class.dispose            = smb_class_dispose;
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 01fef7431..4640cbf31 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -344,15 +344,6 @@ static input_plugin_t *stdin_class_get_instance (input_class_t *class_gen,
 /*
  * stdin input plugin class stuff
  */
-
-static const char *stdin_class_get_description (input_class_t *this_gen) {
-  return _("stdin streaming input plugin");
-}
-
-static const char *stdin_class_get_identifier (input_class_t *this_gen) {
-  return "stdin_fifo";
-}
-
 static void stdin_class_dispose (input_class_t *this_gen) {
   stdin_input_class_t  *this = (stdin_input_class_t *) this_gen;
 
@@ -368,8 +359,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->input_class.get_instance       = stdin_class_get_instance;
-  this->input_class.get_identifier     = stdin_class_get_identifier;
-  this->input_class.get_description    = stdin_class_get_description;
+  this->input_class.identifier         = "stdin_fifo";
+  this->input_class.description        = _("stdin streaming input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = stdin_class_dispose;
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index b9ac7296a..f698f8772 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1901,18 +1901,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;
   
@@ -1929,8 +1917,8 @@ 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        = _("v4l tv input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = v4l_class_dispose;
@@ -1961,8 +1949,8 @@ 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        = _("v4l radio input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = v4l_class_dispose;
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index d5895c9a8..71c828eea 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        = _("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;
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index 474cc7339..4b11096c0 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -1002,31 +1002,6 @@ vcd_plugin_get_mrl (input_plugin_t *this_gen)
   }
 }
 
-/*!
-  From xine plugin spec:
-  
-  return human readable (verbose = 1 line) description for this plugin
-*/
-static const char *
-vcd_class_get_description (input_class_t *this_gen) 
-{
-  dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n");
-  return _("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... ");
-}
-
-/*!
-  From xine plugin spec:
-
-  return short, human readable identifier for this plugin
-  this is used for GUI buttons, The identifier must have max. 4 characters
-  characters (max. 5 including terminating \0)
-*/
-static const char *
-vcd_class_get_identifier (input_class_t *this_gen) {
-  dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n");
-  return SHORT_PLUGIN_NAME;
-}
-
 /* 
    Handle all queued keyboard/mouse events. Return TRUE if this causes
    a change in the play item.
@@ -1776,8 +1751,8 @@ vcd_init (xine_t *xine, void *data)
   class->mrls   = NULL;
 
   class->input_class.get_instance        = vcd_class_get_instance;
-  class->input_class.get_identifier      = vcd_class_get_identifier;
-  class->input_class.get_description     = vcd_class_get_description;
+  class->input_class.identifier          = SHORT_PLUGIN_NAME;
+  class->input_class.description         = _("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... ");
   class->input_class.get_dir             = vcd_class_get_dir; 
   class->input_class.get_autoplay_list   = vcd_class_get_autoplay_list;
   class->input_class.dispose		 = vcd_class_dispose;
-- 
cgit v1.2.3


From 5b812f5ae063e9e6dadb4eff65bbbe78e977c6f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Tue, 11 Dec 2007 14:02:35 +0100
Subject: Add a textdomain field to allow using a different i18n catalog for
 the description translation.

---
 src/input/input_plugin.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/input')

diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index 31a4f9846..95df4be97 100644
--- a/src/input/input_plugin.h
+++ b/src/input/input_plugin.h
@@ -60,6 +60,11 @@ struct input_class_s {
    */
   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
-- 
cgit v1.2.3


From e2a10c5fdaed1f45040fb3d737ab79f0e5d774d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Tue, 11 Dec 2007 14:12:35 +0100
Subject: Use N_() rather than _(), passing the string just once to gettext().
 This way the gettext code for description does not need to be repeated by
 every plugin.

---
 src/input/input_cdda.c           | 2 +-
 src/input/input_dvb.c            | 2 +-
 src/input/input_dvd.c            | 2 +-
 src/input/input_file.c           | 2 +-
 src/input/input_gnome_vfs.c      | 2 +-
 src/input/input_http.c           | 2 +-
 src/input/input_mms.c            | 2 +-
 src/input/input_net.c            | 2 +-
 src/input/input_pnm.c            | 2 +-
 src/input/input_pvr.c            | 2 +-
 src/input/input_rtp.c            | 2 +-
 src/input/input_rtsp.c           | 2 +-
 src/input/input_smb.c            | 2 +-
 src/input/input_stdin_fifo.c     | 2 +-
 src/input/input_v4l.c            | 4 ++--
 src/input/input_vcd.c            | 2 +-
 src/input/vcd/xineplug_inp_vcd.c | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/input')

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 0cd8982e1..83f89b08f 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -2715,7 +2715,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   this->input_class.get_instance       = cdda_class_get_instance;
   this->input_class.identifier         = "cdda";
-  this->input_class.description        = _("CD Digital Audio (aka. CDDA)");
+  this->input_class.description        = N_("CD Digital Audio (aka. CDDA)");
   /* this->input_class.get_dir            = cdda_class_get_dir; */
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = cdda_class_get_autoplay_list;
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 1409e9c05..d84877e39 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -3244,7 +3244,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   this->input_class.get_instance       = dvb_class_get_instance;
   this->input_class.identifier         = "dvb";
-  this->input_class.description        = _("DVB (Digital TV) input plugin");
+  this->input_class.description        = N_("DVB (Digital TV) input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = dvb_class_get_autoplay_list;
   this->input_class.dispose            = dvb_class_dispose;
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index e2c0277c9..5f3676748 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1759,7 +1759,7 @@ static void *init_class (xine_t *xine, void *data) {
   
   this->input_class.get_instance       = dvd_class_get_instance;
   this->input_class.identifier         = "DVD";
-  this->input_class.description        = _("DVD Navigator");
+  this->input_class.description        = N_("DVD Navigator");
 /*
   this->input_class.get_dir            = dvd_class_get_dir;
 */
diff --git a/src/input/input_file.c b/src/input/input_file.c
index d29a1270b..a2259ec1a 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -980,7 +980,7 @@ static void *init_plugin (xine_t *xine, void *data) {
   
   this->input_class.get_instance       = file_class_get_instance;
   this->input_class.identifier         = "file";
-  this->input_class.description        = _("file input plugin");
+  this->input_class.description        = N_("file input plugin");
   this->input_class.get_dir            = file_class_get_dir;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = file_class_dispose;
diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c
index 24ef652c7..3f8c4a745 100644
--- a/src/input/input_gnome_vfs.c
+++ b/src/input/input_gnome_vfs.c
@@ -364,7 +364,7 @@ static void
 
 	this->input_class.get_instance       = gnomevfs_klass_get_instance;
 	this->input_class.identifier         = "gnomevfs";
-	this->input_class.description        = _("gnome-vfs input plugin as shipped with xine");
+	this->input_class.description        = N_("gnome-vfs input plugin as shipped with xine");
 	this->input_class.get_dir            = NULL;
 	this->input_class.get_autoplay_list  = NULL;
 	this->input_class.dispose            = gnomevfs_klass_dispose;
diff --git a/src/input/input_http.c b/src/input/input_http.c
index ffeb79bd7..02a54e6d8 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -1087,7 +1087,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   this->input_class.get_instance       = http_class_get_instance;
   this->input_class.identifier         = "http";
-  this->input_class.description        = _("http input plugin");
+  this->input_class.description        = N_("http input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = http_class_dispose;
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index 7adf929b4..48944dbfb 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -459,7 +459,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   this->input_class.get_instance       = mms_class_get_instance;
   this->input_class.identifier         = "mms";
-  this->input_class.description        = _("mms streaming input plugin");
+  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;
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 68cf5ab97..30e88757d 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -520,7 +520,7 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->input_class.get_instance      = net_class_get_instance;
-  this->input_class.description       = _("net input plugin as shipped with xine");
+  this->input_class.description       = N_("net input plugin as shipped with xine");
   this->input_class.identifier        = "TCP";
   this->input_class.get_dir           = NULL;
   this->input_class.get_autoplay_list = NULL;
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index c90fadd31..b11e1d6b3 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -275,7 +275,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   this->input_class.get_instance       = pnm_class_get_instance;
   this->input_class.identifier         = "pnm";
-  this->input_class.description        = _("pnm streaming input plugin");
+  this->input_class.description        = N_("pnm streaming input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = pnm_class_dispose;
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index f6f7d51c9..eaac6afb8 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -1547,7 +1547,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
   this->input_class.get_instance       = pvr_class_get_instance;
   this->input_class.identifier         = "pvr";
-  this->input_class.description        = _("WinTV-PVR 250/350 input plugin");
+  this->input_class.description        = N_("WinTV-PVR 250/350 input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = pvr_class_dispose;
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index 12e97bd02..5ef5184cc 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -781,7 +781,7 @@ static void *init_class (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->input_class.get_instance      = rtp_class_get_instance;
-  this->input_class.description       = _("RTP and UDP input plugin as shipped with xine");
+  this->input_class.description       = N_("RTP and UDP input plugin as shipped with xine");
   this->input_class.identifier        = "RTP/UDP";
   this->input_class.get_dir           = NULL;
   this->input_class.get_autoplay_list = NULL;
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index 266ff6f6e..eb79586ad 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -296,7 +296,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   this->input_class.get_instance       = rtsp_class_get_instance;
   this->input_class.identifier         = "rtsp";
-  this->input_class.description        = _("rtsp streaming input plugin");
+  this->input_class.description        = N_("rtsp streaming input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = rtsp_class_dispose;
diff --git a/src/input/input_smb.c b/src/input/input_smb.c
index d0e81ae32..d6f9a78da 100644
--- a/src/input/input_smb.c
+++ b/src/input/input_smb.c
@@ -508,7 +508,7 @@ static void
 
 	this->input_class.get_instance       = smb_class_get_instance;
 	this->input_class.identifier         = "smb";
-	this->input_class.description        = _("CIFS/SMB input plugin based on libsmbclient");
+	this->input_class.description        = N_("CIFS/SMB input plugin based on libsmbclient");
 	this->input_class.get_dir            = smb_class_get_dir;
 	this->input_class.get_autoplay_list  = NULL;
 	this->input_class.dispose            = smb_class_dispose;
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 4640cbf31..7708ee40d 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -360,7 +360,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   this->input_class.get_instance       = stdin_class_get_instance;
   this->input_class.identifier         = "stdin_fifo";
-  this->input_class.description        = _("stdin streaming input plugin");
+  this->input_class.description        = N_("stdin streaming input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
   this->input_class.dispose            = stdin_class_dispose;
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index f698f8772..7ed5c172b 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1918,7 +1918,7 @@ static void *init_video_class (xine_t *xine, void *data)
   
   this->input_class.get_instance       = v4l_class_get_video_instance;
   this->input_class.identifier         = "v4l";
-  this->input_class.description        = _("v4l tv input plugin");
+  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;
@@ -1950,7 +1950,7 @@ static void *init_radio_class (xine_t *xine, void *data)
   
   this->input_class.get_instance       = v4l_class_get_radio_instance;
   this->input_class.identifier         = "v4l";
-  this->input_class.description        = _("v4l radio input plugin");
+  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;
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 71c828eea..014f20258 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -1079,7 +1079,7 @@ static void *init_class (xine_t *xine, void *data) {
 
   this->input_class.get_instance       = vcd_class_get_instance;
   this->input_class.identifier         = "vcdo";
-  this->input_class.description        = _("Video CD input plugin");
+  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;
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index 4b11096c0..c33f73e40 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -1752,7 +1752,7 @@ vcd_init (xine_t *xine, void *data)
 
   class->input_class.get_instance        = vcd_class_get_instance;
   class->input_class.identifier          = SHORT_PLUGIN_NAME;
-  class->input_class.description         = _("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... ");
+  class->input_class.description         = N_("Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... ");
   class->input_class.get_dir             = vcd_class_get_dir; 
   class->input_class.get_autoplay_list   = vcd_class_get_autoplay_list;
   class->input_class.dispose		 = vcd_class_dispose;
-- 
cgit v1.2.3


From 448923a2d401f3e21eb586f50c1ca9e2dd6259d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Tue, 11 Dec 2007 14:26:34 +0100
Subject: Define free() as the default dispose function for plugin classes.

Most plugin classes in xine define a dispose function simply to call free(),
but free() is ABI-compatible with our dispose functions, so add a macro
that allows to pass free() directly as dispose function.

It's an opt-in so that no extra conditional is needed, and plugin authors
won't forget about providing a dispose function (if they need to).
---
 src/input/input_plugin.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/input')

diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index 95df4be97..2917721c9 100644
--- a/src/input/input_plugin.h
+++ b/src/input/input_plugin.h
@@ -90,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 {
 
   /*
-- 
cgit v1.2.3


From 32a70cef7fdce1648d6850dafbe78bee04830429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Tue, 11 Dec 2007 15:40:37 +0100
Subject: Use default_*_class_dispose macro whenever the class dispose function
 only called free().

---
 src/input/input_net.c        |  8 +-------
 src/input/input_pnm.c        |  8 +-------
 src/input/input_pvr.c        |  8 +-------
 src/input/input_rtp.c        |  8 +-------
 src/input/input_rtsp.c       |  9 +--------
 src/input/input_smb.c        | 10 +---------
 src/input/input_stdin_fifo.c |  8 +-------
 src/input/input_v4l.c        | 11 ++---------
 8 files changed, 9 insertions(+), 61 deletions(-)

(limited to 'src/input')

diff --git a/src/input/input_net.c b/src/input/input_net.c
index 30e88757d..85b0b2fe8 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -505,12 +505,6 @@ static input_plugin_t *net_class_get_instance (input_class_t *cls_gen, xine_stre
  *  net plugin class
  */
  
-static void net_class_dispose (input_class_t *this_gen) {
-  net_input_class_t  *this = (net_input_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_class (xine_t *xine, void *data) {
 
   net_input_class_t  *this;
@@ -524,7 +518,7 @@ static void *init_class (xine_t *xine, void *data) {
   this->input_class.identifier        = "TCP";
   this->input_class.get_dir           = NULL;
   this->input_class.get_autoplay_list = NULL;
-  this->input_class.dispose           = net_class_dispose;
+  this->input_class.dispose           = default_input_class_dispose;
   this->input_class.eject_media       = NULL;
 
   return this;
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index b11e1d6b3..aadef9681 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -259,12 +259,6 @@ static input_plugin_t *pnm_class_get_instance (input_class_t *cls_gen, xine_stre
  * pnm input plugin class stuff
  */
 
-static void pnm_class_dispose (input_class_t *this_gen) {
-  pnm_input_class_t  *this = (pnm_input_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_class (xine_t *xine, void *data) {
 
   pnm_input_class_t  *this;
@@ -278,7 +272,7 @@ static void *init_class (xine_t *xine, void *data) {
   this->input_class.description        = N_("pnm streaming input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
-  this->input_class.dispose            = pnm_class_dispose;
+  this->input_class.dispose            = default_input_class_dispose;
   this->input_class.eject_media        = NULL;
 
   return this;
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index eaac6afb8..d340aebc3 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -1522,12 +1522,6 @@ static input_plugin_t *pvr_class_get_instance (input_class_t *cls_gen, xine_stre
 /*
  * plugin class functions
  */
-static void pvr_class_dispose (input_class_t *this_gen) {
-  pvr_input_class_t  *this = (pvr_input_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
 
   pvr_input_class_t  *this;
@@ -1550,7 +1544,7 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->input_class.description        = N_("WinTV-PVR 250/350 input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
-  this->input_class.dispose            = pvr_class_dispose;
+  this->input_class.dispose            = default_input_class_dispose;
   this->input_class.eject_media        = NULL;
 
   return this;
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index 5ef5184cc..1914935e1 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -765,12 +765,6 @@ static input_plugin_t *rtp_class_get_instance (input_class_t *cls_gen,
 /*
  *  net plugin class
  */
-static void rtp_class_dispose (input_class_t *this_gen) {
-  rtp_input_class_t  *this = (rtp_input_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_class (xine_t *xine, void *data) {
 
   rtp_input_class_t  *this;
@@ -785,7 +779,7 @@ static void *init_class (xine_t *xine, void *data) {
   this->input_class.identifier        = "RTP/UDP";
   this->input_class.get_dir           = NULL;
   this->input_class.get_autoplay_list = NULL;
-  this->input_class.dispose           = rtp_class_dispose;
+  this->input_class.dispose           = default_input_class_dispose;
   this->input_class.eject_media       = NULL;
 
   return this;
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index eb79586ad..1d8b1fa84 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -279,13 +279,6 @@ static input_plugin_t *rtsp_class_get_instance (input_class_t *cls_gen, xine_str
 /*
  * rtsp input plugin class stuff
  */
-
-static void rtsp_class_dispose (input_class_t *this_gen) {
-  rtsp_input_class_t  *this = (rtsp_input_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_class (xine_t *xine, void *data) {
 
   rtsp_input_class_t  *this;
@@ -299,7 +292,7 @@ static void *init_class (xine_t *xine, void *data) {
   this->input_class.description        = N_("rtsp streaming input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
-  this->input_class.dispose            = rtsp_class_dispose;
+  this->input_class.dispose            = default_input_class_dispose;
   this->input_class.eject_media        = NULL;
 
   return this;
diff --git a/src/input/input_smb.c b/src/input/input_smb.c
index d6f9a78da..cd76ab2ca 100644
--- a/src/input/input_smb.c
+++ b/src/input/input_smb.c
@@ -445,14 +445,6 @@ smb_plugin_open (input_plugin_t *this_gen )
 	return 1;
 }
 
-static void
-smb_class_dispose (input_class_t *this_gen)
-{
-	smb_input_class_t *this = (smb_input_class_t *) this_gen;
-
-	free (this);
-}
-
 static input_plugin_t *
 smb_class_get_instance (input_class_t *class_gen, xine_stream_t *stream,
 		const char *mrl)
@@ -511,7 +503,7 @@ static void
 	this->input_class.description        = N_("CIFS/SMB input plugin based on libsmbclient");
 	this->input_class.get_dir            = smb_class_get_dir;
 	this->input_class.get_autoplay_list  = NULL;
-	this->input_class.dispose            = smb_class_dispose;
+	this->input_class.dispose            = default_input_class_dispose;
 	this->input_class.eject_media        = NULL;
 
  _exit_error:
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 7708ee40d..ad0f8400f 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -344,12 +344,6 @@ static input_plugin_t *stdin_class_get_instance (input_class_t *class_gen,
 /*
  * stdin input plugin class stuff
  */
-static void stdin_class_dispose (input_class_t *this_gen) {
-  stdin_input_class_t  *this = (stdin_input_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_class (xine_t *xine, void *data) {
 
   stdin_input_class_t  *this;
@@ -363,7 +357,7 @@ static void *init_class (xine_t *xine, void *data) {
   this->input_class.description        = N_("stdin streaming input plugin");
   this->input_class.get_dir            = NULL;
   this->input_class.get_autoplay_list  = NULL;
-  this->input_class.dispose            = stdin_class_dispose;
+  this->input_class.dispose            = default_input_class_dispose;
   this->input_class.eject_media        = NULL;
 
   return this;
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 7ed5c172b..6b2349dd2 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1900,13 +1900,6 @@ static input_plugin_t *v4l_class_get_radio_instance (input_class_t *cls_gen,
 /*
  * v4l input plugin class stuff
  */
-
-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;
@@ -1921,7 +1914,7 @@ static void *init_video_class (xine_t *xine, void *data)
   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",
@@ -1953,7 +1946,7 @@ static void *init_radio_class (xine_t *xine, void *data)
   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",
-- 
cgit v1.2.3


From b803c2268c144475f4037677b2eea20f364e35b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Tue, 11 Dec 2007 18:07:02 +0100
Subject: Bump the input plugins interface version to 18 as they got updated.

---
 src/input/input_cdda.c       | 2 +-
 src/input/input_dvb.c        | 2 +-
 src/input/input_dvd.c        | 2 +-
 src/input/input_file.c       | 2 +-
 src/input/input_gnome_vfs.c  | 2 +-
 src/input/input_http.c       | 2 +-
 src/input/input_mms.c        | 2 +-
 src/input/input_net.c        | 2 +-
 src/input/input_pnm.c        | 2 +-
 src/input/input_pvr.c        | 2 +-
 src/input/input_rtp.c        | 2 +-
 src/input/input_rtsp.c       | 2 +-
 src/input/input_smb.c        | 2 +-
 src/input/input_stdin_fifo.c | 2 +-
 src/input/input_v4l.c        | 4 ++--
 src/input/input_vcd.c        | 2 +-
 16 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'src/input')

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 9cb762dbc..df4617e22 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -2763,7 +2763,7 @@ static void *init_plugin (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, "CD", XINE_VERSION_CODE, NULL, init_plugin },
+  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "CD", XINE_VERSION_CODE, NULL, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
 
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index d84877e39..a998d274b 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -3307,6 +3307,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, "DVB", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "DVB", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 5f3676748..446b7c778 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -1894,6 +1894,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, "DVD", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "DVD", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/input/input_file.c b/src/input/input_file.c
index a2259ec1a..1916a71e4 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -1019,6 +1019,6 @@ static void *init_plugin (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, "FILE", XINE_VERSION_CODE, NULL, init_plugin },
+  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "FILE", XINE_VERSION_CODE, NULL, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c
index 3f8c4a745..71a4ada85 100644
--- a/src/input/input_gnome_vfs.c
+++ b/src/input/input_gnome_vfs.c
@@ -377,7 +377,7 @@ static input_info_t input_info_gnomevfs = {
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-	{ PLUGIN_INPUT | PLUGIN_NO_UNLOAD, 17, "gnomevfs", XINE_VERSION_CODE,
+	{ PLUGIN_INPUT | PLUGIN_NO_UNLOAD, 18, "gnomevfs", XINE_VERSION_CODE,
 		&input_info_gnomevfs, init_input_class },
 	{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 90dfba17c..38658b161 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -1158,6 +1158,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, "http", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "http", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index 62652a746..0b9e6c7f2 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -489,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 }
 };
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 85b0b2fe8..7a52f670d 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -530,7 +530,7 @@ 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, 17, "tcp", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT, 18, "tcp", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
 
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index aadef9681..3bc026b69 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -284,7 +284,7 @@ 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, 17, "pnm", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT, 18, "pnm", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
 
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index d340aebc3..ac7c5f2f0 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -1556,7 +1556,7 @@ static void *init_plugin (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, "pvr", XINE_VERSION_CODE, NULL, init_plugin },
+  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, "pvr", XINE_VERSION_CODE, NULL, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
 
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index 1914935e1..c3abf4bf5 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -791,7 +791,7 @@ 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, 17, "rtp", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT, 18, "rtp", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
 
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index 1d8b1fa84..690507d88 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -304,7 +304,7 @@ 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, 17, "rtsp", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT, 18, "rtsp", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
 
diff --git a/src/input/input_smb.c b/src/input/input_smb.c
index cd76ab2ca..8bbbfdfe5 100644
--- a/src/input/input_smb.c
+++ b/src/input/input_smb.c
@@ -521,7 +521,7 @@ static const input_info_t input_info_smb = {
 };
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
-	{ PLUGIN_INPUT, 17, "smb", XINE_VERSION_CODE, &input_info_smb,
+	{ PLUGIN_INPUT, 18, "smb", XINE_VERSION_CODE, &input_info_smb,
 		init_input_class },
 	{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index ad0f8400f..e28a8d0c3 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -369,6 +369,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, 17, "stdin", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT, 18, "stdin", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 6b2349dd2..ff9ea87d0 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1964,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 }
 };
 
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 014f20258..14a924a2a 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -1107,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 }
 };
-- 
cgit v1.2.3


From f7cbfdf9575df64a5ba6f594912ae18c45a1058e Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Tue, 11 Dec 2007 17:22:54 +0000
Subject: Bump the interface version of the VCD plugin (which got missed
 earlier).

---
 src/input/vcd/xineplug_inp_vcd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/input')

diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index c33f73e40..45d9789ba 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -1988,7 +1988,7 @@ _("For tracking down bugs in the VCD plugin. Mask values are:\n"
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 17, (char *) SHORT_PLUGIN_NAME,
+  { PLUGIN_INPUT | PLUGIN_MUST_PRELOAD, 18, (char *) SHORT_PLUGIN_NAME,
     XINE_VERSION_CODE, NULL, vcd_init },
   { PLUGIN_NONE, 0, (char *) "", 0, NULL, NULL }
 };
-- 
cgit v1.2.3