summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_net.c8
-rw-r--r--src/input/input_pnm.c8
-rw-r--r--src/input/input_pvr.c8
-rw-r--r--src/input/input_rtp.c8
-rw-r--r--src/input/input_rtsp.c9
-rw-r--r--src/input/input_smb.c10
-rw-r--r--src/input/input_stdin_fifo.c8
-rw-r--r--src/input/input_v4l.c11
8 files changed, 9 insertions, 61 deletions
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",