summaryrefslogtreecommitdiff
path: root/src/audio_out
diff options
context:
space:
mode:
Diffstat (limited to 'src/audio_out')
-rw-r--r--src/audio_out/audio_alsa_out.c10
-rw-r--r--src/audio_out/audio_coreaudio_out.c10
-rw-r--r--src/audio_out/audio_directx2_out.c8
-rw-r--r--src/audio_out/audio_directx_out.c8
-rw-r--r--src/audio_out/audio_esd_out.c10
-rw-r--r--src/audio_out/audio_file_out.c10
-rw-r--r--src/audio_out/audio_fusionsound_out.c6
-rw-r--r--src/audio_out/audio_jack_out.c9
-rw-r--r--src/audio_out/audio_none_out.c10
-rw-r--r--src/audio_out/audio_oss_out.c10
-rw-r--r--src/audio_out/audio_sun_out.c10
11 files changed, 11 insertions, 90 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 5ee467317..04137fb44 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -1662,14 +1662,6 @@ static void alsa_speaker_arrangement_cb (void *user_data,
/*
* class functions
*/
-
-static void dispose_class (audio_driver_class_t *this_gen) {
-
- alsa_class_t *this = (alsa_class_t *) this_gen;
-
- free (this);
-}
-
static void *init_class (xine_t *xine, void *data) {
alsa_class_t *this;
@@ -1681,7 +1673,7 @@ static void *init_class (xine_t *xine, void *data) {
this->driver_class.open_plugin = open_plugin;
this->driver_class.identifier = "alsa";
this->driver_class.description = N_("xine audio output plugin using alsa-compliant audio devices/drivers");
- this->driver_class.dispose = dispose_class;
+ this->driver_class.dispose = default_audio_driver_class_dispose;
/* this->config = xine->config; */
this->xine = xine;
diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c
index 805996166..f0beac579 100644
--- a/src/audio_out/audio_coreaudio_out.c
+++ b/src/audio_out/audio_coreaudio_out.c
@@ -560,14 +560,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
/*
* class functions
*/
-
-static void dispose_class (audio_driver_class_t *this_gen) {
-
- coreaudio_class_t *this = (coreaudio_class_t *) this_gen;
-
- free (this);
-}
-
static void *init_class (xine_t *xine, void *data) {
coreaudio_class_t *this;
@@ -581,7 +573,7 @@ static void *init_class (xine_t *xine, void *data) {
this->driver_class.open_plugin = open_plugin;
this->driver_class.identifier = "coreaudio";
this->driver_class.description = N_("xine output plugin for Coreaudio/Mac OS X");
- this->driver_class.dispose = dispose_class;
+ this->driver_class.dispose = default_audio_driver_class_dispose;
this->config = xine->config;
this->xine = xine;
diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c
index 961f93a68..97f28b9dd 100644
--- a/src/audio_out/audio_directx2_out.c
+++ b/src/audio_out/audio_directx2_out.c
@@ -988,12 +988,6 @@ static ao_driver_t *open_plugin(audio_driver_class_t *class_gen, const void *dat
return (ao_driver_t *)this;
}
-
-static void dispose_class(audio_driver_class_t *this_gen) {
- free(this_gen);
-}
-
-
static void *init_class(xine_t *xine, void *data) {
dx2_class_t *this;
@@ -1006,7 +1000,7 @@ static void *init_class(xine_t *xine, void *data) {
this->driver_class.open_plugin = open_plugin;
this->driver_class.identifier = "directx2";
this->driver_class.description = N_("second xine audio output plugin using directx");
- this->driver_class.dispose = dispose_class;
+ this->driver_class.dispose = default_audio_driver_class_dispose;
this->xine = xine;
diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c
index d2dc3628f..340f93af9 100644
--- a/src/audio_out/audio_directx_out.c
+++ b/src/audio_out/audio_directx_out.c
@@ -819,12 +819,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
return ( ao_driver_t * ) ao_directx;
}
-static void dispose_class (audio_driver_class_t *this_gen) {
- audiox_class_t *audiox = (audiox_class_t *) this_gen;
-
- free (audiox);
-}
-
static void *init_class (xine_t *xine, void *data) {
audiox_class_t *audiox;
@@ -840,7 +834,7 @@ static void *init_class (xine_t *xine, void *data) {
audiox->driver_class.open_plugin = open_plugin;
audiox->driver_class.identifier = "DirectX";
audiox->driver_class.description = N_("xine audio output plugin for win32 using directx");
- audiox->driver_class.dispose = dispose_class;
+ audiox->driver_class.dispose = default_audio_driver_class_dispose;
audiox->xine = xine;
audiox->config = xine->config;
diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c
index 6c770dd08..f94345194 100644
--- a/src/audio_out/audio_esd_out.c
+++ b/src/audio_out/audio_esd_out.c
@@ -563,14 +563,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
/*
* class functions
*/
-
-static void dispose_class (audio_driver_class_t *this_gen) {
-
- esd_class_t *this = (esd_class_t *) this_gen;
-
- free (this);
-}
-
static void *init_class (xine_t *xine, void *data) {
esd_class_t *this;
@@ -582,7 +574,7 @@ static void *init_class (xine_t *xine, void *data) {
this->driver_class.open_plugin = open_plugin;
this->driver_class.identifier = "esd";
this->driver_class.description = N_("xine audio output plugin using esound");
- this->driver_class.dispose = dispose_class;
+ this->driver_class.dispose = default_audio_driver_class_dispose;
this->xine = xine;
diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
index 6e85e5754..c2382cf21 100644
--- a/src/audio_out/audio_file_out.c
+++ b/src/audio_out/audio_file_out.c
@@ -353,14 +353,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
/*
* class functions
*/
-
-static void dispose_class (audio_driver_class_t *this_gen) {
-
- file_class_t *this = (file_class_t *) this_gen;
-
- free (this);
-}
-
static void *init_class (xine_t *xine, void *data) {
file_class_t *this;
@@ -374,7 +366,7 @@ static void *init_class (xine_t *xine, void *data) {
this->driver_class.open_plugin = open_plugin;
this->driver_class.identifier = "file";
this->driver_class.description = N_("xine file audio output plugin");
- this->driver_class.dispose = dispose_class;
+ this->driver_class.dispose = default_audio_driver_class_dispose;
this->config = xine->config;
this->xine = xine;
diff --git a/src/audio_out/audio_fusionsound_out.c b/src/audio_out/audio_fusionsound_out.c
index 75eac7906..3863c4e7c 100644
--- a/src/audio_out/audio_fusionsound_out.c
+++ b/src/audio_out/audio_fusionsound_out.c
@@ -434,10 +434,6 @@ static ao_driver_t* open_plugin(audio_driver_class_t *ao_class,
* class functions
*/
-static void dispose_class(audio_driver_class_t *ao_class) {
- free (ao_class);
-}
-
static void* init_class(xine_t *xine, void *data) {
fusionsound_class_t *class;
const char *error;
@@ -462,7 +458,7 @@ static void* init_class(xine_t *xine, void *data) {
class->ao_class.open_plugin = open_plugin;
class->ao_class.identifier = "FunsionSound";
class->ao_class.description = N_("xine FusionSound audio output plugin");
- class->ao_class.dispose = dispose_class;
+ class->ao_class.dispose = default_audio_driver_class_dispose;
class->xine = xine;
return class;
diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c
index 38b5cf25c..267c7f85f 100644
--- a/src/audio_out/audio_jack_out.c
+++ b/src/audio_out/audio_jack_out.c
@@ -397,13 +397,6 @@ static ao_driver_t *open_jack_plugin (audio_driver_class_t *class_gen,
/*
* class functions
*/
-
-static void dispose_class (audio_driver_class_t *this_gen) {
-
- jack_class_t *this = (jack_class_t *) this_gen;
- free (this);
-}
-
static void *init_class (xine_t *xine, void *data) {
jack_class_t *this;
@@ -413,7 +406,7 @@ static void *init_class (xine_t *xine, void *data) {
this->driver_class.open_plugin = open_jack_plugin;
this->driver_class.identifier = "jack";
this->driver_class.description = N_("xine output plugin for JACK Audio Connection Kit");
- this->driver_class.dispose = dispose_class;
+ this->driver_class.dispose = default_audio_driver_class_dispose;
this->config = xine->config;
this->xine = xine;
diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c
index f4c9d83c1..f5fb22126 100644
--- a/src/audio_out/audio_none_out.c
+++ b/src/audio_out/audio_none_out.c
@@ -214,14 +214,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen,
/*
* class functions
*/
-
-static void dispose_class (audio_driver_class_t *this_gen) {
-
- none_class_t *this = (none_class_t *) this_gen;
-
- free (this);
-}
-
static void *init_class (xine_t *xine, void *data) {
none_class_t *this;
@@ -235,7 +227,7 @@ static void *init_class (xine_t *xine, void *data) {
this->driver_class.open_plugin = open_plugin;
this->driver_class.identifier = "none";
this->driver_class.description = N_("xine dummy audio output plugin");
- this->driver_class.dispose = dispose_class;
+ this->driver_class.dispose = default_audio_driver_class_dispose;
this->config = xine->config;
this->xine = xine;
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index 52ab01a08..a50296b23 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -1145,14 +1145,6 @@ static void oss_speaker_arrangement_cb (void *user_data,
/*
* class functions
*/
-
-static void dispose_class (audio_driver_class_t *this_gen) {
-
- oss_class_t *this = (oss_class_t *) this_gen;
-
- free (this);
-}
-
static void *init_class (xine_t *xine, void *data) {
oss_class_t *this;
@@ -1164,7 +1156,7 @@ static void *init_class (xine_t *xine, void *data) {
this->driver_class.open_plugin = open_plugin;
this->driver_class.identifier = "oss";
this->driver_class.description = N_("xine audio output plugin using oss-compliant audio devices/drivers");
- this->driver_class.dispose = dispose_class;
+ this->driver_class.dispose = default_audio_driver_class_dispose;
this->config = xine->config;
this->xine = xine;
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index f605854ac..794c3786c 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.c
@@ -1011,14 +1011,6 @@ static ao_driver_t *ao_sun_open_plugin (audio_driver_class_t *class_gen, const v
/*
* class functions
*/
-
-static void ao_sun_dispose_class (audio_driver_class_t *this_gen) {
-
- sun_class_t *this = (sun_class_t *) this_gen;
-
- free (this);
-}
-
static void *ao_sun_init_class (xine_t *xine, void *data) {
sun_class_t *this;
@@ -1029,7 +1021,7 @@ static void *ao_sun_init_class (xine_t *xine, void *data) {
this->driver_class.open_plugin = ao_sun_open_plugin;
this->driver_class.identifier = "sun";
this->driver_class.description = N_("xine audio output plugin using sun-compliant audio devices/drivers");
- this->driver_class.dispose = ao_sun_dispose_class;
+ this->driver_class.dispose = default_audio_driver_class_dispose;
this->xine = xine;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 20:43:33 +0000