summaryrefslogtreecommitdiff
path: root/src/combined
diff options
context:
space:
mode:
Diffstat (limited to 'src/combined')
-rw-r--r--src/combined/flac_decoder.c7
-rw-r--r--src/combined/flac_demuxer.c11
-rw-r--r--src/combined/nsf_decoder.c11
-rw-r--r--src/combined/nsf_demuxer.c8
-rw-r--r--src/combined/wavpack_decoder.c6
-rw-r--r--src/combined/wavpack_demuxer.c8
-rw-r--r--src/combined/xine_ogg_demuxer.c16
-rw-r--r--src/combined/xine_speex_decoder.c6
-rw-r--r--src/combined/xine_theora_decoder.c9
-rw-r--r--src/combined/xine_vorbis_decoder.c7
10 files changed, 11 insertions, 78 deletions
diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c
index 8d168fc12..0dc6823aa 100644
--- a/src/combined/flac_decoder.c
+++ b/src/combined/flac_decoder.c
@@ -379,11 +379,6 @@ open_plugin (audio_decoder_class_t *class_gen, xine_stream_t *stream) {
/*
* flac plugin class
*/
-
-static void dispose_class (audio_decoder_class_t *this) {
- free (this);
-}
-
static void *
init_plugin (xine_t *xine, void *data) {
flac_class_t *this;
@@ -393,7 +388,7 @@ init_plugin (xine_t *xine, void *data) {
this->decoder_class.open_plugin = open_plugin;
this->decoder_class.identifier = "flacdec";
this->decoder_class.description = N_("flac audio decoder plugin");
- this->decoder_class.dispose = dispose_class;
+ this->decoder_class.dispose = default_audio_decoder_dispose;
return this;
diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c
index df52c770b..b16c56106 100644
--- a/src/combined/flac_demuxer.c
+++ b/src/combined/flac_demuxer.c
@@ -723,15 +723,6 @@ get_mimetypes (demux_class_t *this_gen) {
return "application/x-flac: flac: FLAC Audio;";
}
-static void
-class_dispose (demux_class_t *this_gen) {
- demux_flac_class_t *this = (demux_flac_class_t *) this_gen;
-
- lprintf("class_dispose\n");
-
- free (this);
-}
-
void *
demux_flac_init_class (xine_t *xine, void *data) {
@@ -748,7 +739,7 @@ demux_flac_init_class (xine_t *xine, void *data) {
this->demux_class.identifier = "FLAC";
this->demux_class.get_mimetypes = get_mimetypes;
this->demux_class.get_extensions = get_extensions;
- this->demux_class.dispose = class_dispose;
+ this->demux_class.dispose = default_demux_class_dispose;
return this;
}
diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c
index 861d25bf4..b2694e789 100644
--- a/src/combined/nsf_decoder.c
+++ b/src/combined/nsf_decoder.c
@@ -230,15 +230,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre
return &this->audio_decoder;
}
-/* This function frees the audio decoder class and any other memory that was
- * allocated. */
-static void dispose_class (audio_decoder_class_t *this_gen) {
-
- nsf_class_t *this = (nsf_class_t *)this_gen;
-
- free (this);
-}
-
/* This function allocates a private audio decoder class and initializes
* the class's member functions. */
void *decoder_nsf_init_plugin (xine_t *xine, void *data) {
@@ -250,7 +241,7 @@ void *decoder_nsf_init_plugin (xine_t *xine, void *data) {
this->decoder_class.open_plugin = open_plugin;
this->decoder_class.identifier = "NSF";
this->decoder_class.description = N_("NES Music audio decoder plugin");
- this->decoder_class.dispose = dispose_class;
+ this->decoder_class.dispose = default_audio_decoder_class_dispose;
return this;
}
diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c
index 002e8f90c..f6e5f8eff 100644
--- a/src/combined/nsf_demuxer.c
+++ b/src/combined/nsf_demuxer.c
@@ -357,12 +357,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) {
return NULL;
}
-static void class_dispose (demux_class_t *this_gen) {
- demux_nsf_class_t *this = (demux_nsf_class_t *) this_gen;
-
- free (this);
-}
-
void *demux_nsf_init_plugin (xine_t *xine, void *data) {
demux_nsf_class_t *this;
@@ -373,7 +367,7 @@ void *demux_nsf_init_plugin (xine_t *xine, void *data) {
this->demux_class.identifier = "NSF";
this->demux_class.get_mimetypes = get_mimetypes;
this->demux_class.get_extensions = get_extensions;
- this->demux_class.dispose = class_dispose;
+ this->demux_class.dispose = default_demux_class_dispose;
return this;
}
diff --git a/src/combined/wavpack_decoder.c b/src/combined/wavpack_decoder.c
index 6e450050d..8eb041664 100644
--- a/src/combined/wavpack_decoder.c
+++ b/src/combined/wavpack_decoder.c
@@ -311,10 +311,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre
* wavpack plugin class
*/
-static void dispose_class (audio_decoder_class_t *this) {
- free (this);
-}
-
void *decoder_wavpack_init_plugin (xine_t *xine, void *data) {
wavpack_class_t *this;
@@ -323,7 +319,7 @@ void *decoder_wavpack_init_plugin (xine_t *xine, void *data) {
this->decoder_class.open_plugin = open_plugin;
this->decoder_class.identifier = "wavpackdec";
this->decoder_class.description = N_("wavpack audio decoder plugin");
- this->decoder_class.dispose = dispose_class;
+ this->decoder_class.dispose = default_audio_decoder_class_dispose;
return this;
}
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c
index 010b22245..6ab5013e8 100644
--- a/src/combined/wavpack_demuxer.c
+++ b/src/combined/wavpack_demuxer.c
@@ -386,12 +386,6 @@ static const char *get_mimetypes (demux_class_t *const this_gen) {
return NULL;
}
-static void class_dispose (demux_class_t *const this_gen) {
- demux_wv_class_t *const this = (demux_wv_class_t *) this_gen;
-
- free (this);
-}
-
void *demux_wv_init_plugin (xine_t *const xine, void *const data) {
demux_wv_class_t *const this = xine_xmalloc (sizeof (demux_wv_class_t));
@@ -400,7 +394,7 @@ void *demux_wv_init_plugin (xine_t *const xine, void *const data) {
this->demux_class.identifier = "Wavpack";
this->demux_class.get_mimetypes = get_mimetypes;
this->demux_class.get_extensions = get_extensions;
- this->demux_class.dispose = class_dispose;
+ this->demux_class.dispose = default_demux_class_dispose;
return this;
}
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
index 5cab808b9..6f8dbe658 100644
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -2125,12 +2125,6 @@ static const char *anx_get_mimetypes (demux_class_t *this_gen) {
return "application/x-annodex: ogg: Annodex media;";
}
-static void anx_class_dispose (demux_class_t *this_gen) {
- demux_anx_class_t *this = (demux_anx_class_t *) this_gen;
-
- free (this);
-}
-
static void *anx_init_class (xine_t *xine, void *data) {
demux_anx_class_t *this;
@@ -2141,7 +2135,7 @@ static void *anx_init_class (xine_t *xine, void *data) {
this->demux_class.identifier = "Annodex";
this->demux_class.get_mimetypes = anx_get_mimetypes;
this->demux_class.get_extensions = anx_get_extensions;
- this->demux_class.dispose = anx_class_dispose;
+ this->demux_class.dispose = default_demux_class_dispose;
return this;
}
@@ -2161,12 +2155,6 @@ static const char *ogg_get_mimetypes (demux_class_t *this_gen) {
"application/ogg: ogg: Ogg Stream;";
}
-static void ogg_class_dispose (demux_class_t *this_gen) {
- demux_ogg_class_t *this = (demux_ogg_class_t *) this_gen;
-
- free (this);
-}
-
static void *ogg_init_class (xine_t *xine, void *data) {
demux_ogg_class_t *this;
@@ -2177,7 +2165,7 @@ static void *ogg_init_class (xine_t *xine, void *data) {
this->demux_class.identifier = "OGG";
this->demux_class.get_mimetypes = ogg_get_mimetypes;
this->demux_class.get_extensions = ogg_get_extensions;
- this->demux_class.dispose = ogg_class_dispose;
+ this->demux_class.dispose = default_demux_class_dispose;
return this;
}
diff --git a/src/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c
index 09ac901d4..e4fc44eec 100644
--- a/src/combined/xine_speex_decoder.c
+++ b/src/combined/xine_speex_decoder.c
@@ -376,10 +376,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen,
* speex plugin class
*/
-static void dispose_class (audio_decoder_class_t *this) {
- free (this);
-}
-
void *speex_init_plugin (xine_t *xine, void *data) {
speex_class_t *this;
@@ -389,7 +385,7 @@ void *speex_init_plugin (xine_t *xine, void *data) {
this->decoder_class.open_plugin = open_plugin;
this->decoder_class.identifier = "speex";
this->decoder_class.description = N_("Speex audio decoder plugin");
- this->decoder_class.dispose = dispose_class;
+ this->decoder_class.dispose = default_audio_decoder_class_dispose;
return this;
}
diff --git a/src/combined/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c
index 2ce3299fd..8d06a5510 100644
--- a/src/combined/xine_theora_decoder.c
+++ b/src/combined/xine_theora_decoder.c
@@ -343,13 +343,6 @@ static video_decoder_t *theora_open_plugin (video_decoder_class_t *class_gen, xi
/*
* theora plugin class
*/
-static void theora_dispose_class (video_decoder_class_t *this) {
- /*
- * free all class-related resources
- */
- free (this);
-}
-
void *theora_init_plugin (xine_t *xine, void *data) {
/*initialize our plugin*/
theora_class_t *this;
@@ -359,7 +352,7 @@ void *theora_init_plugin (xine_t *xine, void *data) {
this->decoder_class.open_plugin = theora_open_plugin;
this->decoder_class.identifier = "theora video";
this->decoder_class.description = N_("theora video decoder plugin");
- this->decoder_class.dispose = theora_dispose_class;
+ this->decoder_class.dispose = default_video_decoder_class_dispose;
return this;
}
diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c
index d76b1ff44..aa3546e2e 100644
--- a/src/combined/xine_vorbis_decoder.c
+++ b/src/combined/xine_vorbis_decoder.c
@@ -310,11 +310,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen,
/*
* vorbis plugin class
*/
-
-static void dispose_class (audio_decoder_class_t *this) {
- free (this);
-}
-
void *vorbis_init_plugin (xine_t *xine, void *data) {
vorbis_class_t *this;
@@ -324,7 +319,7 @@ void *vorbis_init_plugin (xine_t *xine, void *data) {
this->decoder_class.open_plugin = open_plugin;
this->decoder_class.identifier = "vorbis";
this->decoder_class.description = N_("vorbis audio decoder plugin");
- this->decoder_class.dispose = dispose_class;
+ this->decoder_class.dispose = default_audio_decoder_class_dispose;
return this;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 20:26:12 +0000