From 32a70cef7fdce1648d6850dafbe78bee04830429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 15:40:37 +0100 Subject: Use default_*_class_dispose macro whenever the class dispose function only called free(). --- src/audio_out/audio_alsa_out.c | 10 +--------- src/audio_out/audio_coreaudio_out.c | 10 +--------- src/audio_out/audio_directx2_out.c | 8 +------- src/audio_out/audio_directx_out.c | 8 +------- src/audio_out/audio_esd_out.c | 10 +--------- src/audio_out/audio_file_out.c | 10 +--------- src/audio_out/audio_fusionsound_out.c | 6 +----- src/audio_out/audio_jack_out.c | 9 +-------- src/audio_out/audio_none_out.c | 10 +--------- src/audio_out/audio_oss_out.c | 10 +--------- src/audio_out/audio_sun_out.c | 10 +--------- src/combined/flac_decoder.c | 7 +------ src/combined/flac_demuxer.c | 11 +---------- src/combined/nsf_decoder.c | 11 +---------- src/combined/nsf_demuxer.c | 8 +------- src/combined/wavpack_decoder.c | 6 +----- src/combined/wavpack_demuxer.c | 8 +------- src/combined/xine_ogg_demuxer.c | 16 ++-------------- src/combined/xine_speex_decoder.c | 6 +----- src/combined/xine_theora_decoder.c | 9 +-------- src/combined/xine_vorbis_decoder.c | 7 +------ src/demuxers/demux_4xm.c | 8 +------- src/demuxers/demux_aac.c | 8 +------- src/demuxers/demux_ac3.c | 8 +------- src/demuxers/demux_aiff.c | 8 +------- src/demuxers/demux_asf.c | 9 +-------- src/demuxers/demux_aud.c | 8 +------- src/demuxers/demux_avi.c | 8 +------- src/demuxers/demux_cdda.c | 8 +------- src/demuxers/demux_dts.c | 8 +------- src/demuxers/demux_eawve.c | 6 +----- src/demuxers/demux_elem.c | 8 +------- src/demuxers/demux_film.c | 8 +------- src/demuxers/demux_flac.c | 8 +------- src/demuxers/demux_fli.c | 8 +------- src/demuxers/demux_flv.c | 8 +------- src/demuxers/demux_idcin.c | 8 +------- src/demuxers/demux_iff.c | 8 +------- src/demuxers/demux_image.c | 9 +-------- src/demuxers/demux_ipmovie.c | 8 +------- src/demuxers/demux_matroska.c | 9 +-------- src/demuxers/demux_mng.c | 6 +----- src/demuxers/demux_mod.c | 8 +------- src/demuxers/demux_mpc.c | 8 +------- src/demuxers/demux_mpeg.c | 8 +------- src/demuxers/demux_mpeg_block.c | 9 +-------- src/demuxers/demux_mpeg_pes.c | 9 +-------- src/demuxers/demux_mpgaudio.c | 9 +-------- src/demuxers/demux_nsv.c | 8 +------- src/demuxers/demux_playlist.c | 8 +------- src/demuxers/demux_pva.c | 8 +------- src/demuxers/demux_qt.c | 9 +-------- src/demuxers/demux_rawdv.c | 8 +------- src/demuxers/demux_real.c | 8 +------- src/demuxers/demux_realaudio.c | 8 +------- src/demuxers/demux_roq.c | 8 +------- src/demuxers/demux_shn.c | 8 +------- src/demuxers/demux_slave.c | 8 +------- src/demuxers/demux_smjpeg.c | 8 +------- src/demuxers/demux_snd.c | 8 +------- src/demuxers/demux_str.c | 7 +------ src/demuxers/demux_ts.c | 9 +-------- src/demuxers/demux_tta.c | 8 +------- src/demuxers/demux_vmd.c | 8 +------- src/demuxers/demux_voc.c | 8 +------- src/demuxers/demux_vox.c | 8 +------- src/demuxers/demux_vqa.c | 8 +------- src/demuxers/demux_wav.c | 8 +------- src/demuxers/demux_wc3movie.c | 8 +------- src/demuxers/demux_yuv4mpeg2.c | 8 +------- src/demuxers/demux_yuv_frames.c | 8 +------- src/dxr3/dxr3_decode_spu.c | 9 +-------- src/dxr3/dxr3_decode_video.c | 9 +-------- 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 ++--------- src/libffmpeg/ff_audio_decoder.c | 6 +----- src/libffmpeg/ff_dvaudio_decoder.c | 6 +----- src/libffmpeg/ff_video_decoder.c | 6 +----- src/libmpeg2/xine_mpeg2_decoder.c | 7 +------ src/libmpeg2new/xine_mpeg2new_decoder.c | 7 +------ src/libreal/xine_real_audio_decoder.c | 7 +------ src/libreal/xine_real_video_decoder.c | 7 +------ src/libspucc/xine_cc_decoder.c | 7 +------ src/libspucmml/xine_cmml_decoder.c | 6 +----- src/libspudec/xine_spu_decoder.c | 10 +--------- src/libspudvb/xine_spudvb_decoder.c | 7 +------ src/libsputext/demux_sputext.c | 8 +------- src/libw32dll/qt_decoder.c | 13 ++----------- src/libw32dll/w32codec.c | 13 ++----------- src/libxineadec/gsm610.c | 6 +----- src/libxineadec/xine_a52_decoder.c | 7 +------ src/libxineadec/xine_dts_decoder.c | 8 +------- src/libxineadec/xine_faad_decoder.c | 6 +----- src/libxineadec/xine_lpcm_decoder.c | 6 +----- src/libxineadec/xine_mad_decoder.c | 7 +------ src/libxineadec/xine_musepack_decoder.c | 9 +-------- src/libxinevdec/bitplane.c | 6 +----- src/libxinevdec/gdkpixbuf.c | 11 +---------- src/libxinevdec/image.c | 11 +---------- src/libxinevdec/rgb.c | 6 +----- src/libxinevdec/yuv.c | 6 +----- src/post/audio/stretch.c | 7 +------ src/post/audio/upmix.c | 7 +------ src/post/audio/upmix_mono.c | 7 +------ src/post/audio/volnorm.c | 7 +------ src/post/visualizations/fftgraph.c | 7 +------ src/post/visualizations/fftscope.c | 7 +------ src/post/visualizations/fooviz.c | 7 +------ src/post/visualizations/oscope.c | 7 +------ src/vdr/input_vdr.c | 10 +--------- src/vdr/post_vdr_audio.c | 9 +-------- src/vdr/post_vdr_video.c | 9 +-------- src/video_out/video_out_aa.c | 6 +----- src/video_out/video_out_caca.c | 6 +----- src/video_out/video_out_directfb.c | 15 ++------------- src/video_out/video_out_directx.c | 9 +-------- src/video_out/video_out_fb.c | 8 +------- src/video_out/video_out_macosx.m | 8 +------- src/video_out/video_out_none.c | 8 +------- src/video_out/video_out_opengl.c | 9 +-------- src/video_out/video_out_pgx32.c | 9 +-------- src/video_out/video_out_pgx64.c | 10 +--------- src/video_out/video_out_sdl.c | 7 +------ src/video_out/video_out_stk.c | 8 +------- src/video_out/video_out_syncfb.c | 10 +--------- src/video_out/video_out_vidix.c | 12 ++---------- src/video_out/video_out_xcbshm.c | 9 +-------- src/video_out/video_out_xcbxv.c | 9 +-------- src/video_out/video_out_xshm.c | 9 +-------- src/video_out/video_out_xv.c | 9 +-------- src/video_out/video_out_xxmc.c | 9 +-------- 137 files changed, 143 insertions(+), 991 deletions(-) (limited to 'src') 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; 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; } diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index 534686d47..8df2dec02 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -529,12 +529,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_fourxm_class_t *this = (demux_fourxm_class_t *) this_gen; - - free (this); -} - void *demux_fourxm_init_plugin (xine_t *xine, void *data) { demux_fourxm_class_t *this; @@ -545,7 +539,7 @@ void *demux_fourxm_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "4X Technologies"; 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/demuxers/demux_aac.c b/src/demuxers/demux_aac.c index ff82f439e..415521852 100644 --- a/src/demuxers/demux_aac.c +++ b/src/demuxers/demux_aac.c @@ -316,12 +316,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_aac_class_t *this = (demux_aac_class_t *) this_gen; - - free (this); -} - void *demux_aac_init_plugin (xine_t *xine, void *data) { demux_aac_class_t *this; @@ -332,7 +326,7 @@ void *demux_aac_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "AAC"; 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/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 1cb2ec62b..d3a938909 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -474,12 +474,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_ac3_class_t *this = (demux_ac3_class_t *) this_gen; - - free (this); -} - void *demux_ac3_init_plugin (xine_t *xine, void *data) { demux_ac3_class_t *this; @@ -490,7 +484,7 @@ void *demux_ac3_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "AC3"; 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/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index 7287db0bc..4cb693c39 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -396,12 +396,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "audio/x-pn-aiff: aif, aiff: AIFF audio;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_aiff_class_t *this = (demux_aiff_class_t *) this_gen; - - free (this); -} - void *demux_aiff_init_plugin (xine_t *xine, void *data) { demux_aiff_class_t *this; @@ -412,7 +406,7 @@ void *demux_aiff_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "AIFF"; 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/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 2fc747802..b557abdfe 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -2113,13 +2113,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "video/x-ms-wax: wva: wma metafile;"; } -static void class_dispose (demux_class_t *this_gen) { - - demux_asf_class_t *this = (demux_asf_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_asf_class_t *this; @@ -2133,7 +2126,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "ASF"; 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/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index 8df886fdb..6b72d44eb 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.c @@ -326,12 +326,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_aud_class_t *this = (demux_aud_class_t *) this_gen; - - free (this); -} - void *demux_aud_init_plugin (xine_t *xine, void *data) { demux_aud_class_t *this; @@ -342,7 +336,7 @@ void *demux_aud_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "Westwood Studios AUD"; 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/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 0f8e19266..51fb488e4 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -2319,12 +2319,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "video/x-msvideo: avi: AVI video;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_avi_class_t *this = (demux_avi_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_avi_class_t *this; @@ -2335,7 +2329,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "AVI"; 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/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index 26fe6bbfb..a8e59796a 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -233,12 +233,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_cdda_class_t *this = (demux_cdda_class_t *) this_gen; - - free (this); -} - void *demux_cdda_init_plugin (xine_t *xine, void *data) { demux_cdda_class_t *this; @@ -249,7 +243,7 @@ void *demux_cdda_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "CDDA"; 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/demuxers/demux_dts.c b/src/demuxers/demux_dts.c index b89ec3cc0..c64b7dc17 100644 --- a/src/demuxers/demux_dts.c +++ b/src/demuxers/demux_dts.c @@ -401,12 +401,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_dts_class_t *this = (demux_dts_class_t *) this_gen; - - free (this); -} - void *demux_dts_init_plugin (xine_t *xine, void *data) { demux_dts_class_t *this; @@ -417,7 +411,7 @@ void *demux_dts_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "DTS"; 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/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index 08e6f82b5..49086678d 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -406,10 +406,6 @@ static const char *get_mimetypes(demux_class_t *this_gen){ return NULL; } -static void class_dispose(demux_class_t *this){ - free(this); -} - void *demux_eawve_init_plugin(xine_t *xine, void *data) { demux_eawve_class_t *this; @@ -420,7 +416,7 @@ void *demux_eawve_init_plugin(xine_t *xine, void *data) { this->demux_class.identifier = "EA WVE"; 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/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 4517604f7..2cf50dcc2 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -267,12 +267,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_mpeg_elem_class_t *this = (demux_mpeg_elem_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_mpeg_elem_class_t *this; @@ -283,7 +277,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "MPEG_ELEM"; 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/demuxers/demux_film.c b/src/demuxers/demux_film.c index 78c596af6..261aaac89 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -910,12 +910,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_film_class_t *this = (demux_film_class_t *) this_gen; - - free (this); -} - void *demux_film_init_plugin (xine_t *xine, void *data) { demux_film_class_t *this; @@ -926,7 +920,7 @@ void *demux_film_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "FILM (CPK)"; 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/demuxers/demux_flac.c b/src/demuxers/demux_flac.c index eee8dbd73..accfbcb4e 100644 --- a/src/demuxers/demux_flac.c +++ b/src/demuxers/demux_flac.c @@ -538,12 +538,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_flac_class_t *this = (demux_flac_class_t *) this_gen; - - free (this); -} - void *demux_flac_init_plugin (xine_t *xine, void *data) { demux_flac_class_t *this; @@ -554,7 +548,7 @@ void *demux_flac_init_plugin (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/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index 0b7173955..c56d55e75 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -360,12 +360,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return "video/x-flic: fli,flc: Autodesk FLIC files;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_fli_class_t *this = (demux_fli_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_fli_class_t *this; @@ -376,7 +370,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "FLI/FLC"; 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/demuxers/demux_flv.c b/src/demuxers/demux_flv.c index 5d0c8f9ab..10f9c9afe 100644 --- a/src/demuxers/demux_flv.c +++ b/src/demuxers/demux_flv.c @@ -887,12 +887,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return "video/x-flv: flv: Flash video;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_flv_class_t *this = (demux_flv_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_flv_class_t *this; @@ -903,7 +897,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "FLV"; 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/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index ebdcf6e77..76d460476 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -531,12 +531,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_idcin_class_t *this = (demux_idcin_class_t *) this_gen; - - free (this); -} - void *demux_idcin_init_plugin (xine_t *xine, void *data) { demux_idcin_class_t *this; @@ -547,7 +541,7 @@ void *demux_idcin_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "Id CIN"; 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/demuxers/demux_iff.c b/src/demuxers/demux_iff.c index 51708276a..97d9c7a62 100644 --- a/src/demuxers/demux_iff.c +++ b/src/demuxers/demux_iff.c @@ -1298,12 +1298,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "video/anim: anim: IFF-ANIM Video;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_iff_class_t *this = (demux_iff_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_iff_class_t *this; @@ -1314,7 +1308,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "IFF"; 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/demuxers/demux_image.c b/src/demuxers/demux_image.c index c1ae2b28f..2a1e56230 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -231,13 +231,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_image_class_t *this = (demux_image_class_t *) this_gen; - - lprintf("class closed\n"); - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_image_class_t *this; @@ -248,7 +241,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "imagedmx"; 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; lprintf("class opened\n"); return this; diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index be8ecf084..22656acca 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.c @@ -729,12 +729,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_ipmovie_class_t *this = (demux_ipmovie_class_t *) this_gen; - - free (this); -} - void *demux_ipmovie_init_plugin (xine_t *xine, void *data) { demux_ipmovie_class_t *this; @@ -745,7 +739,7 @@ void *demux_ipmovie_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "Interplay MVE"; 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/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 2b4f63d9c..b4c79afd7 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -2871,13 +2871,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { } -static void class_dispose (demux_class_t *this_gen) { - - demux_matroska_class_t *this = (demux_matroska_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_matroska_class_t *this; @@ -2890,7 +2883,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "matroska"; 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/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index 64dcb71d3..67e9e175e 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -345,10 +345,6 @@ static const char *get_mimetypes(demux_class_t *this_gen){ "video/x-mng: mng: MNG animation;"; } -static void class_dispose(demux_class_t *this){ - free (this); -} - static void *init_plugin(xine_t *xine, void *data){ demux_mng_class_t *this; @@ -359,7 +355,7 @@ static void *init_plugin(xine_t *xine, void *data){ this->demux_class.identifier = "MNG"; 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/demuxers/demux_mod.c b/src/demuxers/demux_mod.c index 991e93cb8..ff68fdd42 100644 --- a/src/demuxers/demux_mod.c +++ b/src/demuxers/demux_mod.c @@ -360,12 +360,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_mod_class_t *this = (demux_mod_class_t *) this_gen; - - free (this); -} - static void *demux_mod_init_plugin (xine_t *xine, void *data) { demux_mod_class_t *this; @@ -376,7 +370,7 @@ static void *demux_mod_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "mod"; 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/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c index 1e39d7d4d..2192ccf45 100644 --- a/src/demuxers/demux_mpc.c +++ b/src/demuxers/demux_mpc.c @@ -380,12 +380,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_mpc_class_t *this = (demux_mpc_class_t *) this_gen; - - free (this); -} - void *demux_mpc_init_plugin (xine_t *xine, void *data) { demux_mpc_class_t *this; @@ -396,7 +390,7 @@ void *demux_mpc_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "Musepack"; 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/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index ded69e73a..48bf31737 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -1229,12 +1229,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "video/x-mpeg: mpeg, mpg, mpe: MPEG animation;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_mpeg_class_t *this = (demux_mpeg_class_t *) this_gen; - - free (this); - } - static void *init_plugin (xine_t *xine, void *data) { demux_mpeg_class_t *this; @@ -1245,7 +1239,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "MPEG"; 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/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index e92b19b3d..390043b4d 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -1521,13 +1521,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - - demux_mpeg_block_class_t *this = (demux_mpeg_block_class_t *) this_gen; - - free (this); - } - static void *init_plugin (xine_t *xine, void *data) { demux_mpeg_block_class_t *this; @@ -1541,7 +1534,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "MPEG_BLOCK"; 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/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 2a3b14f5c..c24919867 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -1768,13 +1768,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - - demux_mpeg_pes_class_t *this = (demux_mpeg_pes_class_t *) this_gen; - - free (this); - } - static void *init_plugin (xine_t *xine, void *data) { demux_mpeg_pes_class_t *this; @@ -1787,7 +1780,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "MPEG_PES"; 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/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 79886f7e6..bbb95e893 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -1058,13 +1058,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return ""; } -static void class_dispose (demux_class_t *this_gen) { - - demux_mpgaudio_class_t *this = (demux_mpgaudio_class_t *) this_gen; - - free (this); -} - void *demux_mpgaudio_init_class (xine_t *xine, void *data) { demux_mpgaudio_class_t *this; @@ -1077,7 +1070,7 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data) { this->demux_class.identifier = "MPEGAUDIO"; 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/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 3f931b1c6..ee87a2f34 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -651,12 +651,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_nsv_class_t *this = (demux_nsv_class_t *) this_gen; - - free (this); -} - static void *demux_nsv_init_plugin (xine_t *xine, void *data) { demux_nsv_class_t *this; @@ -667,7 +661,7 @@ static void *demux_nsv_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "Nullsoft NSV"; 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/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c index da8e526ce..d9402479d 100644 --- a/src/demuxers/demux_playlist.c +++ b/src/demuxers/demux_playlist.c @@ -703,12 +703,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "application/xspf+xml: xspf: XSPF playlist;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_playlist_class_t *this = (demux_playlist_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_playlist_class_t *this; @@ -719,7 +713,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "playlist"; 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/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index 8b162b0a7..027029885 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -486,12 +486,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_pva_class_t *this = (demux_pva_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_pva_class_t *this; @@ -502,7 +496,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "TechnoTrend PVA"; 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/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 83d72a349..03903e472 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -3133,13 +3133,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "application/x-quicktimeplayer: qtl: Quicktime list;"; } -static void class_dispose (demux_class_t *this_gen) { - - demux_qt_class_t *this = (demux_qt_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_qt_class_t *this; @@ -3153,7 +3146,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "MOV/MPEG-4"; 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/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index 07b438032..067f88d1c 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -419,12 +419,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_raw_dv_class_t *this = (demux_raw_dv_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_raw_dv_class_t *this; @@ -435,7 +429,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "raw_dv"; 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/demuxers/demux_real.c b/src/demuxers/demux_real.c index 4d7222506..9f6a693ee 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -1627,12 +1627,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "application/vnd.rn-realmedia: ra, rm, ram: Real Media file;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_real_class_t *this = (demux_real_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_real_class_t *this; @@ -1643,7 +1637,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "Real"; 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/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index 76d9de003..f17f12800 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.c @@ -385,12 +385,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return "audio/x-realaudio: ra: RealAudio File;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_ra_class_t *this = (demux_ra_class_t *) this_gen; - - free (this); -} - void *demux_realaudio_init_plugin (xine_t *xine, void *data) { demux_ra_class_t *this; @@ -401,7 +395,7 @@ void *demux_realaudio_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "RA"; 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/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 920e19fdf..146995ae9 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -468,12 +468,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_roq_class_t *this = (demux_roq_class_t *) this_gen; - - free (this); -} - void *demux_roq_init_plugin (xine_t *xine, void *data) { demux_roq_class_t *this; @@ -484,7 +478,7 @@ void *demux_roq_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "RoQ"; 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/demuxers/demux_shn.c b/src/demuxers/demux_shn.c index f2d5dc7dd..3654cc074 100644 --- a/src/demuxers/demux_shn.c +++ b/src/demuxers/demux_shn.c @@ -236,12 +236,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_shn_class_t *this = (demux_shn_class_t *) this_gen; - - free (this); -} - void *demux_shn_init_plugin (xine_t *xine, void *data) { demux_shn_class_t *this; @@ -252,7 +246,7 @@ void *demux_shn_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "Shorten"; 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/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index 22eed6973..036c89dc4 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -397,12 +397,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_slave_class_t *this = (demux_slave_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_slave_class_t *this; @@ -413,7 +407,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "slave"; 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/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index d1a1c2f58..8c3b4663f 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -457,12 +457,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_smjpeg_class_t *this = (demux_smjpeg_class_t *) this_gen; - - free (this); -} - void *demux_smjpeg_init_plugin (xine_t *xine, void *data) { demux_smjpeg_class_t *this; @@ -473,7 +467,7 @@ void *demux_smjpeg_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "SMJPEG"; 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/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index b15a99266..f3d7458f8 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -378,12 +378,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { } -static void class_dispose (demux_class_t *this_gen) { - demux_snd_class_t *this = (demux_snd_class_t *) this_gen; - - free (this); -} - void *demux_snd_init_plugin (xine_t *xine, void *data) { demux_snd_class_t *this; @@ -394,7 +388,7 @@ void *demux_snd_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "SND/AU"; 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/demuxers/demux_str.c b/src/demuxers/demux_str.c index 65d7d2368..b878be2e8 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -612,11 +612,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_str_class_t *this = (demux_str_class_t *) this_gen; - free (this); -} - void *demux_str_init_plugin (xine_t *xine, void *data) { demux_str_class_t *this; @@ -627,7 +622,7 @@ void *demux_str_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "PSX STR"; 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/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 3c11d0a39..2e1ab4ce6 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -2271,13 +2271,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - - demux_ts_class_t *this = (demux_ts_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_ts_class_t *this; @@ -2291,7 +2284,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "MPEG_TS"; 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/demuxers/demux_tta.c b/src/demuxers/demux_tta.c index ebb201f1d..294ed81c8 100644 --- a/src/demuxers/demux_tta.c +++ b/src/demuxers/demux_tta.c @@ -289,12 +289,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_tta_class_t *this = (demux_tta_class_t *) this_gen; - - free (this); -} - void *demux_tta_init_plugin (xine_t *xine, void *data) { demux_tta_class_t *this; @@ -305,7 +299,7 @@ void *demux_tta_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "True Audio"; 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/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c index fd67385a9..1f17ede1f 100644 --- a/src/demuxers/demux_vmd.c +++ b/src/demuxers/demux_vmd.c @@ -478,12 +478,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_vmd_class_t *this = (demux_vmd_class_t *) this_gen; - - free (this); -} - void *demux_vmd_init_plugin (xine_t *xine, void *data) { demux_vmd_class_t *this; @@ -494,7 +488,7 @@ void *demux_vmd_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "VMD"; 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/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index 0c641c522..7ab909c2d 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -353,12 +353,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_voc_class_t *this = (demux_voc_class_t *) this_gen; - - free (this); -} - void *demux_voc_init_plugin (xine_t *xine, void *data) { demux_voc_class_t *this; @@ -369,7 +363,7 @@ void *demux_voc_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "VOC"; 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/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index 8ee555046..32fe83373 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -230,12 +230,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_vox_class_t *this = (demux_vox_class_t *) this_gen; - - free (this); -} - void *demux_vox_init_plugin (xine_t *xine, void *data) { demux_vox_class_t *this; @@ -246,7 +240,7 @@ void *demux_vox_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "VOX"; 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/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index a980745da..3dbe058da 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -391,12 +391,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_vqa_class_t *this = (demux_vqa_class_t *) this_gen; - - free (this); -} - void *demux_vqa_init_plugin (xine_t *xine, void *data) { demux_vqa_class_t *this; @@ -407,7 +401,7 @@ void *demux_vqa_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "VQA"; 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/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index f30fec555..f0480d1bc 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -402,12 +402,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { "audio/x-pn-windows-acm: wav: WAV audio;"; } -static void class_dispose (demux_class_t *this_gen) { - demux_wav_class_t *this = (demux_wav_class_t *) this_gen; - - free (this); -} - void *demux_wav_init_plugin (xine_t *xine, void *data) { demux_wav_class_t *this; @@ -418,7 +412,7 @@ void *demux_wav_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "WAV"; 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/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index 24032da2d..33958cb2c 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -722,12 +722,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_mve_class_t *this = (demux_mve_class_t *) this_gen; - - free (this); -} - void *demux_wc3movie_init_plugin (xine_t *xine, void *data) { demux_mve_class_t *this; @@ -738,7 +732,7 @@ void *demux_wc3movie_init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "WC3 Movie"; 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/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 02165b016..eaed4c274 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -460,12 +460,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_yuv4mpeg2_class_t *this = (demux_yuv4mpeg2_class_t *) this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { demux_yuv4mpeg2_class_t *this; @@ -476,7 +470,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->demux_class.identifier = "YUV4MPEG2"; 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/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index 7f011f5c8..71915cb9a 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -236,12 +236,6 @@ static const char *get_mimetypes (demux_class_t *this_gen) { return NULL; } -static void class_dispose (demux_class_t *this_gen) { - demux_yuv_frames_class_t *this = (demux_yuv_frames_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *data) { demux_yuv_frames_class_t *this; @@ -252,7 +246,7 @@ static void *init_class (xine_t *xine, void *data) { this->demux_class.identifier = "YUV_FRAMES"; 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/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index b83f94782..c921c06f0 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -80,7 +80,6 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { /* plugin class functions */ static spu_decoder_t *dxr3_spudec_open_plugin(spu_decoder_class_t *class_gen, xine_stream_t *stream); -static void dxr3_spudec_class_dispose(spu_decoder_class_t *class_gen); /* plugin instance functions */ static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf); @@ -202,7 +201,7 @@ static void *dxr3_spudec_init_plugin(xine_t *xine, void* data) this->spu_decoder_class.open_plugin = dxr3_spudec_open_plugin; this->spu_decoder_class.identifier = "dxr3-spudec"; this->spu_decoder_class.description = N_("subtitle decoder plugin using the hardware decoding capabilities of a DXR3 decoder card"); - this->spu_decoder_class.dispose = dxr3_spudec_class_dispose; + this->spu_decoder_class.dispose = default_spu_decoder_class_dispose; this->instance = 0; @@ -273,12 +272,6 @@ static spu_decoder_t *dxr3_spudec_open_plugin(spu_decoder_class_t *class_gen, xi return &this->spu_decoder; } -static void dxr3_spudec_class_dispose(spu_decoder_class_t *class_gen) -{ - free(class_gen); -} - - static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf) { dxr3_spudec_t *this = (dxr3_spudec_t *)this_gen; diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 87ea1900c..345627d8f 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -81,7 +81,6 @@ const plugin_info_t xine_plugin_info[] EXPORTED = { /* plugin class functions */ static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_stream_t *stream); -static void dxr3_class_dispose(video_decoder_class_t *class_gen); /* plugin instance functions */ static void dxr3_decode_data(video_decoder_t *this_gen, buf_element_t *buf); @@ -197,7 +196,7 @@ static void *dxr3_init_plugin(xine_t *xine, void *data) this->video_decoder_class.open_plugin = dxr3_open_plugin; this->video_decoder_class.identifier = "dxr3-mpeg2"; this->video_decoder_class.description = N_("MPEGI/II decoder plugin using the hardware decoding capabilities of a DXR3 decoder card."); - this->video_decoder_class.dispose = dxr3_class_dispose; + this->video_decoder_class.dispose = default_video_decoder_class_dispose; this->instance = 0; @@ -297,12 +296,6 @@ static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_ return &this->video_decoder; } -static void dxr3_class_dispose(video_decoder_class_t *class_gen) -{ - free(class_gen); -} - - static void dxr3_decode_data(video_decoder_t *this_gen, buf_element_t *buf) { dxr3_decoder_t *this = (dxr3_decoder_t *)this_gen; 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", diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c index ce2d531cf..6dd9205ea 100644 --- a/src/libffmpeg/ff_audio_decoder.c +++ b/src/libffmpeg/ff_audio_decoder.c @@ -415,10 +415,6 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen, return &this->audio_decoder; } -static void ff_audio_dispose_class (audio_decoder_class_t *this) { - free (this); -} - void *init_audio_plugin (xine_t *xine, void *data) { ff_audio_class_t *this ; @@ -428,7 +424,7 @@ void *init_audio_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = ff_audio_open_plugin; this->decoder_class.identifier = "ffmpeg audio"; this->decoder_class.description = N_("ffmpeg based audio decoder plugin"); - this->decoder_class.dispose = ff_audio_dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; pthread_once( &once_control, init_once_routine ); diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c index 60e46ea62..0db76c9b2 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.c @@ -377,10 +377,6 @@ static audio_decoder_t *dvaudio_open_plugin (audio_decoder_class_t *class_gen, x return &this->audio_decoder; } -static void dvaudio_dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *init_dvaudio_plugin (xine_t *xine, void *data) { dvaudio_class_t *this ; @@ -390,7 +386,7 @@ static void *init_dvaudio_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = dvaudio_open_plugin; this->decoder_class.identifier = "dv audio"; this->decoder_class.description = N_("dv audio decoder plugin"); - this->decoder_class.dispose = dvaudio_dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index 9e9f4f129..0b8728f06 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -1524,10 +1524,6 @@ static video_decoder_t *ff_video_open_plugin (video_decoder_class_t *class_gen, return &this->video_decoder; } -static void ff_video_dispose_class (video_decoder_class_t *this) { - free (this); -} - void *init_video_plugin (xine_t *xine, void *data) { ff_video_class_t *this; @@ -1538,7 +1534,7 @@ void *init_video_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = ff_video_open_plugin; this->decoder_class.identifier = "ffmpeg video"; this->decoder_class.description = N_("ffmpeg based video decoder plugin"); - this->decoder_class.dispose = ff_video_dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; this->xine = xine; pthread_once( &once_control, init_once_routine ); diff --git a/src/libmpeg2/xine_mpeg2_decoder.c b/src/libmpeg2/xine_mpeg2_decoder.c index 4e67661dc..788f6bb2f 100644 --- a/src/libmpeg2/xine_mpeg2_decoder.c +++ b/src/libmpeg2/xine_mpeg2_decoder.c @@ -138,11 +138,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre /* * mpeg2 plugin class */ - -static void dispose_class (video_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { mpeg2_class_t *this; @@ -152,7 +147,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "mpeg2dec"; this->decoder_class.description = N_("mpeg2 based video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/libmpeg2new/xine_mpeg2new_decoder.c b/src/libmpeg2new/xine_mpeg2new_decoder.c index 1bed00954..d0c01a0d4 100644 --- a/src/libmpeg2new/xine_mpeg2new_decoder.c +++ b/src/libmpeg2new/xine_mpeg2new_decoder.c @@ -473,11 +473,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre /* * mpeg2 plugin class */ - -static void dispose_class (video_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { mpeg2_class_t *this; @@ -487,7 +482,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "mpeg2new"; this->decoder_class.description = N_("mpeg2 based video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/libreal/xine_real_audio_decoder.c b/src/libreal/xine_real_audio_decoder.c index 60cb47801..5c43f8480 100644 --- a/src/libreal/xine_real_audio_decoder.c +++ b/src/libreal/xine_real_audio_decoder.c @@ -582,11 +582,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, /* * real plugin class */ - -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - void *init_realadec (xine_t *xine, void *data) { real_class_t *this; @@ -597,7 +592,7 @@ void *init_realadec (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "realadec"; this->decoder_class.description = N_("real binary-only codec based audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; _x_real_codecs_init(xine); diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c index 7f8de97bf..617c9f6b5 100644 --- a/src/libreal/xine_real_video_decoder.c +++ b/src/libreal/xine_real_video_decoder.c @@ -510,11 +510,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, /* * real plugin class */ - -static void dispose_class (video_decoder_class_t *this) { - free (this); -} - void *init_realvdec (xine_t *xine, void *data) { real_class_t *this; @@ -525,7 +520,7 @@ void *init_realvdec (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "realvdec"; this->decoder_class.description = N_("real binary-only codec based video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; _x_real_codecs_init(xine); diff --git a/src/libspucc/xine_cc_decoder.c b/src/libspucc/xine_cc_decoder.c index ffb1d17d0..f55b20872 100644 --- a/src/libspucc/xine_cc_decoder.c +++ b/src/libspucc/xine_cc_decoder.c @@ -321,11 +321,6 @@ static spu_decoder_t *spudec_open_plugin (spu_decoder_class_t *class, xine_strea return &this->spu_decoder; } -static void spudec_class_dispose(spu_decoder_class_t *class) { - free(class); -} - - static void *init_spu_decoder_plugin (xine_t *xine, void *data) { spucc_class_t *this ; @@ -335,7 +330,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { this->spu_class.open_plugin = spudec_open_plugin; this->spu_class.identifier = "spucc"; this->spu_class.description = N_("closed caption decoder plugin"); - this->spu_class.dispose = spudec_class_dispose; + this->spu_class.dispose = default_spu_decoder_class_dispose; spucc_register_cfg_vars(this, xine->config); this->cc_cfg.config_version = 0; diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/libspucmml/xine_cmml_decoder.c index 31e6e9302..1223769ff 100644 --- a/src/libspucmml/xine_cmml_decoder.c +++ b/src/libspucmml/xine_cmml_decoder.c @@ -490,10 +490,6 @@ static spu_decoder_t *spucmml_class_open_plugin (spu_decoder_class_t *class_gen, return (spu_decoder_t *) this; } -static void spucmml_class_dispose (spu_decoder_class_t *this) { - free (this); -} - static void update_src_encoding(void *this_gen, xine_cfg_entry_t *entry) { spucmml_class_t *this = (spucmml_class_t *)this_gen; @@ -511,7 +507,7 @@ static void *init_spu_decoder_plugin (xine_t *xine, void *data) { this->class.open_plugin = spucmml_class_open_plugin; this->class.identifier = "spucmml"; this->class.description = N_("CMML subtitle decoder plugin"); - this->class.dispose = spucmml_class_dispose; + this->class.dispose = default_spu_decoder_class_dispose; this->xine = xine; diff --git a/src/libspudec/xine_spu_decoder.c b/src/libspudec/xine_spu_decoder.c index d5c5d8c04..05567b68d 100644 --- a/src/libspudec/xine_spu_decoder.c +++ b/src/libspudec/xine_spu_decoder.c @@ -350,14 +350,6 @@ static spu_decoder_t *open_plugin (spu_decoder_class_t *class_gen, xine_stream_t return &this->spu_decoder; } -static void dispose_class (spu_decoder_class_t *this) { -#ifdef LOG_DEBUG - printf ("libspudec:dispose_class called\n"); -#endif - free (this); -} - - static void *init_plugin (xine_t *xine, void *data) { spudec_class_t *this; @@ -367,7 +359,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "spudec"; this->decoder_class.description = N_("DVD/VOB SPU decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_spu_decoder_class_dispose; lprintf ("libspudec:init_plugin called\n"); return this; diff --git a/src/libspudvb/xine_spudvb_decoder.c b/src/libspudvb/xine_spudvb_decoder.c index fcd8f9aab..79e8932a6 100644 --- a/src/libspudvb/xine_spudvb_decoder.c +++ b/src/libspudvb/xine_spudvb_decoder.c @@ -966,11 +966,6 @@ static spu_decoder_t *dvb_spu_class_open_plugin (spu_decoder_class_t * class_gen return (spu_decoder_t *) this; } -static void dvb_spu_class_dispose (spu_decoder_class_t * this) -{ - free (this); -} - static void *init_spu_decoder_plugin (xine_t * xine, void *data) { @@ -980,7 +975,7 @@ static void *init_spu_decoder_plugin (xine_t * xine, void *data) this->class.open_plugin = dvb_spu_class_open_plugin; this->class.identifier = "spudvb"; this->class.description = N_("DVB subtitle decoder plugin"); - this->class.dispose = dvb_spu_class_dispose; + this->class.dispose = default_spu_decoder_class_dispose; this->xine = xine; diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index 68f436729..6e8b1a646 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.c @@ -1459,12 +1459,6 @@ static const char *get_demux_mimetypes (demux_class_t *this_gen) { /* "text/plain: asc txt sub srt: VIDEO subtitles;" */ } -static void demux_class_dispose (demux_class_t *this_gen) { - demux_sputext_class_t *this = (demux_sputext_class_t *) this_gen; - - free (this); -} - static void config_timeout_cb(void *this_gen, xine_cfg_entry_t *entry) { demux_sputext_class_t *this = (demux_sputext_class_t *)this_gen; @@ -1484,7 +1478,7 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) { this->demux_class.identifier = "sputext"; this->demux_class.get_mimetypes = get_demux_mimetypes; this->demux_class.get_extensions = get_demux_extensions; - this->demux_class.dispose = demux_class_dispose; + this->demux_class.dispose = default_demux_class_dispose; /* * Some subtitling formats, namely AQT and Subrip09, define the end of a diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index 9954d63de..9967b8e70 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_decoder.c @@ -569,11 +569,6 @@ static audio_decoder_t *qta_open_plugin (audio_decoder_class_t *class_gen, /* * qta plugin class */ - -static void qta_dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *qta_init_class (xine_t *xine, void *data) { qta_class_t *this; @@ -589,7 +584,7 @@ static void *qta_init_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = qta_open_plugin; this->decoder_class.identifier = "qta"; this->decoder_class.description = N_("quicktime audio decoder plugin"); - this->decoder_class.dispose = qta_dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } @@ -1073,10 +1068,6 @@ static video_decoder_t *qtv_open_plugin (video_decoder_class_t *class_gen, * qtv plugin class */ -static void qtv_dispose_class (video_decoder_class_t *this) { - free (this); -} - /* * some fake functions to make qt codecs happy */ @@ -1105,7 +1096,7 @@ static void *qtv_init_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = qtv_open_plugin; this->decoder_class.identifier = "qtvdec"; this->decoder_class.description = N_("quicktime binary-only codec based video decoder plugin"); - this->decoder_class.dispose = qtv_dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index e7f13c375..efbf69f67 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -1568,10 +1568,6 @@ static video_decoder_t *open_video_decoder_plugin (video_decoder_class_t *class_ * video decoder class */ -static void dispose_video_class (video_decoder_class_t *this) { - free (this); -} - static void init_routine(void) { pthread_mutex_init (&win32_codec_mutex, NULL); w32v_init_rgb_ycc(); @@ -1590,7 +1586,7 @@ static void *init_video_decoder_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_video_decoder_plugin; this->decoder_class.identifier = "w32v"; this->decoder_class.description = N_("win32 binary video codec plugin"); - this->decoder_class.dispose = dispose_video_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; pthread_once (&once_control, init_routine); @@ -1626,11 +1622,6 @@ static audio_decoder_t *open_audio_decoder_plugin (audio_decoder_class_t *class_ /* * audio decoder plugin class */ - -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *init_audio_decoder_class (xine_t *xine, void *data) { w32a_class_t *this; @@ -1644,7 +1635,7 @@ static void *init_audio_decoder_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_audio_decoder_plugin; this->decoder_class.identifier = "win32 audio"; this->decoder_class.description = N_("win32 binary audio codec plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; pthread_once (&once_control, init_routine); diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c index e56ccf8b4..723f18614 100644 --- a/src/libxineadec/gsm610.c +++ b/src/libxineadec/gsm610.c @@ -249,10 +249,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { gsm610_class_t *this ; @@ -262,7 +258,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "GSM 6.10"; this->decoder_class.description = N_("GSM 6.10 audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libxineadec/xine_a52_decoder.c b/src/libxineadec/xine_a52_decoder.c index 1d99c0ce0..e79958087 100644 --- a/src/libxineadec/xine_a52_decoder.c +++ b/src/libxineadec/xine_a52_decoder.c @@ -769,11 +769,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static void dispose_class (audio_decoder_class_t *this) { - lprintf ("dispose_class called\n"); - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { a52dec_class_t *this; @@ -784,7 +779,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "a/52dec"; this->decoder_class.description = N_("liba52 based a52 audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; cfg = this->config = xine->config; diff --git a/src/libxineadec/xine_dts_decoder.c b/src/libxineadec/xine_dts_decoder.c index b8ba460d7..d12f51e36 100644 --- a/src/libxineadec/xine_dts_decoder.c +++ b/src/libxineadec/xine_dts_decoder.c @@ -547,12 +547,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static void dispose_class (audio_decoder_class_t *this) { - lprintf("dispose_class\n"); - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { dts_class_t *this ; @@ -563,7 +557,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "DTS"; this->decoder_class.description = N_("DTS passthru audio format decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c index b7f6b7630..3eab9b959 100644 --- a/src/libxineadec/xine_faad_decoder.c +++ b/src/libxineadec/xine_faad_decoder.c @@ -445,10 +445,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { faad_class_t *this ; @@ -458,7 +454,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "FAAD"; this->decoder_class.description = N_("Freeware Advanced Audio Decoder"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c index 53ca81c6c..a1c5f1622 100644 --- a/src/libxineadec/xine_lpcm_decoder.c +++ b/src/libxineadec/xine_lpcm_decoder.c @@ -248,10 +248,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { lpcm_class_t *this ; @@ -261,7 +257,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "Linear PCM"; this->decoder_class.description = N_("Linear PCM audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libxineadec/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c index f7850cd54..996daaff8 100644 --- a/src/libxineadec/xine_mad_decoder.c +++ b/src/libxineadec/xine_mad_decoder.c @@ -335,11 +335,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre /* * mad plugin class */ - -static void dispose_class (audio_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { mad_class_t *this; @@ -349,7 +344,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "mad"; this->decoder_class.description = N_("libmad based mpeg audio layer 1/2/3 decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libxineadec/xine_musepack_decoder.c b/src/libxineadec/xine_musepack_decoder.c index cb7d98c66..52d9e0f0b 100644 --- a/src/libxineadec/xine_musepack_decoder.c +++ b/src/libxineadec/xine_musepack_decoder.c @@ -430,13 +430,6 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre return &this->audio_decoder; } -static void dispose_class (audio_decoder_class_t *this_gen) { - - mpc_class_t *this = (mpc_class_t *)this_gen; - - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { mpc_class_t *this ; @@ -446,7 +439,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "mpc"; this->decoder_class.description = N_("mpc: musepack audio decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_audio_decoder_class_dispose; return this; } diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c index a3c314b0b..77cd47db3 100644 --- a/src/libxinevdec/bitplane.c +++ b/src/libxinevdec/bitplane.c @@ -1544,10 +1544,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre return &this->video_decoder; } -static void dispose_class (video_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { bitplane_class_t *this = (bitplane_class_t *) xine_xmalloc (sizeof (bitplane_class_t)); @@ -1555,7 +1551,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "bitplane"; this->decoder_class.description = N_("Raw bitplane video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c index 1b30489f5..1ae0920bd 100644 --- a/src/libxinevdec/gdkpixbuf.c +++ b/src/libxinevdec/gdkpixbuf.c @@ -256,15 +256,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, /* * image plugin class */ - -static void dispose_class (video_decoder_class_t *this_gen) { - image_class_t *this = (image_class_t *) this_gen; - - lprintf("class closed\n"); - - free (this); -} - static void *init_class (xine_t *xine, void *data) { image_class_t *this; @@ -274,7 +265,7 @@ static void *init_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "gdkpixbuf"; this->decoder_class.description = N_("gdk-pixbuf image video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; /* * initialisation of privates diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c index 7fbafe70e..a73440f9c 100644 --- a/src/libxinevdec/image.c +++ b/src/libxinevdec/image.c @@ -234,15 +234,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, /* * image plugin class */ - -static void dispose_class (video_decoder_class_t *this_gen) { - image_class_t *this = (image_class_t *) this_gen; - - lprintf("class closed\n"); - - free (this); -} - static void *init_class (xine_t *xine, void *data) { image_class_t *this; @@ -252,7 +243,7 @@ static void *init_class (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "imagevdec"; this->decoder_class.description = N_("image video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; /* * initialisation of privates diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c index 490069643..85307b155 100644 --- a/src/libxinevdec/rgb.c +++ b/src/libxinevdec/rgb.c @@ -416,10 +416,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre return &this->video_decoder; } -static void dispose_class (video_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { rgb_class_t *this; @@ -429,7 +425,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "RGB"; this->decoder_class.description = N_("Raw RGB video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c index 56f97be5d..fea2ca4af 100644 --- a/src/libxinevdec/yuv.c +++ b/src/libxinevdec/yuv.c @@ -339,10 +339,6 @@ static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stre return &this->video_decoder; } -static void dispose_class (video_decoder_class_t *this) { - free (this); -} - static void *init_plugin (xine_t *xine, void *data) { yuv_class_t *this; @@ -352,7 +348,7 @@ static void *init_plugin (xine_t *xine, void *data) { this->decoder_class.open_plugin = open_plugin; this->decoder_class.identifier = "YUV"; this->decoder_class.description = N_("Raw YUV video decoder plugin"); - this->decoder_class.dispose = dispose_class; + this->decoder_class.dispose = default_video_decoder_class_dispose; return this; } diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c index 688900972..f02b1b899 100644 --- a/src/post/audio/stretch.c +++ b/src/post/audio/stretch.c @@ -659,11 +659,6 @@ static post_plugin_t *stretch_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void stretch_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *stretch_init_plugin(xine_t *xine, void *data) { @@ -675,7 +670,7 @@ void *stretch_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = stretch_open_plugin; class->post_class.identifier = "stretch"; class->post_class.description = N_("Time stretch by a given factor, optionally preserving pitch"); - class->post_class.dispose = stretch_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c index 72f42527c..4d0e2c2a2 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.c @@ -414,11 +414,6 @@ static post_plugin_t *upmix_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void upmix_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *upmix_init_plugin(xine_t *xine, void *data) { @@ -430,7 +425,7 @@ void *upmix_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = upmix_open_plugin; class->post_class.identifier = "upmix"; class->post_class.description = N_("upmix"); - class->post_class.dispose = upmix_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c index dda518277..b28b1f3f5 100644 --- a/src/post/audio/upmix_mono.c +++ b/src/post/audio/upmix_mono.c @@ -329,11 +329,6 @@ static post_plugin_t *upmix_mono_open_plugin(post_class_t *class_gen, int inputs return &this->post; } -static void upmix_mono_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *upmix_mono_init_plugin(xine_t *xine, void *data) { @@ -345,7 +340,7 @@ void *upmix_mono_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = upmix_mono_open_plugin; class->post_class.identifier = "upmix_mono"; class->post_class.description = N_("converts Mono into Stereo"); - class->post_class.dispose = upmix_mono_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c index b09139cd3..7533ba94a 100644 --- a/src/post/audio/volnorm.c +++ b/src/post/audio/volnorm.c @@ -447,11 +447,6 @@ static post_plugin_t *volnorm_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void volnorm_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *volnorm_init_plugin(xine_t *xine, void *data) { @@ -463,7 +458,7 @@ void *volnorm_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = volnorm_open_plugin; class->post_class.identifier = "volnorm"; class->post_class.description = N_("Normalize volume"); - class->post_class.dispose = volnorm_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c index cb6c26015..7e7f52fbf 100644 --- a/src/post/visualizations/fftgraph.c +++ b/src/post/visualizations/fftgraph.c @@ -452,11 +452,6 @@ static post_plugin_t *fftgraph_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void fftgraph_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *fftgraph_init_plugin(xine_t *xine, void *data) { @@ -468,7 +463,7 @@ void *fftgraph_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = fftgraph_open_plugin; class->post_class.identifier = "fftgraph"; class->post_class.description = N_("fftgraph Visualization Post Plugin"); - class->post_class.dispose = fftgraph_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c index c2756b5f1..917af508d 100644 --- a/src/post/visualizations/fftscope.c +++ b/src/post/visualizations/fftscope.c @@ -473,11 +473,6 @@ static post_plugin_t *fftscope_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void fftscope_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *fftscope_init_plugin(xine_t *xine, void *data) { @@ -489,7 +484,7 @@ void *fftscope_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = fftscope_open_plugin; class->post_class.identifier = "FFT Scope"; class->post_class.description = N_("FFT Scope"); - class->post_class.dispose = fftscope_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c index 509e3676f..78803f8d2 100644 --- a/src/post/visualizations/fooviz.c +++ b/src/post/visualizations/fooviz.c @@ -284,11 +284,6 @@ static post_plugin_t *fooviz_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void fooviz_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ static void *fooviz_init_plugin(xine_t *xine, void *data) { @@ -300,7 +295,7 @@ static void *fooviz_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = fooviz_open_plugin; class->post_class.identifier = "fooviz"; class->post_class.description = N_("fooviz"); - class->post_class.dispose = fooviz_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c index 402963331..86b8b2750 100644 --- a/src/post/visualizations/oscope.c +++ b/src/post/visualizations/oscope.c @@ -355,11 +355,6 @@ static post_plugin_t *oscope_open_plugin(post_class_t *class_gen, int inputs, return &this->post; } -static void oscope_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - /* plugin class initialization function */ void *oscope_init_plugin(xine_t *xine, void *data) { @@ -371,7 +366,7 @@ void *oscope_init_plugin(xine_t *xine, void *data) class->post_class.open_plugin = oscope_open_plugin; class->post_class.identifier = "Oscilloscope"; class->post_class.description = N_("Oscilloscope"); - class->post_class.dispose = oscope_class_dispose; + class->post_class.dispose = default_post_class_dispose; class->xine = xine; diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c index 6a49eafce..c07ae2d18 100644 --- a/src/vdr/input_vdr.c +++ b/src/vdr/input_vdr.c @@ -2627,14 +2627,6 @@ static input_plugin_t *vdr_class_get_instance(input_class_t *cls_gen, xine_strea /* * vdr input plugin class stuff */ - -static void vdr_class_dispose (input_class_t *this_gen) -{ - vdr_input_class_t *this = (vdr_input_class_t *)this_gen; - - free(this); -} - static char **vdr_class_get_autoplay_list(input_class_t *this_gen, int *num_files) { @@ -2662,7 +2654,7 @@ static void *init_class(xine_t *xine, void *data) this->input_class.description = N_("VDR display device plugin"); this->input_class.get_dir = NULL; this->input_class.get_autoplay_list = vdr_class_get_autoplay_list; - this->input_class.dispose = vdr_class_dispose; + this->input_class.dispose = default_input_class_dispose; this->input_class.eject_media = NULL; return this; diff --git a/src/vdr/post_vdr_audio.c b/src/vdr/post_vdr_audio.c index 398f86f46..96fa84fb5 100644 --- a/src/vdr/post_vdr_audio.c +++ b/src/vdr/post_vdr_audio.c @@ -58,7 +58,6 @@ static void vdr_audio_select_audio(vdr_audio_post_plugin_t *this, uint8_t channe static post_plugin_t *vdr_audio_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static void vdr_audio_class_dispose(post_class_t *class_gen); /* plugin instance functions */ static void vdr_audio_dispose(post_plugin_t *this_gen); @@ -80,7 +79,7 @@ void *vdr_audio_init_plugin(xine_t *xine, void *data) class->open_plugin = vdr_audio_open_plugin; class->identifier = "vdr_audio"; class->description = N_("modifies every audio frame as requested by VDR"); - class->dispose = vdr_audio_class_dispose; + class->dispose = default_post_class_dispose; return class; } @@ -118,12 +117,6 @@ fprintf(stderr, "~~~~~~~~~~ vdr open plugin\n"); return &this->post_plugin; } -static void vdr_audio_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - - static void vdr_audio_dispose(post_plugin_t *this_gen) { /* diff --git a/src/vdr/post_vdr_video.c b/src/vdr/post_vdr_video.c index 0b1544ae4..ed0eafc35 100644 --- a/src/vdr/post_vdr_video.c +++ b/src/vdr/post_vdr_video.c @@ -81,7 +81,6 @@ static void vdr_video_set_video_window(vdr_video_post_plugin_t *this, int32_t x, static post_plugin_t *vdr_video_open_plugin(post_class_t *class_gen, int inputs, xine_audio_port_t **audio_target, xine_video_port_t **video_target); -static void vdr_video_class_dispose(post_class_t *class_gen); /* plugin instance functions */ static void vdr_video_dispose(post_plugin_t *this_gen); @@ -103,7 +102,7 @@ void *vdr_video_init_plugin(xine_t *xine, void *data) class->open_plugin = vdr_video_open_plugin; class->identifier = "vdr"; class->description = N_("modifies every video frame as requested by VDR"); - class->dispose = vdr_video_class_dispose; + class->dispose = default_post_class_dispose; return class; } @@ -144,12 +143,6 @@ static post_plugin_t *vdr_video_open_plugin(post_class_t *class_gen, int inputs, return &this->post_plugin; } -static void vdr_video_class_dispose(post_class_t *class_gen) -{ - free(class_gen); -} - - static void vdr_video_dispose(post_plugin_t *this_gen) { if (_x_post_dispose(this_gen)) diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index 38fb9f646..5323c3a5e 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -300,10 +300,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi return &this->vo_driver; } -static void dispose_class (video_driver_class_t *this_gen) { - aa_class_t *this = (aa_class_t *) this_gen; - free(this); -} static void *init_class (xine_t *xine, void *visual_gen) { /* aa_context *context = (aa_context*) visual_gen; */ aa_class_t *this; @@ -313,7 +309,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "AA"; this->driver_class.description = N_("xine video output plugin using the ascii-art library"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index 6384ed1aa..fe357cbd4 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -307,10 +307,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi return &this->vo_driver; } -static void dispose_class (video_driver_class_t *this_gen) { - caca_class_t *this = (caca_class_t *) this_gen; - free(this); -} static void *init_class (xine_t *xine, void *visual_gen) { caca_class_t *this; @@ -319,7 +315,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "CACA"; this->driver_class.description = N_("xine video output plugin using the Color AsCii Art library"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index f75c6ae94..3445be127 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -1880,11 +1880,6 @@ static vo_driver_t *open_plugin_fb (video_driver_class_t *class_gen, const void return &this->vo_driver; } -static void dispose_class_fb (video_driver_class_t *this_gen) { - directfb_class_t *this = (directfb_class_t *) this_gen; - free (this); -} - #ifndef DIRECTFB_X11 static void *init_class_fb (xine_t *xine, void *visual_gen) { directfb_class_t *this; @@ -1904,7 +1899,7 @@ static void *init_class_fb (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin_fb; this->driver_class.identifier = "DirectFB"; this->driver_class.description = N_("xine video output plugin using DirectFB."); - this->driver_class.dispose = dispose_class_fb; + this->driver_class.dispose = default_video_driver_class_dispose; this->xine = xine; @@ -2080,12 +2075,6 @@ static vo_driver_t *open_plugin_x11 (video_driver_class_t *class_gen, const void return &this->vo_driver; } -static void dispose_class_x11 (video_driver_class_t *this_gen) { - directfb_class_t *this = (directfb_class_t *) this_gen; - - free (this); -} - static void *init_class_x11 (xine_t *xine, void *visual_gen) { directfb_class_t *this; x11_visual_t *visual = (x11_visual_t *) visual_gen; @@ -2115,7 +2104,7 @@ static void *init_class_x11 (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin_x11; this->driver_class.identifier = "XDirectFB"; this->driver_class.description = N_("xine video output plugin using DirectFB under XDirectFB."); - this->driver_class.dispose = dispose_class_x11; + this->driver_class.dispose = default_video_driver_class_dispose; this->visual_type = XINE_VISUAL_TYPE_X11; this->xine = xine; diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index e39acd435..53a6d2b8a 100644 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -1227,13 +1227,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *wi return ( vo_driver_t * ) win32_driver; } - -static void dispose_class (video_driver_class_t *this_gen) { - directx_class_t *directx = (directx_class_t *) this_gen; - - free (directx); -} - static void *init_class (xine_t *xine, void *visual_gen) { directx_class_t *directx; @@ -1246,7 +1239,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { directx->driver_class.open_plugin = open_plugin; directx->driver_class.identifier = "DirectX"; directx->driver_class.description = N_("xine video output plugin for win32 using directx"); - directx->driver_class.dispose = dispose_class; + directx->driver_class.dispose = default_video_driver_class_dispose; directx->xine = xine; directx->config = xine->config; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index e08661fa2..b7864bc62 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -1046,12 +1046,6 @@ error: return 0; } -static void fb_dispose_class(video_driver_class_t *this_gen) -{ - fb_class_t *this = (fb_class_t *)this_gen; - free(this); -} - static void *fb_init_class(xine_t *xine, void *visual_gen) { fb_class_t *this = (fb_class_t *)xine_xmalloc(sizeof(fb_class_t)); @@ -1059,7 +1053,7 @@ static void *fb_init_class(xine_t *xine, void *visual_gen) this->driver_class.open_plugin = fb_open_plugin; this->driver_class.identifier = "fb"; this->driver_class.description = N_("Xine video output plugin using the Linux frame buffer device"); - this->driver_class.dispose = fb_dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m index 316d0b2ee..84d441aad 100644 --- a/src/video_out/video_out_macosx.m +++ b/src/video_out/video_out_macosx.m @@ -350,12 +350,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void * * Class related functions. */ -static void dispose_class (video_driver_class_t *driver_class) { - macosx_class_t *this = (macosx_class_t *) driver_class; - - free (this); -} - static void *init_class (xine_t *xine, void *visual) { macosx_class_t *this; @@ -364,7 +358,7 @@ static void *init_class (xine_t *xine, void *visual) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "MacOSX"; this->driver_class.description = N_("xine video output plugin for Mac OS X"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index d339f280d..569fa39ef 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.c @@ -269,12 +269,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void * /* * Class related functions. */ -static void dispose_class (video_driver_class_t *driver_class) { - none_class_t *this = (none_class_t *) driver_class; - - free (this); -} - static void *init_class (xine_t *xine, void *visual) { none_class_t *this; @@ -283,7 +277,7 @@ static void *init_class (xine_t *xine, void *visual) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "none"; this->driver_class.description = N_("xine video output plugin which displays nothing"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 1bb582636..c121eef33 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -1954,20 +1954,13 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v /* * class functions */ - -static void opengl_dispose_class (video_driver_class_t *this_gen) { - opengl_class_t *this = (opengl_class_t *) this_gen; - - free (this); -} - static void *opengl_init_class (xine_t *xine, void *visual_gen) { opengl_class_t *this = (opengl_class_t *) xine_xmalloc (sizeof (opengl_class_t)); this->driver_class.open_plugin = opengl_open_plugin; this->driver_class.identifier = "opengl"; this->driver_class.description = N_("xine video output plugin using the OpenGL 3D graphics API"); - this->driver_class.dispose = opengl_dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->xine = xine; return this; diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c index ae4be4431..0ea1592ba 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.c @@ -783,13 +783,6 @@ static void pgx32_dispose(vo_driver_t *this_gen) * XINE VIDEO DRIVER CLASS FUNCTIONS */ -static void pgx32_dispose_class(video_driver_class_t *class_gen) -{ - pgx32_driver_class_t *class = (pgx32_driver_class_t *)(void *)class_gen; - - free(class); -} - static const vo_info_t vo_info_pgx32 = { 10, XINE_VISUAL_TYPE_X11 @@ -869,7 +862,7 @@ static void *pgx32_init_class(xine_t *xine, void *visual_gen) class->vo_driver_class.open_plugin = pgx32_init_driver; class->vo_driver_class.identifier = "pgx32"; class->vo_driver_class.description = N_("xine video output plugin for Sun PGX32 framebuffers"); - class->vo_driver_class.dispose = pgx32_dispose_class; + class->vo_driver_class.dispose = default_video_driver_class_dispose; class->xine = xine; class->config = xine->config; diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index 84a8af85c..b6417a3b2 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.c @@ -1332,14 +1332,6 @@ static void pgx64_config_changed(void *user_data, xine_cfg_entry_t *entry) /* * XINE VIDEO DRIVER CLASS FUNCTIONS */ - -static void pgx64_dispose_class(video_driver_class_t *class_gen) -{ - pgx64_driver_class_t *class = (pgx64_driver_class_t *)(void *)class_gen; - - free(class); -} - static const vo_info_t vo_info_pgx64 = { 10, XINE_VISUAL_TYPE_X11 @@ -1493,7 +1485,7 @@ static void *pgx64_init_class(xine_t *xine, void *visual_gen) class->vo_driver_class.open_plugin = pgx64_init_driver; class->vo_driver_class.identifier = "pgx64"; class->vo_driver_class.description = N_("xine video output plugin for Sun XVR100/PGX64/PGX24 framebuffers"); - class->vo_driver_class.dispose = pgx64_dispose_class; + class->vo_driver_class.dispose = default_video_driver_class_dispose; class->xine = xine; class->config = xine->config; diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index c04d54138..6353d6cc6 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -563,11 +563,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi /** * Class Functions */ -static void dispose_class (video_driver_class_t *this_gen) { - free(this_gen); -} - - static void *init_class (xine_t *xine, void *visual_gen) { /* x11_visual_t *visual = (x11_visual_t *) visual_gen; */ sdl_class_t *this; @@ -585,7 +580,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "SDL"; this->driver_class.description = N_("xine video output plugin using the Simple Direct Media Layer"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index ad4769dcd..c8a88e4f6 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.c @@ -442,12 +442,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis /** * Class Functions */ -static void dispose_class (video_driver_class_t *this_gen) { - //printf("video_out_stk: dispose_class()\n"); - free(this_gen); -} - - static void *init_class (xine_t *xine, void *visual_gen) { stk_class_t* this; @@ -458,7 +452,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "stk"; this->driver_class.description = N_("xine video output plugin using the Libstk Surface Set-top Toolkit"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index a73aca39f..20b515137 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.c @@ -1049,14 +1049,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi /* * class functions */ - -static void dispose_class (video_driver_class_t *this_gen) { - - syncfb_class_t *this = (syncfb_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *visual_gen) { syncfb_class_t *this; @@ -1090,7 +1082,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "SyncFB"; this->driver_class.description = N_("xine video output plugin using the SyncFB module for Matrox G200/G400 cards"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 772b779fa..2b9205516 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -1113,14 +1113,6 @@ static void *init_class (xine_t *xine, void *visual_gen) { return this; } -static void dispose_class (video_driver_class_t *this_gen) { - vidix_class_t *this = (vidix_class_t *) this_gen; - - - - free (this); -} - #ifdef HAVE_X11 static vo_driver_t *vidix_open_plugin (video_driver_class_t *class_gen, const void *visual_gen) { vidix_driver_t *this = open_plugin(class_gen); @@ -1201,7 +1193,7 @@ static void *vidix_init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = vidix_open_plugin; this->driver_class.identifier = "vidix"; this->driver_class.description = N_("xine video output plugin using libvidix for x11"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; } return this; @@ -1275,7 +1267,7 @@ static void *vidixfb_init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = vidixfb_open_plugin; this->driver_class.identifier = "vidixfb"; this->driver_class.description = N_("xine video output plugin using libvidix for linux frame buffer"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; } return this; diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index 645a23c97..61dac18f0 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -1229,20 +1229,13 @@ static vo_driver_t *xshm_open_plugin(video_driver_class_t *class_gen, const void /* * class functions */ - -static void xshm_dispose_class (video_driver_class_t *this_gen) { - xshm_class_t *this = (xshm_class_t *) this_gen; - - free (this); -} - static void *xshm_init_class (xine_t *xine, void *visual_gen) { xshm_class_t *this = (xshm_class_t *) xine_xmalloc (sizeof (xshm_class_t)); this->driver_class.open_plugin = xshm_open_plugin; this->driver_class.identifier = "XShm"; this->driver_class.description = N_("xine video output plugin using the MIT X shared memory extension"); - this->driver_class.dispose = xshm_dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index cc5eb602d..f964ae7af 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -1369,20 +1369,13 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis /* * class functions */ - -static void dispose_class (video_driver_class_t *this_gen) { - xv_class_t *this = (xv_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *visual_gen) { xv_class_t *this = (xv_class_t *) xine_xmalloc (sizeof (xv_class_t)); this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "Xv"; this->driver_class.description = N_("xine video output plugin using the MIT X video extension"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 528435b37..27a996a77 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -1290,20 +1290,13 @@ static vo_driver_t *xshm_open_plugin_old (video_driver_class_t *class_gen, const /* * class functions */ - -static void xshm_dispose_class (video_driver_class_t *this_gen) { - xshm_class_t *this = (xshm_class_t *) this_gen; - - free (this); -} - static void *xshm_init_class (xine_t *xine, void *visual_gen) { xshm_class_t *this = (xshm_class_t *) xine_xmalloc (sizeof (xshm_class_t)); this->driver_class.open_plugin = xshm_open_plugin_old; this->driver_class.identifier = "XShm"; this->driver_class.description = N_("xine video output plugin using the MIT X shared memory extension"); - this->driver_class.dispose = xshm_dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 4949fe843..82b51e4ec 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -1452,20 +1452,13 @@ static vo_driver_t *open_plugin_old (video_driver_class_t *class_gen, const void /* * class functions */ - -static void dispose_class (video_driver_class_t *this_gen) { - xv_class_t *this = (xv_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *visual_gen) { xv_class_t *this = (xv_class_t *) xine_xmalloc (sizeof (xv_class_t)); this->driver_class.open_plugin = open_plugin_old; this->driver_class.identifier = "Xv"; this->driver_class.description = N_("xine video output plugin using the MIT X video extension"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index e77a4b6b7..5fcb95003 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -2749,20 +2749,13 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi /* * class functions */ - -static void dispose_class (video_driver_class_t *this_gen) { - xxmc_class_t *this = (xxmc_class_t *) this_gen; - - free (this); -} - static void *init_class (xine_t *xine, void *visual_gen) { xxmc_class_t *this = (xxmc_class_t *) xine_xmalloc (sizeof (xxmc_class_t)); this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "XxMC"; this->driver_class.description = N_("xine video output plugin using the MIT X video extension"); - this->driver_class.dispose = dispose_class; + this->driver_class.dispose = default_video_driver_class_dispose; this->config = xine->config; this->xine = xine; -- cgit v1.2.3