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.c18
-rw-r--r--src/video_out/video_out_caca.c18
-rw-r--r--src/video_out/video_out_directfb.c39
-rw-r--r--src/video_out/video_out_directx.c21
-rw-r--r--src/video_out/video_out_fb.c22
-rw-r--r--src/video_out/video_out_macosx.m19
-rw-r--r--src/video_out/video_out_none.c20
-rw-r--r--src/video_out/video_out_opengl.c21
-rw-r--r--src/video_out/video_out_pgx32.c23
-rw-r--r--src/video_out/video_out_pgx64.c24
-rw-r--r--src/video_out/video_out_sdl.c19
-rw-r--r--src/video_out/video_out_stk.c22
-rw-r--r--src/video_out/video_out_syncfb.c22
-rw-r--r--src/video_out/video_out_vidix.c36
-rw-r--r--src/video_out/video_out_xcbshm.c21
-rw-r--r--src/video_out/video_out_xcbxv.c21
-rw-r--r--src/video_out/video_out_xshm.c21
-rw-r--r--src/video_out/video_out_xv.c21
-rw-r--r--src/video_out/video_out_xvmc.c12
-rw-r--r--src/video_out/video_out_xxmc.c21
20 files changed, 65 insertions, 376 deletions
diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index 035e2d98b..d2b488f5b 100644
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -287,18 +287,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
return &this->vo_driver;
}
-static char* get_identifier (video_driver_class_t *this_gen) {
- return "AA";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using the ascii-art library");
-}
-
-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;
@@ -306,9 +294,9 @@ static void *init_class (xine_t *xine, void *visual_gen) {
this = (aa_class_t *) xine_xmalloc(sizeof(aa_class_t));
this->driver_class.open_plugin = open_plugin;
- this->driver_class.get_identifier = get_identifier;
- this->driver_class.get_description = get_description;
- this->driver_class.dispose = dispose_class;
+ this->driver_class.identifier = "AA";
+ this->driver_class.description = N_("xine video output plugin using the ascii-art library");
+ 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 559efbd6c..d40ad06e3 100644
--- a/src/video_out/video_out_caca.c
+++ b/src/video_out/video_out_caca.c
@@ -292,27 +292,15 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
return &this->vo_driver;
}
-static char* get_identifier (video_driver_class_t *this_gen) {
- return "CACA";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using the Color AsCii Art library");
-}
-
-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;
this = (caca_class_t *) xine_xmalloc(sizeof(caca_class_t));
this->driver_class.open_plugin = open_plugin;
- this->driver_class.get_identifier = get_identifier;
- this->driver_class.get_description = get_description;
- this->driver_class.dispose = dispose_class;
+ this->driver_class.identifier = "CACA";
+ this->driver_class.description = N_("xine video output plugin using the Color AsCii Art library");
+ 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 1ab1fb8e8..3445be127 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -1880,19 +1880,6 @@ static vo_driver_t *open_plugin_fb (video_driver_class_t *class_gen, const void
return &this->vo_driver;
}
-static char* get_identifier_fb (video_driver_class_t *this_gen) {
- return "DirectFB";
-}
-
-static char* get_description_fb (video_driver_class_t *this_gen) {
- return _("xine video output plugin using DirectFB.");
-}
-
-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;
@@ -1910,9 +1897,9 @@ static void *init_class_fb (xine_t *xine, void *visual_gen) {
this = (directfb_class_t *) xine_xmalloc (sizeof (directfb_class_t));
this->driver_class.open_plugin = open_plugin_fb;
- this->driver_class.get_identifier = get_identifier_fb;
- this->driver_class.get_description = get_description_fb;
- this->driver_class.dispose = dispose_class_fb;
+ this->driver_class.identifier = "DirectFB";
+ this->driver_class.description = N_("xine video output plugin using DirectFB.");
+ this->driver_class.dispose = default_video_driver_class_dispose;
this->xine = xine;
@@ -2088,20 +2075,6 @@ static vo_driver_t *open_plugin_x11 (video_driver_class_t *class_gen, const void
return &this->vo_driver;
}
-static char* get_identifier_x11 (video_driver_class_t *this_gen) {
- return "XDirectFB";
-}
-
-static char* get_description_x11 (video_driver_class_t *this_gen) {
- return _("xine video output plugin using DirectFB under XDirectFB.");
-}
-
-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;
@@ -2129,9 +2102,9 @@ static void *init_class_x11 (xine_t *xine, void *visual_gen) {
this = (directfb_class_t *) xine_xmalloc (sizeof (directfb_class_t));
this->driver_class.open_plugin = open_plugin_x11;
- this->driver_class.get_identifier = get_identifier_x11;
- this->driver_class.get_description = get_description_x11;
- this->driver_class.dispose = dispose_class_x11;
+ this->driver_class.identifier = "XDirectFB";
+ this->driver_class.description = N_("xine video output plugin using DirectFB under XDirectFB.");
+ 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 11ee709e1..53a6d2b8a 100644
--- a/src/video_out/video_out_directx.c
+++ b/src/video_out/video_out_directx.c
@@ -1227,21 +1227,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *wi
return ( vo_driver_t * ) win32_driver;
}
-
-static char* get_identifier (video_driver_class_t *this_gen) {
- return "DirectX";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin for win32 using directx");
-}
-
-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;
@@ -1252,9 +1237,9 @@ static void *init_class (xine_t *xine, void *visual_gen) {
directx = (directx_class_t *) xine_xmalloc (sizeof (directx_class_t));
directx->driver_class.open_plugin = open_plugin;
- directx->driver_class.get_identifier = get_identifier;
- directx->driver_class.get_description = get_description;
- directx->driver_class.dispose = dispose_class;
+ directx->driver_class.identifier = "DirectX";
+ directx->driver_class.description = N_("xine video output plugin for win32 using directx");
+ 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 08663ae61..b7864bc62 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -1046,30 +1046,14 @@ error:
return 0;
}
-static char* fb_get_identifier(video_driver_class_t *this_gen)
-{
- return "fb";
-}
-
-static char* fb_get_description(video_driver_class_t *this_gen)
-{
- return _("Xine video output plugin using the Linux frame buffer device");
-}
-
-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));
this->driver_class.open_plugin = fb_open_plugin;
- this->driver_class.get_identifier = fb_get_identifier;
- this->driver_class.get_description = fb_get_description;
- this->driver_class.dispose = fb_dispose_class;
+ this->driver_class.identifier = "fb";
+ this->driver_class.description = N_("Xine video output plugin using the Linux frame buffer device");
+ 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 4621d31b9..84d441aad 100644
--- a/src/video_out/video_out_macosx.m
+++ b/src/video_out/video_out_macosx.m
@@ -349,19 +349,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void *
/*
* Class related functions.
*/
-static char* get_identifier (video_driver_class_t *driver_class) {
- return "MacOSX";
-}
-
-static char* get_description (video_driver_class_t *driver_class) {
- return _("xine video output plugin for Mac OS X");
-}
-
-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;
@@ -369,9 +356,9 @@ static void *init_class (xine_t *xine, void *visual) {
this = (macosx_class_t *) xine_xmalloc(sizeof(macosx_class_t));
this->driver_class.open_plugin = open_plugin;
- this->driver_class.get_identifier = get_identifier;
- this->driver_class.get_description = get_description;
- this->driver_class.dispose = dispose_class;
+ this->driver_class.identifier = "MacOSX";
+ this->driver_class.description = N_("xine video output plugin for Mac OS X");
+ 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 5f2424a60..569fa39ef 100644
--- a/src/video_out/video_out_none.c
+++ b/src/video_out/video_out_none.c
@@ -269,29 +269,15 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void *
/*
* Class related functions.
*/
-static char* get_identifier (video_driver_class_t *driver_class) {
- return "None";
-}
-
-static char* get_description (video_driver_class_t *driver_class) {
- return _("xine video output plugin which displays nothing");
-}
-
-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;
this = (none_class_t *) xine_xmalloc(sizeof(none_class_t));
this->driver_class.open_plugin = open_plugin;
- this->driver_class.get_identifier = get_identifier;
- this->driver_class.get_description = get_description;
- this->driver_class.dispose = dispose_class;
+ this->driver_class.identifier = "none";
+ this->driver_class.description = N_("xine video output plugin which displays nothing");
+ 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 54696f452..c121eef33 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -1954,28 +1954,13 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v
/*
* class functions
*/
-
-static char* opengl_get_identifier (video_driver_class_t *this_gen) {
- return "opengl";
-}
-
-static char* opengl_get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using the OpenGL 3D graphics API");
-}
-
-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.get_identifier = opengl_get_identifier;
- this->driver_class.get_description = opengl_get_description;
- this->driver_class.dispose = opengl_dispose_class;
+ this->driver_class.identifier = "opengl";
+ this->driver_class.description = N_("xine video output plugin using the OpenGL 3D graphics API");
+ 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 d903efc89..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
@@ -855,16 +848,6 @@ static vo_driver_t *pgx32_init_driver(video_driver_class_t *class_gen, const voi
return (vo_driver_t *)this;
}
-static char *pgx32_get_identifier(video_driver_class_t *class_gen)
-{
- return "pgx32";
-}
-
-static char *pgx32_get_description(video_driver_class_t *class_gen)
-{
- return "xine video output plugin for Sun PGX32 framebuffers";
-}
-
static void *pgx32_init_class(xine_t *xine, void *visual_gen)
{
pgx32_driver_class_t *class;
@@ -877,9 +860,9 @@ static void *pgx32_init_class(xine_t *xine, void *visual_gen)
DGA_INIT();
class->vo_driver_class.open_plugin = pgx32_init_driver;
- class->vo_driver_class.get_identifier = pgx32_get_identifier;
- class->vo_driver_class.get_description = pgx32_get_description;
- class->vo_driver_class.dispose = pgx32_dispose_class;
+ 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 = 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 4abb794d7..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
@@ -1479,16 +1471,6 @@ static vo_driver_t *pgx64_init_driver(video_driver_class_t *class_gen, const voi
return (vo_driver_t *)this;
}
-static char *pgx64_get_identifier(video_driver_class_t *class_gen)
-{
- return "pgx64";
-}
-
-static char *pgx64_get_description(video_driver_class_t *class_gen)
-{
- return "xine video output plugin for Sun XVR100/PGX64/PGX24 framebuffers";
-}
-
static void *pgx64_init_class(xine_t *xine, void *visual_gen)
{
pgx64_driver_class_t *class;
@@ -1501,9 +1483,9 @@ static void *pgx64_init_class(xine_t *xine, void *visual_gen)
DGA_INIT();
class->vo_driver_class.open_plugin = pgx64_init_driver;
- class->vo_driver_class.get_identifier = pgx64_get_identifier;
- class->vo_driver_class.get_description = pgx64_get_description;
- class->vo_driver_class.dispose = pgx64_dispose_class;
+ 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 = 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 f4f645e8c..6353d6cc6 100644
--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.c
@@ -563,19 +563,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
/**
* Class Functions
*/
-static char* get_identifier (video_driver_class_t *this_gen) {
- return "SDL";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using the Simple Direct Media Layer");
-}
-
-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;
@@ -591,9 +578,9 @@ static void *init_class (xine_t *xine, void *visual_gen) {
this = (sdl_class_t*) xine_xmalloc (sizeof (sdl_class_t));
this->driver_class.open_plugin = open_plugin;
- this->driver_class.get_identifier = get_identifier;
- this->driver_class.get_description = get_description;
- this->driver_class.dispose = dispose_class;
+ this->driver_class.identifier = "SDL";
+ this->driver_class.description = N_("xine video output plugin using the Simple Direct Media Layer");
+ 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 dfc4ae385..c8a88e4f6 100644
--- a/src/video_out/video_out_stk.c
+++ b/src/video_out/video_out_stk.c
@@ -442,22 +442,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
/**
* Class Functions
*/
-static char* get_identifier (video_driver_class_t *this_gen) {
- //printf("video_out_stk: get_identifier()\n");
- return "stk";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
- //printf("video_out_stk: get_description()\n");
- return _("xine video output plugin using the Libstk Surface Set-top Toolkit");
-}
-
-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;
@@ -466,9 +450,9 @@ static void *init_class (xine_t *xine, void *visual_gen) {
this = (stk_class_t *) xine_xmalloc(sizeof(stk_class_t));
this->driver_class.open_plugin = open_plugin;
- this->driver_class.get_identifier = get_identifier;
- this->driver_class.get_description = get_description;
- this->driver_class.dispose = dispose_class;
+ 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 = 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 86be3422e..20b515137 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -1049,22 +1049,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
/*
* class functions
*/
-
-static char* get_identifier (video_driver_class_t *this_gen) {
- return "SyncFB";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using the SyncFB module for Matrox G200/G400 cards");
-}
-
-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;
@@ -1096,9 +1080,9 @@ static void *init_class (xine_t *xine, void *visual_gen) {
this = (syncfb_class_t *) xine_xmalloc (sizeof (syncfb_class_t));
this->driver_class.open_plugin = open_plugin;
- this->driver_class.get_identifier = get_identifier;
- this->driver_class.get_description = get_description;
- this->driver_class.dispose = dispose_class;
+ 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 = 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 21e361d93..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);
@@ -1193,23 +1185,15 @@ static vo_driver_t *vidix_open_plugin (video_driver_class_t *class_gen, const vo
return &this->vo_driver;
}
-static char* vidix_get_identifier (video_driver_class_t *this_gen) {
- return "vidix";
-}
-
-static char* vidix_get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using libvidix for x11");
-}
-
static void *vidix_init_class (xine_t *xine, void *visual_gen) {
vidix_class_t *this = init_class (xine, visual_gen);
if(this) {
this->driver_class.open_plugin = vidix_open_plugin;
- this->driver_class.get_identifier = vidix_get_identifier;
- this->driver_class.get_description = vidix_get_description;
- this->driver_class.dispose = dispose_class;
+ this->driver_class.identifier = "vidix";
+ this->driver_class.description = N_("xine video output plugin using libvidix for x11");
+ this->driver_class.dispose = default_video_driver_class_dispose;
}
return this;
@@ -1275,23 +1259,15 @@ static vo_driver_t *vidixfb_open_plugin (video_driver_class_t *class_gen, const
return &this->vo_driver;
}
-static char* vidixfb_get_identifier (video_driver_class_t *this_gen) {
- return "vidixfb";
-}
-
-static char* vidixfb_get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using libvidix for linux frame buffer");
-}
-
static void *vidixfb_init_class (xine_t *xine, void *visual_gen) {
vidix_class_t *this = init_class (xine, visual_gen);
if(this) {
this->driver_class.open_plugin = vidixfb_open_plugin;
- this->driver_class.get_identifier = vidixfb_get_identifier;
- this->driver_class.get_description = vidixfb_get_description;
- this->driver_class.dispose = dispose_class;
+ this->driver_class.identifier = "vidixfb";
+ this->driver_class.description = N_("xine video output plugin using libvidix for linux frame buffer");
+ 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 5de8a4fd3..61dac18f0 100644
--- a/src/video_out/video_out_xcbshm.c
+++ b/src/video_out/video_out_xcbshm.c
@@ -1229,28 +1229,13 @@ static vo_driver_t *xshm_open_plugin(video_driver_class_t *class_gen, const void
/*
* class functions
*/
-
-static char* xshm_get_identifier (video_driver_class_t *this_gen) {
- return "XShm";
-}
-
-static char* xshm_get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using the MIT X shared memory extension");
-}
-
-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.get_identifier = xshm_get_identifier;
- this->driver_class.get_description = xshm_get_description;
- this->driver_class.dispose = xshm_dispose_class;
+ 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 = 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 dd19172cf..f964ae7af 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -1369,28 +1369,13 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
/*
* class functions
*/
-
-static char* get_identifier (video_driver_class_t *this_gen) {
- return "Xv";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using the MIT X video extension");
-}
-
-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.get_identifier = get_identifier;
- this->driver_class.get_description = get_description;
- this->driver_class.dispose = dispose_class;
+ this->driver_class.identifier = "Xv";
+ this->driver_class.description = N_("xine video output plugin using the MIT X video extension");
+ 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 40986899a..27a996a77 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -1290,28 +1290,13 @@ static vo_driver_t *xshm_open_plugin_old (video_driver_class_t *class_gen, const
/*
* class functions
*/
-
-static char* xshm_get_identifier (video_driver_class_t *this_gen) {
- return "XShm";
-}
-
-static char* xshm_get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using the MIT X shared memory extension");
-}
-
-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.get_identifier = xshm_get_identifier;
- this->driver_class.get_description = xshm_get_description;
- this->driver_class.dispose = xshm_dispose_class;
+ 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 = 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 a082c9d19..82b51e4ec 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -1452,28 +1452,13 @@ static vo_driver_t *open_plugin_old (video_driver_class_t *class_gen, const void
/*
* class functions
*/
-
-static char* get_identifier (video_driver_class_t *this_gen) {
- return "Xv";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using the MIT X video extension");
-}
-
-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.get_identifier = get_identifier;
- this->driver_class.get_description = get_description;
- this->driver_class.dispose = dispose_class;
+ this->driver_class.identifier = "Xv";
+ this->driver_class.description = N_("xine video output plugin using the MIT X video extension");
+ this->driver_class.dispose = default_video_driver_class_dispose;
this->config = xine->config;
this->xine = xine;
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 3ff30fa25..cd667fe51 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -1494,14 +1494,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
* class functions
*/
-static char* get_identifier (video_driver_class_t *this_gen) {
- return "XvMC";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using the XvMC X video extension");
-}
-
static void dispose_class (video_driver_class_t *this_gen) {
xvmc_class_t *this = (xvmc_class_t *) this_gen;
@@ -1674,8 +1666,8 @@ static void *init_class (xine_t *xine, void *visual_gen) {
return NULL;
this->driver_class.open_plugin = open_plugin;
- this->driver_class.get_identifier = get_identifier;
- this->driver_class.get_description = get_description;
+ this->driver_class.identifier = "XvMC";
+ this->driver_class.description = N_("xine video output plugin using the XvMC X video extension");
this->driver_class.dispose = dispose_class;
this->display = display;
diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
index d4c43ab37..5fcb95003 100644
--- a/src/video_out/video_out_xxmc.c
+++ b/src/video_out/video_out_xxmc.c
@@ -2749,28 +2749,13 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
/*
* class functions
*/
-
-static char* get_identifier (video_driver_class_t *this_gen) {
- return "XxMC";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
- return _("xine video output plugin using the MIT X video extension");
-}
-
-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.get_identifier = get_identifier;
- this->driver_class.get_description = get_description;
- this->driver_class.dispose = dispose_class;
+ this->driver_class.identifier = "XxMC";
+ this->driver_class.description = N_("xine video output plugin using the MIT X video extension");
+ this->driver_class.dispose = default_video_driver_class_dispose;
this->config = xine->config;
this->xine = xine;