summaryrefslogtreecommitdiff
path: root/src/video_out
diff options
context:
space:
mode:
Diffstat (limited to 'src/video_out')
-rw-r--r--src/video_out/video_out_directfb.c12
-rw-r--r--src/video_out/video_out_fb.c2
-rw-r--r--src/video_out/video_out_xcbxv.c4
-rw-r--r--src/video_out/video_out_xv.c4
-rw-r--r--src/video_out/video_out_xvmc.c4
-rw-r--r--src/video_out/video_out_xxmc.c8
-rw-r--r--src/video_out/vidix/drivers/mga_vid.c4
-rw-r--r--src/video_out/vidix/drivers/nvidia_vid.c4
-rw-r--r--src/video_out/vidix/drivers/savage_vid.c6
-rw-r--r--src/video_out/yuv2rgb.c8
10 files changed, 28 insertions, 28 deletions
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index 3e30f664d..3aa5bf66a 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -1008,7 +1008,7 @@ static int directfb_set_property (vo_driver_t *this_gen,
if (value > 0xffffff)
value = 0xffffff;
xprintf (this->xine, XINE_VERBOSITY_DEBUG,
- "video_out_directfb: setting colorkey to 0x%06x.\n", value);
+ "video_out_directfb: setting colour key to 0x%06x.\n", value);
this->colorkey = value;
this->layer->SetDstColorKey (this->layer, (value & 0xff0000) >> 16,
(value & 0x00ff00) >> 8,
@@ -1266,7 +1266,7 @@ static void update_config_cb (void *data, xine_cfg_entry_t *entry) {
if (config.options != this->config.options) {
if (this->layer->SetConfiguration (this->layer, &config) != DFB_OK) {
xprintf (this->xine, XINE_VERBOSITY_LOG,
- "video_out_directfb: failed to set colorkeying to %d!\n",
+ "video_out_directfb: failed to set colour keying to %d!\n",
entry->num_value);
return;
}
@@ -1354,15 +1354,15 @@ static void init_config (directfb_driver_t *this) {
if (this->caps & DLCAPS_DST_COLORKEY) {
this->colorkeying = config->register_bool (config,
"video.device.directfb_colorkeying", this->colorkeying,
- _("enable video color key"),
- _("Enable using a color key to tell the graphics card "
+ _("enable video colour key"),
+ _("Enable using a colour key to tell the graphics card "
"where to overlay the video image."),
20, update_config_cb, (void *)this);
this->colorkey = config->register_range (config,
"video.device.directfb_colorkey", this->colorkey, 0, 0xffffff,
- _("video color key"),
- _("The color key is used to tell the graphics card "
+ _("video colour key"),
+ _("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."),
10, update_config_cb, (void *)this);
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index 78d23cd91..2f7fd2d57 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -755,7 +755,7 @@ static int get_fb_fix_screeninfo(int fd, struct fb_fix_screeninfo *fix, xine_t *
fix->type != FB_TYPE_PACKED_PIXELS)
{
xprintf(xine, XINE_VERBOSITY_LOG,
- _("video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
+ _("video_out_fb: only packed truecolour/directcolour is supported (%d).\n"
" Check 'fbset -i' or try 'fbset -depth 16'.\n"), fix->visual);
return 0;
}
diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
index cb582baab..5b44ea12d 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -1337,7 +1337,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
else
xprintf(class->xine, XINE_VERBOSITY_LOG,
_("video_out_xcbxv: using Xv port %d from adaptor %s for hardware "
- "colorspace conversion and scaling.\n"), xv_port,
+ "colour space conversion and scaling.\n"), xv_port,
xcb_xv_adaptor_info_name(adaptor_it.data));
this->xv_port = xv_port;
@@ -1444,7 +1444,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
adaptor_it.data->base_id,
"video.device.xv_autopaint_colorkey",
_("autopaint colour key"),
- _("Make Xv autopaint its colorkey."));
+ _("Make Xv autopaint its colour key."));
} else if(!strcmp(xcb_xv_attribute_info_name(attribute_it.data), "XV_FILTER")) {
int xv_filter;
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 07b1e1186..7ff7b64e5 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -1380,7 +1380,7 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
else
xprintf(class->xine, XINE_VERBOSITY_LOG,
_("video_out_xv: using Xv port %ld from adaptor %s for hardware "
- "colorspace conversion and scaling.\n"), xv_port,
+ "colour space conversion and scaling.\n"), xv_port,
adaptor_info[adaptor_num].name);
UNLOCK_DISPLAY(this);
@@ -1497,7 +1497,7 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
adaptor_info[adaptor_num].base_id,
"video.device.xv_autopaint_colorkey",
_("autopaint colour key"),
- _("Make Xv autopaint its colorkey."));
+ _("Make Xv autopaint its colour key."));
} else if(!strcmp(attr[k].name, "XV_FILTER")) {
int xv_filter;
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 8f7b1defc..31d4c053d 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -1451,7 +1451,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
class->adaptor_info[class->adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY",
"video.device.xv_autopaint_colorkey",
_("autopaint colour key"),
- _("Make Xv autopaint its colorkey."));
+ _("Make Xv autopaint its colour key."));
} else if(!strcmp(attr[k].name, "XV_DOUBLE_BUFFER")) {
int xvmc_double_buffer;
@@ -1742,7 +1742,7 @@ static void *init_class (xine_t *xine, void *visual_gen) {
else {
xprintf (xine, XINE_VERBOSITY_LOG,
_("video_out_xvmc: using Xv port %ld from adaptor %s\n"
- " for hardware colorspace conversion and scaling\n"),
+ " for hardware colour space conversion and scaling\n"),
xv_port, adaptor_info[adaptor_num].name);
if(IDCTaccel&XINE_VO_IDCT_ACCEL)
diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
index db5b753f5..2b27c3982 100644
--- a/src/video_out/video_out_xxmc.c
+++ b/src/video_out/video_out_xxmc.c
@@ -2424,7 +2424,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
else
xprintf(class->xine, XINE_VERBOSITY_LOG,
_("video_out_xxmc: using Xv port %ld from adaptor %s for hardware "
- "colorspace conversion and scaling.\n"), xv_port,
+ "colour space conversion and scaling.\n"), xv_port,
adaptor_info[adaptor_num].name);
XUnlockDisplay(this->display);
@@ -2535,7 +2535,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
adaptor_info[adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY",
"video.device.xv_autopaint_colorkey",
_("autopaint colour key"),
- _("Make Xv autopaint its colorkey."));
+ _("Make Xv autopaint its colour key."));
} else if(!strcmp(attr[k].name, "XV_FILTER")) {
int xv_filter;
@@ -2647,8 +2647,8 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
10, xxmc_update_cpu_save, this);
this->reverse_nvidia_palette =
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"
+ _("Fix buggy NVIDIA XvMC subpicture colours"),
+ _("There's a bug in NVIDIA's XvMC lib that makes red OSD colours\n"
"look blue and vice versa. This option provides a workaround.\n"),
10, xxmc_update_nvidia_fix, this);
this->bob =
diff --git a/src/video_out/vidix/drivers/mga_vid.c b/src/video_out/vidix/drivers/mga_vid.c
index eed2b9e65..edebc0c4f 100644
--- a/src/video_out/vidix/drivers/mga_vid.c
+++ b/src/video_out/vidix/drivers/mga_vid.c
@@ -425,7 +425,7 @@ static void mga_vid_write_regs(int restore)
writeb(PALWTADD, XCOLMSK);
writeb(X_DATAREG, colkey_mask[3]);
- printf(MGA_MSG" Restored colorkey (ON: %d %02X:%02X:%02X)\n",
+ printf(MGA_MSG" Restored colour key (ON: %d %02X:%02X:%02X)\n",
colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]);
} else if (!colkey_saved) {
@@ -453,7 +453,7 @@ static void mga_vid_write_regs(int restore)
writeb(PALWTADD, XCOLMSK);
colkey_mask[3]=(unsigned char)readb(X_DATAREG);
- printf(MGA_MSG" Saved colorkey (ON: %d %02X:%02X:%02X)\n",
+ printf(MGA_MSG" Saved colour key (ON: %d %02X:%02X:%02X)\n",
colkey_on,colkey_color[0],colkey_color[1],colkey_color[2]);
}
diff --git a/src/video_out/vidix/drivers/nvidia_vid.c b/src/video_out/vidix/drivers/nvidia_vid.c
index 34fa27cb7..e820d58e8 100644
--- a/src/video_out/vidix/drivers/nvidia_vid.c
+++ b/src/video_out/vidix/drivers/nvidia_vid.c
@@ -955,12 +955,12 @@ int vixSetGrKeys( const vidix_grkey_t * grkey){
if (grkey->ckey.op == CKEY_FALSE)
{
info->use_colorkey = 0;
- printf("[nvidia_vid] colorkeying disabled\n");
+ printf("[nvidia_vid] colour keying disabled\n");
}
else {
info->use_colorkey = 1;
info->vidixcolorkey = ((grkey->ckey.red<<16)|(grkey->ckey.green<<8)|grkey->ckey.blue);
- printf("[nvidia_vid] set colorkey 0x%x\n",info->vidixcolorkey);
+ printf("[nvidia_vid] set colour key 0x%x\n",info->vidixcolourkey);
}
if(info->d_width && info->d_height)rivatv_overlay_start(info,0);
return 0;
diff --git a/src/video_out/vidix/drivers/savage_vid.c b/src/video_out/vidix/drivers/savage_vid.c
index 2ac76198d..0ad7b0b15 100644
--- a/src/video_out/vidix/drivers/savage_vid.c
+++ b/src/video_out/vidix/drivers/savage_vid.c
@@ -370,7 +370,7 @@ static void SavageSetColorKeyOld(void)
blue = info->vidixcolorkey & 0x000000FF;
if( !info->vidixcolorkey ) {
- printf("SavageSetColorKey disabling colorkey\n");
+ printf("SavageSetColorKey disabling colour key\n");
OUTREG( COL_CHROMA_KEY_CONTROL_REG, 0 );
OUTREG( CHROMA_KEY_UPPER_BOUND_REG, 0 );
OUTREG( BLEND_CONTROL_REG, 0 );
@@ -1134,13 +1134,13 @@ vixSetGrKeys (const vidix_grkey_t * grkey)
{
info->use_colorkey = 0;
info->vidixcolorkey=0;
- printf("[savage_vid] colorkeying disabled\n");
+ printf("[savage_vid] colour keying disabled\n");
}
else {
info->use_colorkey = 1;
info->vidixcolorkey = ((grkey->ckey.red<<16)|(grkey->ckey.green<<8)|grkey->ckey.blue);
- printf("[savage_vid] set colorkey 0x%x\n",info->vidixcolorkey);
+ printf("[savage_vid] set colour key 0x%x\n",info->vidixcolourkey);
}
//FIXME: freezes if streams arent enabled
SavageSetColorKeyOld();
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index 0ca6537a7..c98dd518f 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -3220,7 +3220,7 @@ yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped,
#ifdef LOG
if (this->yuv2rgb_fun != NULL)
- printf ("yuv2rgb: using MMXEXT for colorspace transform\n");
+ printf ("yuv2rgb: using MMXEXT for colour space transform\n");
#endif
}
@@ -3230,7 +3230,7 @@ yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped,
#ifdef LOG
if (this->yuv2rgb_fun != NULL)
- printf ("yuv2rgb: using MMX for colorspace transform\n");
+ printf ("yuv2rgb: using MMX for colour space transform\n");
#endif
}
#endif
@@ -3241,12 +3241,12 @@ yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped,
#ifdef LOG
if (this->yuv2rgb_fun != NULL)
- printf ("yuv2rgb: using medialib for colorspace transform\n");
+ printf ("yuv2rgb: using medialib for colour space transform\n");
#endif
}
#endif
if (this->yuv2rgb_fun == NULL) {
- lprintf ("no accelerated colorspace conversion found\n");
+ lprintf ("no accelerated colour space conversion found\n");
yuv2rgb_c_init (this);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 03:49:58 +0000