summaryrefslogtreecommitdiff
path: root/src/video_out
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_out')
-rw-r--r--src/video_out/alphablend.c2
-rw-r--r--src/video_out/video_out_fb.c6
-rw-r--r--src/video_out/video_out_opengl.c10
-rw-r--r--src/video_out/video_out_pgx64.c22
-rw-r--r--src/video_out/video_out_sdl.c6
-rw-r--r--src/video_out/video_out_syncfb.c6
-rw-r--r--src/video_out/video_out_vidix.c30
-rw-r--r--src/video_out/video_out_xshm.c4
-rw-r--r--src/video_out/video_out_xv.c18
-rw-r--r--src/video_out/video_out_xvmc.c12
-rw-r--r--src/video_out/video_out_xxmc.c22
11 files changed, 69 insertions, 69 deletions
diff --git a/src/video_out/alphablend.c b/src/video_out/alphablend.c
index 48e0bc633..03beb8605 100644
--- a/src/video_out/alphablend.c
+++ b/src/video_out/alphablend.c
@@ -1763,7 +1763,7 @@ void _x_alphablend_init(alphablend_t *extra_data, xine_t *xine)
extra_data->buffer_size = 0;
extra_data->disable_exact_blending =
- config->register_bool(config, "video.disable_exact_osd_alpha_blending", 0,
+ config->register_bool(config, "video.output.disable_exact_alphablend", 0,
_("disable exact alpha blending of overlays"),
_("If you experience a performance impact when an On Screen Display or other "
"overlays like DVD subtitles are active, then you might want to enable this option.\n"
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index 22a715ec1..46f0250fd 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_fb.c,v 1.39 2004/11/24 16:11:04 mroi Exp $
+ * $Id: video_out_fb.c,v 1.40 2004/12/12 22:01:27 mroi Exp $
*
* video_out_fb.c, frame buffer xine driver by Miguel Freitas
*
@@ -786,7 +786,7 @@ static void register_callbacks(fb_driver_t *this)
static int open_fb_device(config_values_t *config, xine_t *xine)
{
- static char devkey[] = "video.fb_device"; /* Why static? */
+ static char devkey[] = "video.device.fb_device"; /* Why static? */
char *device_name;
int fd;
@@ -882,7 +882,7 @@ static int setup_yuv2rgb(fb_driver_t *this, config_values_t *config,
this->yuv2rgb_swap = 0;
this->yuv2rgb_brightness =
- config->register_range(config, "video.fb_gamma", 0,
+ config->register_range(config, "video.output.fb_gamma", 0,
-100, 100,
_("brightness correction"),
_("The brightness correction can be used to lighten or darken the image. "
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 4f7dfae3a..76da13c32 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_opengl.c,v 1.44 2004/11/25 03:29:11 dsalt Exp $
+ * $Id: video_out_opengl.c,v 1.45 2004/12/12 22:01:27 mroi Exp $
*
* video_out_opengl.c, OpenGL based interface for xine
*
@@ -1324,7 +1324,7 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v
this->vo_driver.dispose = opengl_dispose;
this->vo_driver.redraw_needed = opengl_redraw_needed;
- this->yuv2rgb_brightness = config->register_range (config, "video.opengl_gamma", 0,
+ this->yuv2rgb_brightness = config->register_range (config, "video.output.opengl_gamma", 0,
-128, 127,
_("brightness correction"),
_("The brightness correction can be used to "
@@ -1347,7 +1347,7 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v
this->drawable, X11OSD_SHAPED);
XUnlockDisplay (this->display);
- this->render_fun_id = config->register_enum (config, "video.opengl_renderer",
+ this->render_fun_id = config->register_enum (config, "video.output.opengl_renderer",
0, opengl_render_fun_names,
_("OpenGL renderer"),
_("The OpenGL plugin provides several render modules:\n\n"
@@ -1364,14 +1364,14 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, const v
"Show images reflected in a spinning torus. Way cool =)"),
10, opengl_cb_render_fun, this);
this->render_min_fps = config->register_range (config,
- "video.opengl_min_fps",
+ "video.output.opengl_min_fps",
20, 1, 120,
_("OpenGL minimum framerate"),
_("Minimum framerate for animated render routines.\n"
"Ignored for static render routines.\n"),
20, opengl_cb_default,
&this->render_min_fps);
- this->render_double_buffer = config->register_bool (config, "video.opengl_double_buffer", 1,
+ this->render_double_buffer = config->register_bool (config, "video.device.opengl_double_buffer", 1,
_("enable double buffering"),
_("For OpenGL double buffering does not only remove tearing artifacts,\n"
"it also reduces flickering a lot.\n"
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index d6409110d..1900cb5db 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_pgx64.c,v 1.71 2004/11/24 16:11:05 mroi Exp $
+ * $Id: video_out_pgx64.c,v 1.72 2004/12/12 22:01:27 mroi Exp $
*
* video_out_pgx64.c, Sun XVR100/PGX64/PGX24 output plugin for xine
*
@@ -1318,20 +1318,20 @@ static void pgx64_config_changed(void *user_data, xine_cfg_entry_t *entry)
vo_driver_t *this_gen = (vo_driver_t *)user_data;
pgx64_driver_t *this = (pgx64_driver_t *)(void *)user_data;
- if (strcmp(entry->key, "video.pgx64_colour_key") == 0) {
+ if (strcmp(entry->key, "video.device.pgx64_colour_key") == 0) {
pgx64_set_property(this_gen, VO_PROP_COLORKEY, entry->num_value);
update_colour_key_rgb(this);
}
- else if (strcmp(entry->key, "video.pgx64_brightness") == 0) {
+ else if (strcmp(entry->key, "video.output.pgx64_brightness") == 0) {
pgx64_set_property(this_gen, VO_PROP_BRIGHTNESS, entry->num_value);
}
- else if (strcmp(entry->key, "video.pgx64_saturation") == 0) {
+ else if (strcmp(entry->key, "video.output.pgx64_saturation") == 0) {
pgx64_set_property(this_gen, VO_PROP_SATURATION, entry->num_value);
}
- else if (strcmp(entry->key, "video.pgx64_overlay_mode") == 0) {
+ else if (strcmp(entry->key, "") == 0) {
this->chromakey_en = entry->num_value;
}
- else if (strcmp(entry->key, "video.pgx64_multibuf_en") == 0) {
+ else if (strcmp(entry->key, "video.device.pgx64_multibuf_en") == 0) {
this->multibuf_en = entry->num_value;
}
}
@@ -1464,25 +1464,25 @@ static vo_driver_t *pgx64_init_driver(video_driver_class_t *class_gen, const voi
break;
}
- this->colour_key = class->config->register_num(this->class->config, "video.pgx64_colour_key", 1,
+ this->colour_key = class->config->register_num(this->class->config, "video.device.pgx64_colour_key", 1,
_("video overlay colour key"),
_("The colour key is used to tell the graphics card where it can overlay the video image. "
"Try using different values if you see the video showing through other windows."),
20, pgx64_config_changed, this);
update_colour_key_rgb(this);
- this->brightness = class->config->register_range(this->class->config, "video.pgx64_brightness", 0, -64, 63,
+ this->brightness = class->config->register_range(this->class->config, "video.output.pgx64_brightness", 0, -64, 63,
_("video brightness"),
_("The brightness of the video image."),
10, pgx64_config_changed, this);
- this->saturation = class->config->register_range(this->class->config, "video.pgx64_saturation", 16, 0, 31,
+ this->saturation = class->config->register_range(this->class->config, "video.output.pgx64_saturation", 16, 0, 31,
_("video saturation"),
_("The saturation of the video image."),
10, pgx64_config_changed, this);
- this->chromakey_en = class->config->register_bool(this->class->config, "video.pgx64_chromakey_en", 0,
+ this->chromakey_en = class->config->register_bool(this->class->config, "video.device.pgx64_chromakey_en", 0,
_("enable chroma keying"),
_("Draw OSD graphics on top of the overlay colour key rather than blend them into each frame."),
20, pgx64_config_changed, this);
- this->multibuf_en = class->config->register_bool(this->class->config, "video.pgx64_multibuf_en", 1,
+ this->multibuf_en = class->config->register_bool(this->class->config, "video.device.pgx64_multibuf_en", 1,
_("enable multi-buffering"),
_("Multi buffering increases performance at the expense of using more graphics memory."),
20, pgx64_config_changed, this);
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
index 1b6e7f791..d422ed76d 100644
--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_sdl.c,v 1.41 2004/11/24 16:11:06 mroi Exp $
+ * $Id: video_out_sdl.c,v 1.42 2004/12/12 22:01:28 mroi Exp $
*
* video_out_sdl.c, Simple DirectMedia Layer
*
@@ -475,7 +475,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
this->sdlflags = SDL_HWSURFACE | SDL_RESIZABLE;
this->hw_accel = class->config->register_bool(class->config,
- "video.sdl_hw_accel", 1,
+ "video.device.sdl_hw_accel", 1,
_("use hardware acceleration if available"),
_("When your system supports it, hardware acceleration provided by your "
"graphics hardware will be used. This might not work, so you can disable it, "
@@ -555,7 +555,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
this->vo_driver.redraw_needed = sdl_redraw_needed;
xprintf (this->xine, XINE_VERBOSITY_DEBUG, "video_out_sdl: warning, xine's SDL driver is EXPERIMENTAL\n");
- xprintf (this->xine, XINE_VERBOSITY_DEBUG, "video_out_sdl: in case of trouble, try setting video.sdl_hw_accel=0\n");
+ xprintf (this->xine, XINE_VERBOSITY_DEBUG, "video_out_sdl: in case of trouble, try setting video.device.sdl_hw_accel=0\n");
xprintf (this->xine, XINE_VERBOSITY_LOG, _("video_out_sdl: fullscreen mode is NOT supported\n"));
return &this->vo_driver;
}
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index c689958f2..e5661af20 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_syncfb.c,v 1.99 2004/11/24 16:11:06 mroi Exp $
+ * $Id: video_out_syncfb.c,v 1.100 2004/12/12 22:01:28 mroi Exp $
*
* video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine
*
@@ -1003,7 +1003,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
the kernel driver is fixed... */
#if 0
this->default_repeat = config->register_range(config,
- "video.syncfb_default_repeat", 3, 1, 4,
+ "video.device.syncfb_default_repeat", 3, 1, 4,
_("default number of frame repetitions"),
_("This specifies how many times a single video "
"frame will be displayed consecutively."),
@@ -1069,7 +1069,7 @@ static void *init_class (xine_t *xine, void *visual_gen) {
char* device_name;
int fd;
- device_name = xine->config->register_string(xine->config, "video.syncfb_device", "/dev/syncfb",
+ device_name = xine->config->register_string(xine->config, "video.device.syncfb_device", "/dev/syncfb",
_("SyncFB device name"),
_("Specifies the file name for the SyncFB (TeleTux) device "
"to be used.\nThis setting is security critical, "
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index 1df9b459b..c1d6a00d1 100644
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_vidix.c,v 1.66 2004/11/24 16:11:07 mroi Exp $
+ * $Id: video_out_vidix.c,v 1.67 2004/12/12 22:01:29 mroi Exp $
*
* video_out_vidix.c
*
@@ -761,15 +761,15 @@ static void vidix_ckey_callback(vo_driver_t *this_gen, xine_cfg_entry_t *entry)
vidix_driver_t *this = (vidix_driver_t *) this_gen;
- if(strcmp(entry->key, "video.vidix_colour_key_red") == 0) {
+ if(strcmp(entry->key, "video.device.vidix_colour_key_red") == 0) {
this->vidix_grkey.ckey.red = entry->num_value;
}
- if(strcmp(entry->key, "video.vidix_colour_key_green") == 0) {
+ if(strcmp(entry->key, "video.device.vidix_colour_key_green") == 0) {
this->vidix_grkey.ckey.green = entry->num_value;
}
- if(strcmp(entry->key, "video.vidix_colour_key_blue") == 0) {
+ if(strcmp(entry->key, "video.device.vidix_colour_key_blue") == 0) {
this->vidix_grkey.ckey.blue = entry->num_value;
}
@@ -793,11 +793,11 @@ static void vidix_rgb_callback(vo_driver_t *this_gen, xine_cfg_entry_t *entry) {
this->vidix_eq.cap = VEQ_CAP_RGB_INTENSITY;
- if(!strcmp(entry->key, "video.vidix_red_intensity")) {
+ if(!strcmp(entry->key, "video.output.vidix_red_intensity")) {
this->vidix_eq.red_intensity = entry->num_value;
- } else if(!strcmp(entry->key, "video.vidix_green_intensity")) {
+ } else if(!strcmp(entry->key, "video.output.vidix_green_intensity")) {
this->vidix_eq.green_intensity = entry->num_value;
- } else if(!strcmp(entry->key, "video.vidix_blue_intensity")) {
+ } else if(!strcmp(entry->key, "video.output.vidix_blue_intensity")) {
this->vidix_eq.blue_intensity = entry->num_value;
}
@@ -960,17 +960,17 @@ static vidix_driver_t *open_plugin (video_driver_class_t *class_gen) {
if(this->vidix_eq.cap & VEQ_CAP_RGB_INTENSITY) {
this->vidix_eq.red_intensity = config->register_range(config,
- "video.vidix_red_intensity", 0, -1000, 1000,
+ "video.output.vidix_red_intensity", 0, -1000, 1000,
_("red intensity"), _("The intensity of the red colour components."), 10,
(void*) vidix_rgb_callback, this);
this->vidix_eq.green_intensity = config->register_range(config,
- "video.vidix_green_intensity", 0, -1000, 1000,
+ "video.output.vidix_green_intensity", 0, -1000, 1000,
_("green intensity"), _("The intensity of the green colour components."), 10,
(void*) vidix_rgb_callback, this);
this->vidix_eq.blue_intensity = config->register_range(config,
- "video.vidix_blue_intensity", 0, -1000, 1000,
+ "video.output.vidix_blue_intensity", 0, -1000, 1000,
_("blue intensity"), _("The intensity of the blue colour components."), 10,
(void*) vidix_rgb_callback, this);
@@ -983,7 +983,7 @@ static vidix_driver_t *open_plugin (video_driver_class_t *class_gen) {
/* Configuration for double buffering */
this->use_doublebuffer = config->register_bool(config,
- "video.vidix_use_double_buffer", 1, _("enable double buffering"),
+ "video.device.vidix_double_buffer", 1, _("enable double buffering"),
_("Double buffering will synchronize the update of the video image to the repainting of the entire "
"screen (\"vertical retrace\"). This eliminates flickering and tearing artifacts, but will use "
"more graphics memory."), 20,
@@ -1125,21 +1125,21 @@ static vo_driver_t *vidix_open_plugin (video_driver_class_t *class_gen, const vo
/* Colour key components */
this->vidix_grkey.ckey.red = config->register_range(config,
- "video.vidix_colour_key_red", 255, 0, 255,
+ "video.device.vidix_colour_key_red", 255, 0, 255,
_("video overlay colour key red component"),
_("The colour key is used to tell the graphics card where to overlay the video image. "
"Try different values, if you experience windows becoming transparent."), 20,
(void*) vidix_ckey_callback, this);
this->vidix_grkey.ckey.green = config->register_range(config,
- "video.vidix_colour_key_green", 0, 0, 255,
+ "video.device.vidix_colour_key_green", 0, 0, 255,
_("video overlay colour key green component"),
_("The colour key is used to tell the graphics card where to overlay the video image. "
"Try different values, if you experience windows becoming transparent."), 20,
(void*) vidix_ckey_callback, this);
this->vidix_grkey.ckey.blue = config->register_range(config,
- "video.vidix_colour_key_blue", 255, 0, 255,
+ "video.device.vidix_colour_key_blue", 255, 0, 255,
_("video overlay colour key blue component"),
_("The colour key is used to tell the graphics card where to overlay the video image. "
"Try different values, if you experience windows becoming transparent."), 20,
@@ -1206,7 +1206,7 @@ static vo_driver_t *vidixfb_open_plugin (video_driver_class_t *class_gen, const
this->visual_type = XINE_VISUAL_TYPE_FB;
/* Register config option for fb device */
- device = config->register_string(config, "video.vidixfb_device", "/dev/fb0",
+ device = config->register_string(config, "video.device.vidixfb_device", "/dev/fb0",
_("framebuffer device name"),
_("Specifies the file name for the framebuffer device to be used.\n"
"This setting is security critical, because when changed to a different file, xine "
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index 43ec06d14..35efb7107 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_xshm.c,v 1.137 2004/11/24 16:11:08 mroi Exp $
+ * $Id: video_out_xshm.c,v 1.138 2004/12/12 22:01:29 mroi Exp $
*
* video_out_xshm.c, X11 shared memory extension interface for xine
*
@@ -1236,7 +1236,7 @@ static vo_driver_t *xshm_open_plugin (video_driver_class_t *class_gen, const voi
this->yuv2rgb_mode = mode;
this->yuv2rgb_swap = swapped;
- this->yuv2rgb_brightness = config->register_range (config, "video.xshm_gamma", 0,
+ this->yuv2rgb_brightness = config->register_range (config, "video.output.xshm_gamma", 0,
-128, 127,
_("brightness correction"),
_("The brightness correction can be used to "
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 9ea754708..fbcea7061 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_xv.c,v 1.207 2004/12/08 22:40:32 miguelfreitas Exp $
+ * $Id: video_out_xv.c,v 1.208 2004/12/12 22:01:29 mroi Exp $
*
* video_out_xv.c, X11 video extension interface for xine
*
@@ -1419,7 +1419,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
} else if(!strcmp(attr[k].name, "XV_COLORKEY")) {
xv_check_capability (this, VO_PROP_COLORKEY, attr[k],
adaptor_info[adaptor_num].base_id,
- "video.xv_colorkey",
+ "video.device.xv_colorkey",
_("video overlay colour key"),
_("The colour key is used to tell the graphics card where to "
"overlay the video image. Try different values, if you experience "
@@ -1428,14 +1428,14 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
} else if(!strcmp(attr[k].name, "XV_AUTOPAINT_COLORKEY")) {
xv_check_capability (this, VO_PROP_AUTOPAINT_COLORKEY, attr[k],
adaptor_info[adaptor_num].base_id,
- "video.xv_autopaint_colorkey",
+ "video.device.xv_autopaint_colorkey",
_("autopaint colour key"),
_("Make Xv autopaint its colorkey."));
} else if(!strcmp(attr[k].name, "XV_FILTER")) {
int xv_filter;
/* This setting is specific to Permedia 2/3 cards. */
- xv_filter = config->register_range (config, "video.XV_FILTER", 0,
+ xv_filter = config->register_range (config, "video.device.xv_filter", 0,
attr[k].min_value, attr[k].max_value,
_("bilinear scaling mode"),
_("Selects the bilinear scaling mode for Permedia cards. "
@@ -1448,17 +1448,17 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
"1 - horizontal linear filtering\n"
"2 - enable full bilinear filtering"),
20, xv_update_XV_FILTER, this);
- config->update_num(config,"video.XV_FILTER",xv_filter);
+ config->update_num(config,"video.device.xv_filter",xv_filter);
} else if(!strcmp(attr[k].name, "XV_DOUBLE_BUFFER")) {
int xv_double_buffer;
xv_double_buffer =
- config->register_bool (config, "video.XV_DOUBLE_BUFFER", 1,
+ config->register_bool (config, "video.device.xv_double_buffer", 1,
_("enable double buffering"),
_("Double buffering will synchronize the update of the video image to the "
"repainting of the entire screen (\"vertical retrace\"). This eliminates "
"flickering and tearing artifacts, but will use more graphics memory."),
20, xv_update_XV_DOUBLE_BUFFER, this);
- config->update_num(config,"video.XV_DOUBLE_BUFFER",xv_double_buffer);
+ config->update_num(config,"video.device.xv_double_buffer",xv_double_buffer);
}
}
}
@@ -1513,13 +1513,13 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
XUnlockDisplay (this->display);
this->use_pitch_alignment =
- config->register_bool (config, "video.xv_pitch_alignment", 0,
+ config->register_bool (config, "video.device.xv_pitch_alignment", 0,
_("pitch alignment workaround"),
_("Some buggy video drivers need a workaround to function properly."),
10, xv_update_xv_pitch_alignment, this);
this->deinterlace_method =
- config->register_enum (config, "video.deinterlace_method", 4,
+ config->register_enum (config, "video.output.xv_deinterlace_method", 4,
deinterlace_methods,
_("deinterlace method (deprecated)"),
_("This config setting is deprecated. You should use the new deinterlacing "
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 10c6b0a20..d71feceae 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_xvmc.c,v 1.19 2004/11/24 16:11:09 mroi Exp $
+ * $Id: video_out_xvmc.c,v 1.20 2004/12/12 22:01:29 mroi Exp $
*
* video_out_xvmc.c, X11 video motion compensation extension interface for xine
*
@@ -1501,7 +1501,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
} else if(!strcmp(attr[k].name, "XV_COLORKEY")) {
xvmc_check_capability (this, VO_PROP_COLORKEY, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_COLORKEY",
- "video.xv_colorkey",
+ "video.device.xv_colorkey",
_("video overlay colour key"),
_("The colour key is used to tell the graphics card where to "
"overlay the video image. Try different values, if you experience "
@@ -1510,19 +1510,19 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
} else if(!strcmp(attr[k].name, "XV_AUTOPAINT_COLORKEY")) {
xvmc_check_capability (this, VO_PROP_AUTOPAINT_COLORKEY, attr[k],
class->adaptor_info[class->adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY",
- "video.xv_autopaint_colorkey",
+ "video.device.xv_autopaint_colorkey",
_("autopaint colour key"),
_("Make Xv autopaint its colorkey."));
} else if(!strcmp(attr[k].name, "XV_DOUBLE_BUFFER")) {
int xvmc_double_buffer;
- xvmc_double_buffer = config->register_bool (config, "video.XV_DOUBLE_BUFFER", 1,
+ xvmc_double_buffer = config->register_bool (config, "video.device.xv_double_buffer", 1,
_("enable double buffering"),
_("Double buffering will synchronize the update of the video image to the "
"repainting of the entire screen (\"vertical retrace\"). This eliminates "
"flickering and tearing artifacts, but will use more graphics memory."),
20, xvmc_update_XV_DOUBLE_BUFFER, this);
- config->update_num(config,"video.XV_DOUBLE_BUFFER",xvmc_double_buffer);
+ config->update_num(config,"video.device.xv_double_buffer",xvmc_double_buffer);
}
}
}
@@ -1578,7 +1578,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
*/
this->deinterlace_method =
- config->register_enum (config, "video.deinterlace_method", 4,
+ config->register_enum (config, "video.output.xv_deinterlace_method", 4,
deinterlace_methods,
_("deinterlace method (deprecated)"),
_("This config setting is deprecated. You should use the new deinterlacing "
diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
index d0dfaa3b7..e2bb7e280 100644
--- a/src/video_out/video_out_xxmc.c
+++ b/src/video_out/video_out_xxmc.c
@@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_xxmc.c,v 1.10 2004/11/24 16:11:10 mroi Exp $
+ * $Id: video_out_xxmc.c,v 1.11 2004/12/12 22:01:30 mroi Exp $
*
* video_out_xxmc.c, X11 decoding accelerated video extension interface for xine
*
@@ -2302,7 +2302,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
} else if(!strcmp(attr[k].name, "XV_COLORKEY")) {
xxmc_check_capability (this, VO_PROP_COLORKEY, attr[k],
adaptor_info[adaptor_num].base_id, "XV_COLORKEY",
- "video.xv_colorkey",
+ "video.device.xv_colorkey",
_("video overlay colour key"),
_("The colour key is used to tell the graphics card where to "
"overlay the video image. Try different values, if you experience "
@@ -2311,14 +2311,14 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
} else if(!strcmp(attr[k].name, "XV_AUTOPAINT_COLORKEY")) {
xxmc_check_capability (this, VO_PROP_AUTOPAINT_COLORKEY, attr[k],
adaptor_info[adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY",
- "video.xv_autopaint_colorkey",
+ "video.device.xv_autopaint_colorkey",
_("autopaint colour key"),
_("Make Xv autopaint its colorkey."));
} else if(!strcmp(attr[k].name, "XV_FILTER")) {
int xv_filter;
/* This setting is specific to Permedia 2/3 cards. */
- xv_filter = config->register_range (config, "video.XV_FILTER", 0,
+ xv_filter = config->register_range (config, "video.device.xv_filter", 0,
attr[k].min_value, attr[k].max_value,
_("bilinear scaling mode"),
_("Selects the bilinear scaling mode for Permedia cards. "
@@ -2331,17 +2331,17 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
"1 - horizontal linear filtering\n"
"2 - enable full bilinear filtering"),
20, xxmc_update_XV_FILTER, this);
- config->update_num(config,"video.XV_FILTER",xv_filter);
+ config->update_num(config,"video.device.xv_filter",xv_filter);
} else if(!strcmp(attr[k].name, "XV_DOUBLE_BUFFER")) {
int xv_double_buffer;
xv_double_buffer =
- config->register_bool (config, "video.XV_DOUBLE_BUFFER", 1,
+ config->register_bool (config, "video.device.xv_double_buffer", 1,
_("enable double buffering"),
_("Double buffering will synchronize the update of the video image to the "
"repainting of the entire screen (\"vertical retrace\"). This eliminates "
"flickering and tearing artifacts, but will use more graphics memory."),
20, xxmc_update_XV_DOUBLE_BUFFER, this);
- config->update_num(config,"video.XV_DOUBLE_BUFFER",xv_double_buffer);
+ config->update_num(config,"video.device.xv_double_buffer",xv_double_buffer);
}
}
}
@@ -2404,27 +2404,27 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
XUnlockDisplay (this->display);
this->use_pitch_alignment =
- config->register_bool (config, "video.xv_pitch_alignment", 0,
+ config->register_bool (config, "video.device.xv_pitch_alignment", 0,
_("pitch alignment workaround"),
_("Some buggy video drivers need a workaround to function properly."),
10, xxmc_update_xv_pitch_alignment, this);
use_more_frames=
- config->register_bool (config, "video.xvmc_more_frames", 0,
+ config->register_bool (config, "video.device.xvmc_more_frames", 0,
_("Make XvMC allocate more frames for better buffering."),
_("Some XvMC implementations allow more than 8 frames.\n"
"This option, when turned on, makes the driver try to\n"
"allocate 15 frames. A must for unichrome and live VDR.\n"),
10, NULL, this);
this->cpu_save_enabled =
- config->register_bool (config, "video.unichrome_cpu_save", 0,
+ config->register_bool (config, "video.device.unichrome_cpu_save", 0,
_("Unichrome cpu save"),
_("Saves CPU time by sleeping while decoder works.\n"
"Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
"Experimental.\n"),
10, xxmc_update_cpu_save, this);
this->reverse_nvidia_palette =
- config->register_bool (config, "video.xvmc_nvidia_color_fix", 0,
+ config->register_bool (config, "video.device.xvmc_nvidia_color_fix", 0,
_("Fix buggy NVIDIA XvMC subpicture colors"),
_("There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
"look blue and vice versa. This option provides a workaround.\n"),
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 08:21:01 +0000