From f8b45084853fd3f1c40ad611e5f1649851eb9d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 11:58:43 +0100 Subject: Update to the new identifier/description interface and call _(). --- src/video_out/video_out_pgx32.c | 14 ++------------ src/video_out/video_out_pgx64.c | 14 ++------------ 2 files changed, 4 insertions(+), 24 deletions(-) (limited to 'src/video_out') diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c index d903efc89..d8504e711 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.c @@ -855,16 +855,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,8 +867,8 @@ 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.identifier = "pgx32"; + class->vo_driver_class.description = _("xine video output plugin for Sun PGX32 framebuffers"); class->vo_driver_class.dispose = pgx32_dispose_class; class->xine = xine; diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index 4abb794d7..a706872cd 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.c @@ -1479,16 +1479,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,8 +1491,8 @@ 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.identifier = "pgx64"; + class->vo_driver_class.description = _("xine video output plugin for Sun XVR100/PGX64/PGX24 framebuffers"); class->vo_driver_class.dispose = pgx64_dispose_class; class->xine = xine; -- cgit v1.2.3 From bbb97d24340fb6b780b55f54da0f0d3b94956bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 12:01:59 +0100 Subject: Update all video output plugins to the new identifier/description interface. --- src/video_out/video_out_aa.c | 12 ++---------- src/video_out/video_out_caca.c | 12 ++---------- src/video_out/video_out_directfb.c | 24 ++++-------------------- src/video_out/video_out_directx.c | 12 ++---------- src/video_out/video_out_fb.c | 14 ++------------ src/video_out/video_out_macosx.m | 11 ++--------- src/video_out/video_out_none.c | 12 ++---------- src/video_out/video_out_opengl.c | 12 ++---------- src/video_out/video_out_sdl.c | 12 ++---------- src/video_out/video_out_stk.c | 14 ++------------ src/video_out/video_out_syncfb.c | 12 ++---------- src/video_out/video_out_vidix.c | 24 ++++-------------------- src/video_out/video_out_xcbshm.c | 12 ++---------- src/video_out/video_out_xcbxv.c | 12 ++---------- src/video_out/video_out_xshm.c | 12 ++---------- src/video_out/video_out_xv.c | 12 ++---------- src/video_out/video_out_xvmc.c | 12 ++---------- src/video_out/video_out_xxmc.c | 12 ++---------- 18 files changed, 40 insertions(+), 203 deletions(-) (limited to 'src/video_out') diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index 012db9665..74d19b6f6 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -300,14 +300,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); @@ -319,8 +311,8 @@ 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.identifier = "AA"; + this->driver_class.description = _("xine video output plugin using the ascii-art library"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index 866eabcd8..b7ea21ba1 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -307,14 +307,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 "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); @@ -325,8 +317,8 @@ static void *init_class (xine_t *xine, void *visual_gen) { 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.identifier = "CACA"; + this->driver_class.description = _("xine video output plugin using the Color AsCii Art library"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index 1ab1fb8e8..fc4757680 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -1880,14 +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); @@ -1910,8 +1902,8 @@ 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.identifier = "DirectFB"; + this->driver_class.description = _("xine video output plugin using DirectFB."); this->driver_class.dispose = dispose_class_fb; this->xine = xine; @@ -2088,14 +2080,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; @@ -2129,8 +2113,8 @@ 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.identifier = "XDirectFB"; + this->driver_class.description = _("xine video output plugin using DirectFB under XDirectFB."); this->driver_class.dispose = dispose_class_x11; this->visual_type = XINE_VISUAL_TYPE_X11; diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 11ee709e1..9494a2194 100644 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -1228,14 +1228,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *wi } -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; @@ -1252,8 +1244,8 @@ 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.identifier = "DirectX"; + directx->driver_class.description = _("xine video output plugin for win32 using directx"); directx->driver_class.dispose = dispose_class; directx->xine = xine; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index 08663ae61..e061ab781 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -1046,16 +1046,6 @@ 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; @@ -1067,8 +1057,8 @@ 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.identifier = "fb"; + this->driver_class.description = _("Xine video output plugin using the Linux frame buffer device"); this->driver_class.dispose = fb_dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m index 4621d31b9..27e9814a2 100644 --- a/src/video_out/video_out_macosx.m +++ b/src/video_out/video_out_macosx.m @@ -349,13 +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; @@ -369,8 +362,8 @@ 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.identifier = "MacOSX"; + this->driver_class.description = _("xine video output plugin for Mac OS X"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index 5f2424a60..f97c5abab 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.c @@ -269,14 +269,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 "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; @@ -289,8 +281,8 @@ static void *init_class (xine_t *xine, void *visual) { 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.identifier = "none"; + this->driver_class.description = _("xine video output plugin which displays nothing"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 54696f452..d86ef80f3 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -1955,14 +1955,6 @@ 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; @@ -1973,8 +1965,8 @@ 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.identifier = "opengl"; + this->driver_class.description = _("xine video output plugin using the OpenGL 3D graphics API"); this->driver_class.dispose = opengl_dispose_class; this->xine = xine; diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index f4f645e8c..95c937326 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -563,14 +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); } @@ -591,8 +583,8 @@ 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.identifier = "SDL"; + this->driver_class.description = _("xine video output plugin using the Simple Direct Media Layer"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index dfc4ae385..ba357cd73 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.c @@ -442,16 +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); @@ -466,8 +456,8 @@ 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.identifier = "stk"; + this->driver_class.description = _("xine video output plugin using the Libstk Surface Set-top Toolkit"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index 86be3422e..f133d52d7 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.c @@ -1050,14 +1050,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; @@ -1096,8 +1088,8 @@ 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.identifier = "SyncFB"; + this->driver_class.description = _("xine video output plugin using the SyncFB module for Matrox G200/G400 cards"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 21e361d93..f8e004583 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -1193,22 +1193,14 @@ 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.identifier = "vidix"; + this->driver_class.description = _("xine video output plugin using libvidix for x11"); this->driver_class.dispose = dispose_class; } @@ -1275,22 +1267,14 @@ 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.identifier = "vidixfb"; + this->driver_class.description = _("xine video output plugin using libvidix for linux frame buffer"); this->driver_class.dispose = dispose_class; } diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index 5de8a4fd3..87b5a9b92 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -1230,14 +1230,6 @@ 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; @@ -1248,8 +1240,8 @@ 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.identifier = "XShm"; + this->driver_class.description = _("xine video output plugin using the MIT X shared memory extension"); this->driver_class.dispose = xshm_dispose_class; 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..67890bd6d 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -1370,14 +1370,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) { - 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; @@ -1388,8 +1380,8 @@ 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.identifier = "Xv"; + this->driver_class.description = _("xine video output plugin using the MIT X video extension"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 40986899a..775211098 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -1291,14 +1291,6 @@ 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; @@ -1309,8 +1301,8 @@ 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.identifier = "XShm"; + this->driver_class.description = _("xine video output plugin using the MIT X shared memory extension"); this->driver_class.dispose = xshm_dispose_class; 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..21d4aa0c4 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -1453,14 +1453,6 @@ 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; @@ -1471,8 +1463,8 @@ 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.identifier = "Xv"; + this->driver_class.description = _("xine video output plugin using the MIT X video extension"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 3ff30fa25..8dab2fb83 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 = _("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..89c8f58ed 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -2750,14 +2750,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 "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; @@ -2768,8 +2760,8 @@ 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.identifier = "XxMC"; + this->driver_class.description = _("xine video output plugin using the MIT X video extension"); this->driver_class.dispose = dispose_class; this->config = xine->config; -- cgit v1.2.3 From e2a10c5fdaed1f45040fb3d737ab79f0e5d774d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 14:12:35 +0100 Subject: Use N_() rather than _(), passing the string just once to gettext(). This way the gettext code for description does not need to be repeated by every plugin. --- src/video_out/video_out_aa.c | 2 +- src/video_out/video_out_caca.c | 2 +- src/video_out/video_out_directfb.c | 4 ++-- src/video_out/video_out_directx.c | 2 +- src/video_out/video_out_fb.c | 2 +- src/video_out/video_out_macosx.m | 2 +- src/video_out/video_out_none.c | 2 +- src/video_out/video_out_opengl.c | 2 +- src/video_out/video_out_pgx32.c | 2 +- src/video_out/video_out_pgx64.c | 2 +- src/video_out/video_out_sdl.c | 2 +- src/video_out/video_out_stk.c | 2 +- src/video_out/video_out_syncfb.c | 2 +- src/video_out/video_out_vidix.c | 4 ++-- src/video_out/video_out_xcbshm.c | 2 +- src/video_out/video_out_xcbxv.c | 2 +- src/video_out/video_out_xshm.c | 2 +- src/video_out/video_out_xv.c | 2 +- src/video_out/video_out_xvmc.c | 2 +- src/video_out/video_out_xxmc.c | 2 +- 20 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/video_out') diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index 74d19b6f6..38fb9f646 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -312,7 +312,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 = _("xine video output plugin using the ascii-art library"); + this->driver_class.description = N_("xine video output plugin using the ascii-art library"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index b7ea21ba1..6384ed1aa 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -318,7 +318,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 = _("xine video output plugin using the Color AsCii Art library"); + this->driver_class.description = N_("xine video output plugin using the Color AsCii Art library"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index fc4757680..f75c6ae94 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.c @@ -1903,7 +1903,7 @@ 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.identifier = "DirectFB"; - this->driver_class.description = _("xine video output plugin using DirectFB."); + this->driver_class.description = N_("xine video output plugin using DirectFB."); this->driver_class.dispose = dispose_class_fb; this->xine = xine; @@ -2114,7 +2114,7 @@ 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.identifier = "XDirectFB"; - this->driver_class.description = _("xine video output plugin using DirectFB under XDirectFB."); + this->driver_class.description = N_("xine video output plugin using DirectFB under XDirectFB."); this->driver_class.dispose = dispose_class_x11; this->visual_type = XINE_VISUAL_TYPE_X11; diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 9494a2194..e39acd435 100644 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -1245,7 +1245,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 = _("xine video output plugin for win32 using directx"); + directx->driver_class.description = N_("xine video output plugin for win32 using directx"); directx->driver_class.dispose = dispose_class; directx->xine = xine; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index e061ab781..e08661fa2 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -1058,7 +1058,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 = _("Xine video output plugin using the Linux frame buffer device"); + this->driver_class.description = N_("Xine video output plugin using the Linux frame buffer device"); this->driver_class.dispose = fb_dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m index 27e9814a2..316d0b2ee 100644 --- a/src/video_out/video_out_macosx.m +++ b/src/video_out/video_out_macosx.m @@ -363,7 +363,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 = _("xine video output plugin for Mac OS X"); + this->driver_class.description = N_("xine video output plugin for Mac OS X"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index f97c5abab..d339f280d 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.c @@ -282,7 +282,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 = _("xine video output plugin which displays nothing"); + this->driver_class.description = N_("xine video output plugin which displays nothing"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index d86ef80f3..1bb582636 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -1966,7 +1966,7 @@ static void *opengl_init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = opengl_open_plugin; this->driver_class.identifier = "opengl"; - this->driver_class.description = _("xine video output plugin using the OpenGL 3D graphics API"); + this->driver_class.description = N_("xine video output plugin using the OpenGL 3D graphics API"); this->driver_class.dispose = opengl_dispose_class; this->xine = xine; diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c index d8504e711..ae4be4431 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.c @@ -868,7 +868,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 = _("xine video output plugin for Sun PGX32 framebuffers"); + class->vo_driver_class.description = N_("xine video output plugin for Sun PGX32 framebuffers"); class->vo_driver_class.dispose = pgx32_dispose_class; class->xine = xine; diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index a706872cd..84a8af85c 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.c @@ -1492,7 +1492,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 = _("xine video output plugin for Sun XVR100/PGX64/PGX24 framebuffers"); + 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->xine = xine; diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 95c937326..c04d54138 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -584,7 +584,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 = _("xine video output plugin using the Simple Direct Media Layer"); + this->driver_class.description = N_("xine video output plugin using the Simple Direct Media Layer"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index ba357cd73..ad4769dcd 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.c @@ -457,7 +457,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 = _("xine video output plugin using the Libstk Surface Set-top Toolkit"); + this->driver_class.description = N_("xine video output plugin using the Libstk Surface Set-top Toolkit"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index f133d52d7..a73aca39f 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.c @@ -1089,7 +1089,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 = _("xine video output plugin using the SyncFB module for Matrox G200/G400 cards"); + 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->config = xine->config; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index f8e004583..772b779fa 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -1200,7 +1200,7 @@ static void *vidix_init_class (xine_t *xine, void *visual_gen) { if(this) { this->driver_class.open_plugin = vidix_open_plugin; this->driver_class.identifier = "vidix"; - this->driver_class.description = _("xine video output plugin using libvidix for x11"); + this->driver_class.description = N_("xine video output plugin using libvidix for x11"); this->driver_class.dispose = dispose_class; } @@ -1274,7 +1274,7 @@ static void *vidixfb_init_class (xine_t *xine, void *visual_gen) { if(this) { this->driver_class.open_plugin = vidixfb_open_plugin; this->driver_class.identifier = "vidixfb"; - this->driver_class.description = _("xine video output plugin using libvidix for linux frame buffer"); + this->driver_class.description = N_("xine video output plugin using libvidix for linux frame buffer"); this->driver_class.dispose = dispose_class; } diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index 87b5a9b92..645a23c97 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -1241,7 +1241,7 @@ static void *xshm_init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = xshm_open_plugin; this->driver_class.identifier = "XShm"; - this->driver_class.description = _("xine video output plugin using the MIT X shared memory extension"); + this->driver_class.description = N_("xine video output plugin using the MIT X shared memory extension"); this->driver_class.dispose = xshm_dispose_class; 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 67890bd6d..cc5eb602d 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -1381,7 +1381,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "Xv"; - this->driver_class.description = _("xine video output plugin using the MIT X video extension"); + this->driver_class.description = N_("xine video output plugin using the MIT X video extension"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 775211098..528435b37 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -1302,7 +1302,7 @@ static void *xshm_init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = xshm_open_plugin_old; this->driver_class.identifier = "XShm"; - this->driver_class.description = _("xine video output plugin using the MIT X shared memory extension"); + this->driver_class.description = N_("xine video output plugin using the MIT X shared memory extension"); this->driver_class.dispose = xshm_dispose_class; 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 21d4aa0c4..4949fe843 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -1464,7 +1464,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin_old; this->driver_class.identifier = "Xv"; - this->driver_class.description = _("xine video output plugin using the MIT X video extension"); + this->driver_class.description = N_("xine video output plugin using the MIT X video extension"); this->driver_class.dispose = dispose_class; this->config = xine->config; diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 8dab2fb83..cd667fe51 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.c @@ -1667,7 +1667,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "XvMC"; - this->driver_class.description = _("xine video output plugin using the XvMC X video extension"); + 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 89c8f58ed..e77a4b6b7 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -2761,7 +2761,7 @@ static void *init_class (xine_t *xine, void *visual_gen) { this->driver_class.open_plugin = open_plugin; this->driver_class.identifier = "XxMC"; - this->driver_class.description = _("xine video output plugin using the MIT X video extension"); + this->driver_class.description = N_("xine video output plugin using the MIT X video extension"); this->driver_class.dispose = dispose_class; this->config = xine->config; -- cgit v1.2.3 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/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 +-------- 19 files changed, 21 insertions(+), 149 deletions(-) (limited to 'src/video_out') 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 From 158ced5414ebb912f1d5111d2303097c7206f656 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 18:15:14 +0100 Subject: Bump the interface version for video output plugins. --- src/video_out/video_out_aa.c | 2 +- src/video_out/video_out_caca.c | 2 +- src/video_out/video_out_directx.c | 2 +- src/video_out/video_out_fb.c | 2 +- src/video_out/video_out_macosx.m | 2 +- src/video_out/video_out_none.c | 2 +- src/video_out/video_out_opengl.c | 2 +- src/video_out/video_out_pgx32.c | 2 +- src/video_out/video_out_pgx64.c | 2 +- src/video_out/video_out_sdl.c | 2 +- src/video_out/video_out_stk.c | 2 +- src/video_out/video_out_syncfb.c | 2 +- src/video_out/video_out_vidix.c | 4 ++-- src/video_out/video_out_xcbshm.c | 2 +- src/video_out/video_out_xcbxv.c | 2 +- src/video_out/video_out_xshm.c | 4 ++-- src/video_out/video_out_xv.c | 4 ++-- src/video_out/video_out_xvmc.c | 2 +- src/video_out/video_out_xxmc.c | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src/video_out') diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index d2b488f5b..bcbe2477e 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -311,6 +311,6 @@ static const vo_info_t vo_info_aa = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "aa", XINE_VERSION_CODE, &vo_info_aa, init_class }, + { PLUGIN_VIDEO_OUT, 22, "aa", XINE_VERSION_CODE, &vo_info_aa, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index d40ad06e3..231befcdb 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -315,6 +315,6 @@ static const vo_info_t vo_info_caca = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "caca", XINE_VERSION_CODE, &vo_info_caca, init_class }, + { PLUGIN_VIDEO_OUT, 22, "caca", XINE_VERSION_CODE, &vo_info_caca, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 53a6d2b8a..b70709856 100644 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -1258,6 +1258,6 @@ static const vo_info_t vo_info_win32 = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "vo_directx", XINE_VERSION_CODE, &vo_info_win32, init_class }, + { PLUGIN_VIDEO_OUT, 22, "vo_directx", XINE_VERSION_CODE, &vo_info_win32, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index b7864bc62..859959455 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -1070,7 +1070,7 @@ static const vo_info_t vo_info_fb = /* exported plugin catalog entry */ const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "fb", XINE_VERSION_CODE, &vo_info_fb, fb_init_class }, + { PLUGIN_VIDEO_OUT, 22, "fb", XINE_VERSION_CODE, &vo_info_fb, fb_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m index 84d441aad..9c65d579d 100644 --- a/src/video_out/video_out_macosx.m +++ b/src/video_out/video_out_macosx.m @@ -376,7 +376,7 @@ plugin_info_t xine_plugin_info[] EXPORTED = { /* work around the problem that dlclose() is not allowed to * get rid of an image module which contains objective C code and simply * crashes with a Trace/BPT trap when we try to do so */ - { PLUGIN_VIDEO_OUT | PLUGIN_NO_UNLOAD, 21, "macosx", XINE_VERSION_CODE, &vo_info_macosx, init_class }, + { PLUGIN_VIDEO_OUT | PLUGIN_NO_UNLOAD, 22, "macosx", XINE_VERSION_CODE, &vo_info_macosx, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index 569fa39ef..c28b0334e 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.c @@ -292,6 +292,6 @@ static const vo_info_t vo_info_none = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "none", XINE_VERSION_CODE, &vo_info_none, init_class }, + { PLUGIN_VIDEO_OUT, 22, "none", XINE_VERSION_CODE, &vo_info_none, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index c121eef33..04413eb80 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -1979,6 +1979,6 @@ static const vo_info_t vo_info_opengl = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "opengl", XINE_VERSION_CODE, &vo_info_opengl, opengl_init_class }, + { PLUGIN_VIDEO_OUT, 22, "opengl", XINE_VERSION_CODE, &vo_info_opengl, opengl_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c index 0ea1592ba..505a257ce 100644 --- a/src/video_out/video_out_pgx32.c +++ b/src/video_out/video_out_pgx32.c @@ -871,6 +871,6 @@ static void *pgx32_init_class(xine_t *xine, void *visual_gen) } const plugin_info_t xine_plugin_info[] EXPORTED = { - {PLUGIN_VIDEO_OUT, 21, "pgx32", XINE_VERSION_CODE, &vo_info_pgx32, pgx32_init_class}, + {PLUGIN_VIDEO_OUT, 22, "pgx32", XINE_VERSION_CODE, &vo_info_pgx32, pgx32_init_class}, {PLUGIN_NONE, 0, "", 0, NULL, NULL} }; diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index b6417a3b2..21dcdfb09 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.c @@ -1494,6 +1494,6 @@ static void *pgx64_init_class(xine_t *xine, void *visual_gen) } const plugin_info_t xine_plugin_info[] EXPORTED = { - {PLUGIN_VIDEO_OUT, 21, "pgx64", XINE_VERSION_CODE, &vo_info_pgx64, pgx64_init_class}, + {PLUGIN_VIDEO_OUT, 22, "pgx64", XINE_VERSION_CODE, &vo_info_pgx64, pgx64_init_class}, {PLUGIN_NONE, 0, "", 0, NULL, NULL} }; diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 6353d6cc6..6ee6b19bd 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -595,6 +595,6 @@ static const vo_info_t vo_info_sdl = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "sdl", XINE_VERSION_CODE, &vo_info_sdl, init_class }, + { PLUGIN_VIDEO_OUT, 22, "sdl", XINE_VERSION_CODE, &vo_info_sdl, init_class }, { PLUGIN_NONE, 0, "" , 0 , NULL, NULL} }; diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index c8a88e4f6..45e9900fd 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.c @@ -468,7 +468,7 @@ static const vo_info_t vo_info_stk = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "stk", XINE_VERSION_CODE, &vo_info_stk, init_class }, + { PLUGIN_VIDEO_OUT, 22, "stk", XINE_VERSION_CODE, &vo_info_stk, init_class }, { PLUGIN_NONE, 0, "" , 0 , NULL, NULL} }; diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index 20b515137..013695c46 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.c @@ -1102,7 +1102,7 @@ static const vo_info_t vo_info_syncfb = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "SyncFB", XINE_VERSION_CODE, &vo_info_syncfb, init_class }, + { PLUGIN_VIDEO_OUT, 22, "SyncFB", XINE_VERSION_CODE, &vo_info_syncfb, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 2b9205516..3228bbdbb 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -1286,10 +1286,10 @@ static const vo_info_t vo_info_vidixfb = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ #ifdef HAVE_X11 - { PLUGIN_VIDEO_OUT, 21, "vidix", XINE_VERSION_CODE, &vo_info_vidix, vidix_init_class }, + { PLUGIN_VIDEO_OUT, 22, "vidix", XINE_VERSION_CODE, &vo_info_vidix, vidix_init_class }, #endif #ifdef HAVE_FB - { PLUGIN_VIDEO_OUT, 21, "vidixfb", XINE_VERSION_CODE, &vo_info_vidixfb, vidixfb_init_class }, + { PLUGIN_VIDEO_OUT, 22, "vidixfb", XINE_VERSION_CODE, &vo_info_vidixfb, vidixfb_init_class }, #endif { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index 61dac18f0..c6ad9e2f1 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -1255,6 +1255,6 @@ static const vo_info_t vo_info_xshm = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class }, + { PLUGIN_VIDEO_OUT, 22, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c index f964ae7af..1b59f5691 100644 --- a/src/video_out/video_out_xcbxv.c +++ b/src/video_out/video_out_xcbxv.c @@ -1394,6 +1394,6 @@ static const vo_info_t vo_info_xv = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class }, + { PLUGIN_VIDEO_OUT, 22, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 27a996a77..ddcdb677c 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -1329,7 +1329,7 @@ static const vo_info_t vo_info_xshm_2 = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class }, - { PLUGIN_VIDEO_OUT, 21, "xshm", XINE_VERSION_CODE, &vo_info_xshm_2, xshm_init_class_2 }, + { PLUGIN_VIDEO_OUT, 22, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class }, + { PLUGIN_VIDEO_OUT, 22, "xshm", XINE_VERSION_CODE, &vo_info_xshm_2, xshm_init_class_2 }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 82b51e4ec..ab5410ac3 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -1490,7 +1490,7 @@ static const vo_info_t vo_info_xv_2 = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class }, - { PLUGIN_VIDEO_OUT, 21, "xv", XINE_VERSION_CODE, &vo_info_xv_2, init_class_2 }, + { PLUGIN_VIDEO_OUT, 22, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class }, + { PLUGIN_VIDEO_OUT, 22, "xv", XINE_VERSION_CODE, &vo_info_xv_2, init_class_2 }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index cd667fe51..2c913dc0e 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.c @@ -1699,7 +1699,7 @@ static const vo_info_t vo_info_xvmc = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "xvmc", XINE_VERSION_CODE, &vo_info_xvmc, init_class }, + { PLUGIN_VIDEO_OUT, 22, "xvmc", XINE_VERSION_CODE, &vo_info_xvmc, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index 5fcb95003..c66566233 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -2777,7 +2777,7 @@ static const vo_info_t vo_info_xxmc = { const plugin_info_t xine_plugin_info[] EXPORTED = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 21, "xxmc", XINE_VERSION_CODE, &vo_info_xxmc, init_class }, + { PLUGIN_VIDEO_OUT, 22, "xxmc", XINE_VERSION_CODE, &vo_info_xxmc, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; -- cgit v1.2.3