summaryrefslogtreecommitdiff
path: root/src/video_out
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_out')
-rw-r--r--src/video_out/video_out_aa.c6
-rw-r--r--src/video_out/video_out_caca.c6
-rw-r--r--src/video_out/video_out_directfb.c15
-rw-r--r--src/video_out/video_out_directx.c9
-rw-r--r--src/video_out/video_out_fb.c8
-rw-r--r--src/video_out/video_out_macosx.m8
-rw-r--r--src/video_out/video_out_none.c8
-rw-r--r--src/video_out/video_out_opengl.c9
-rw-r--r--src/video_out/video_out_pgx32.c9
-rw-r--r--src/video_out/video_out_pgx64.c10
-rw-r--r--src/video_out/video_out_sdl.c7
-rw-r--r--src/video_out/video_out_stk.c8
-rw-r--r--src/video_out/video_out_syncfb.c10
-rw-r--r--src/video_out/video_out_vidix.c12
-rw-r--r--src/video_out/video_out_xcbshm.c9
-rw-r--r--src/video_out/video_out_xcbxv.c9
-rw-r--r--src/video_out/video_out_xshm.c9
-rw-r--r--src/video_out/video_out_xv.c9
-rw-r--r--src/video_out/video_out_xxmc.c9
19 files changed, 21 insertions, 149 deletions
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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 23:20:53 +0000