summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/input/input_cdda.c12
-rw-r--r--src/input/input_dvb.c13
-rw-r--r--src/input/input_dvd.c16
-rw-r--r--src/input/input_file.c12
-rw-r--r--src/input/input_gnome_vfs.c16
-rw-r--r--src/input/input_http.c12
-rw-r--r--src/input/input_mms.c12
-rw-r--r--src/input/input_net.c12
-rw-r--r--src/input/input_pnm.c12
-rw-r--r--src/input/input_pvr.c14
-rw-r--r--src/input/input_rtp.c13
-rw-r--r--src/input/input_rtsp.c12
-rw-r--r--src/input/input_smb.c16
-rw-r--r--src/input/input_stdin_fifo.c13
-rw-r--r--src/input/input_v4l.c20
-rw-r--r--src/input/input_vcd.c13
-rw-r--r--src/input/vcd/xineplug_inp_vcd.c29
17 files changed, 36 insertions, 211 deletions
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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 13:40:16 +0000