From 9f911a4387602eba171b314e3cfe02ce0deabf60 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Mon, 24 Dec 2007 18:58:26 +0000 Subject: Consistently use "colour", "colour key", "colour space" in output. Some instances of "key colour" remain; ffmpeg is unmodified. This change has caused two strings with two translations to collide (the strings have become identical since some instances already used "colour"). I have therefore arbitrarily dropped the first of the differing translations, the one for the string at src/video_out/video_out_directfb.c:1365. --- src/dxr3/dxr3_spu_encoder.c | 8 ++++---- src/dxr3/video_out_dxr3.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/dxr3') diff --git a/src/dxr3/dxr3_spu_encoder.c b/src/dxr3/dxr3_spu_encoder.c index 1dcc13b77..2517063ac 100644 --- a/src/dxr3/dxr3_spu_encoder.c +++ b/src/dxr3/dxr3_spu_encoder.c @@ -167,11 +167,11 @@ static void create_histogram(spu_encoder_t *this) #ifdef LOG for (i = 0; i < OVL_PALETTE_SIZE; i++) if (this->map[i]) - lprintf("histogram: color #%d 0x%.8x appears %d times\n", + lprintf("histogram: colour #%d 0x%.8x appears %d times\n", i, this->overlay->color[i], this->map[i]); for (i = 0; i < OVL_PALETTE_SIZE; i++) if (this->clip_map[i]) - lprintf("histogram: clip color #%d 0x%.8x appears %d times\n", + lprintf("histogram: clip colour #%d 0x%.8x appears %d times\n", i, this->overlay->hili_color[i], this->clip_map[i]); #endif } @@ -209,7 +209,7 @@ static void generate_clut(spu_encoder_t *this) } #ifdef LOG for (spu_color = 0; spu_color < 4; spu_color++) - lprintf("spu color %d: 0x%.8x, trans: %d\n", spu_color, + lprintf("spu colour %d: 0x%.8x, trans: %d\n", spu_color, this->color[spu_color], this->trans[spu_color]); #endif @@ -243,7 +243,7 @@ static void generate_clut(spu_encoder_t *this) } #ifdef LOG for (spu_color = 0; spu_color < 4; spu_color++) - lprintf("spu clip color %d: 0x%.8x, trans: %d\n", spu_color, + lprintf("spu clip colour %d: 0x%.8x, trans: %d\n", spu_color, this->hili_color[spu_color], this->hili_trans[spu_color]); #endif } diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 73eb133e1..c51354157 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -431,13 +431,13 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v this->tv_switchable = 1; this->widescreen_enabled = confnum - 2; confstr = config->register_string(config, "dxr3.output.keycolor", "0x80a040", - _("overlay colorkey value"), _("Hexadecimal RGB value of the key color.\n" + _("overlay colour key value"), _("Hexadecimal RGB value of the key colour.\n" "You can try different values, if you experience windows becoming transparent " "when using DXR3 overlay mode."), 20, NULL, NULL); sscanf(confstr, "%x", &this->overlay.colorkey); confstr = config->register_string(config, "dxr3.output.keycolor_interval", "50.0", - _("overlay colorkey tolerance"), _("A greater value widens the tolerance for " - "the overlay keycolor.\nYou can try lower values, if you experience windows " + _("overlay colour key tolerance"), _("A greater value widens the tolerance for " + "the overlay key colour.\nYou can try lower values, if you experience windows " "becoming transparent when using DXR3 overlay mode, but parts of the image borders may " "disappear when using a too low setting."), 20, NULL, NULL); sscanf(confstr, "%f", &this->overlay.color_interval); @@ -509,7 +509,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v if (dxr3_overlay_set_keycolor(&this->overlay) != 0) xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, - "video_out_dxr3: setting the overlay keycolor failed.\n"); + "video_out_dxr3: setting the overlay key colour failed.\n"); if (dxr3_overlay_set_attributes(&this->overlay) != 0) xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, "video_out_dxr3: setting an overlay attribute failed.\n"); -- cgit v1.2.3 From c5f704991d3c66e54c03de09d99d4b0436641ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 15:40:26 +0100 Subject: Mark some static objects constant too. --- src/dxr3/dxr3_decode_video.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dxr3') diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 39da80249..2003979eb 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -208,7 +208,7 @@ static void *dxr3_init_plugin(xine_t *xine, void *data) static video_decoder_t *dxr3_open_plugin(video_decoder_class_t *class_gen, xine_stream_t *stream) { - static char *panscan_types[] = { "only when forced", "use MPEG hint", "use DVB hint", NULL }; + static const char *const panscan_types[] = { "only when forced", "use MPEG hint", "use DVB hint", NULL }; dxr3_decoder_t *this; dxr3_decoder_class_t *class = (dxr3_decoder_class_t *)class_gen; config_values_t *cfg; @@ -625,7 +625,7 @@ static void dxr3_flush(video_decoder_t *this_gen) * (the highlights won't move without), but some dvds have stills * with no sequence end code. Since it is very likely that flush() is called * in still situations, we send one here. */ - static uint8_t end_buffer[4] = { 0x00, 0x00, 0x01, 0xb7 }; + static const uint8_t end_buffer[4] = { 0x00, 0x00, 0x01, 0xb7 }; write(this->fd_video, &end_buffer, 4); this->sequence_open = 0; xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "dxr3_decode_video: WARNING: added missing end sequence\n"); -- cgit v1.2.3 From 3badd9b739a0cc8dc6e70194863692557a494224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 15:41:24 +0100 Subject: Fix constant pointers declaration. --- src/dxr3/video_out_dxr3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/dxr3') diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index a2153dacc..81deea482 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -209,12 +209,12 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v plugin_node_t *node; #ifdef HAVE_X11 - static const char const *videoout_modes[] = { "letterboxed tv", "widescreen tv", + static const char *const videoout_modes[] = { "letterboxed tv", "widescreen tv", "letterboxed overlay", "widescreen overlay", NULL }; #else - static const char const *videoout_modes[] = { "letterboxed tv", "widescreen tv", NULL }; + static const char *const videoout_modes[] = { "letterboxed tv", "widescreen tv", NULL }; #endif - static const char const *tv_modes[] = { "ntsc", "pal", "pal60" , "default", NULL }; + static const char *const tv_modes[] = { "ntsc", "pal", "pal60" , "default", NULL }; int list_id, list_size; xine_sarray_t *plugin_list; -- cgit v1.2.3 From 3697dd13e57c0cbb045310e19c8339fe80d49549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 15:42:05 +0100 Subject: Make more readable. --- src/dxr3/video_out_dxr3.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/dxr3') diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 81deea482..716e39976 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -208,12 +208,13 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v static char *available_encoders[SUPPORTED_ENCODER_COUNT + 2]; plugin_node_t *node; + static const char *const videoout_modes[] = { + "letterboxed tv", "widescreen tv", #ifdef HAVE_X11 - static const char *const videoout_modes[] = { "letterboxed tv", "widescreen tv", - "letterboxed overlay", "widescreen overlay", NULL }; -#else - static const char *const videoout_modes[] = { "letterboxed tv", "widescreen tv", NULL }; + "letterboxed overlay", "widescreen overlay", #endif + NULL + }; static const char *const tv_modes[] = { "ntsc", "pal", "pal60" , "default", NULL }; int list_id, list_size; xine_sarray_t *plugin_list; -- cgit v1.2.3 From c292a8d56fc0531297775cf64f14190b26b9b216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 17:18:36 +0100 Subject: Mark all supported_types constant. --- src/dxr3/dxr3_decode_spu.c | 2 +- src/dxr3/dxr3_decode_video.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/dxr3') diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index 8280d4714..7c51b5c4b 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -64,7 +64,7 @@ static void *dxr3_spudec_init_plugin(xine_t *xine, void *); /* plugin catalog information */ -static uint32_t supported_types[] = { BUF_SPU_DVD, 0 }; +static const uint32_t supported_types[] = { BUF_SPU_DVD, 0 }; static const decoder_info_t dxr3_spudec_info = { supported_types, /* supported types */ diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 2003979eb..a10fa11c8 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -65,7 +65,7 @@ static void *dxr3_init_plugin(xine_t *xine, void *); /* plugin catalog information */ -static uint32_t supported_types[] = { BUF_VIDEO_MPEG, 0 }; +static const uint32_t supported_types[] = { BUF_VIDEO_MPEG, 0 }; static const decoder_info_t dxr3_video_decoder_info = { supported_types, /* supported types */ -- cgit v1.2.3 From a6a44d3e64f6b32ce53128937c8bb894fce4644d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 19:01:18 +0100 Subject: Don't create extra variables now that node is transparent to xine's build. --- src/dxr3/dxr3_decode_spu.c | 16 ++++++---------- src/dxr3/dxr3_decode_video.c | 14 +++++--------- 2 files changed, 11 insertions(+), 19 deletions(-) (limited to 'src/dxr3') diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index 7c51b5c4b..f3163e331 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -144,19 +144,15 @@ static inline void dxr3_swab_clut(int* clut); /* inline helper implementations */ static inline int dxr3_present(xine_stream_t *stream) { - plugin_node_t *node; - video_driver_class_t *vo_class; int present = 0; - if (stream->video_driver && stream->video_driver->node) { - node = (plugin_node_t *)stream->video_driver->node; - if (node->plugin_class) { - vo_class = (video_driver_class_t *)node->plugin_class; - if (vo_class->identifier) - present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); - } + if (stream->video_driver && stream->video_driver->node && + stream->video_driver->node->plugin_class ) { + const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class; + if (vo_class->identifier) + present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); } - llprintf(LOG_SPU, "dxr3 %s\n", present ? "present" : "not present"); + llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present"); return present; } diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index a10fa11c8..9eb0527d1 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -158,17 +158,13 @@ static void dxr3_update_correct_durations(void *this_gen, xine_cfg_entry_t /* inline helper implementations */ static inline int dxr3_present(xine_stream_t *stream) { - plugin_node_t *node; - video_driver_class_t *vo_class; int present = 0; - if (stream->video_driver && stream->video_driver->node) { - node = (plugin_node_t *)stream->video_driver->node; - if (node->plugin_class) { - vo_class = (video_driver_class_t *)node->plugin_class; - if (vo_class->identifier) - present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); - } + if (stream->video_driver && stream->video_driver->node && + stream->video_driver->node->plugin_class ) { + const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class; + if (vo_class->identifier) + present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); } llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present"); return present; -- cgit v1.2.3 From f2524801047b6cc4d9178e45cd4799e452854ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 19:03:43 +0100 Subject: Move dxr3_present() in dxr3.h to avoid duplicating the function. --- src/dxr3/dxr3.h | 16 +++++++++++++++- src/dxr3/dxr3_decode_spu.c | 14 -------------- src/dxr3/dxr3_decode_video.c | 15 --------------- 3 files changed, 15 insertions(+), 30 deletions(-) (limited to 'src/dxr3') diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h index 0b0961ca0..8a55129a0 100644 --- a/src/dxr3/dxr3.h +++ b/src/dxr3/dxr3.h @@ -37,5 +37,19 @@ * (used by decoders to check for dxr3 presence) */ #define DXR3_VO_ID "dxr3" -#endif +/* inline helper implementations */ +static inline int dxr3_present(xine_stream_t *stream) +{ + int present = 0; + + if (stream->video_driver && stream->video_driver->node && + stream->video_driver->node->plugin_class ) { + const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class; + if (vo_class->identifier) + present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); + } + llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present"); + return present; +} +#endif diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c index f3163e331..01dd20b05 100644 --- a/src/dxr3/dxr3_decode_spu.c +++ b/src/dxr3/dxr3_decode_spu.c @@ -142,20 +142,6 @@ static int dxr3_spudec_copy_nav_to_btn(dxr3_spudec_t *this, int32_t mode static inline void dxr3_swab_clut(int* clut); /* inline helper implementations */ -static inline int dxr3_present(xine_stream_t *stream) -{ - int present = 0; - - if (stream->video_driver && stream->video_driver->node && - stream->video_driver->node->plugin_class ) { - const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class; - if (vo_class->identifier) - present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); - } - llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present"); - return present; -} - static inline void dxr3_spudec_clear_nav_list(dxr3_spudec_t *this) { while (this->pci_cur.next) { diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c index 9eb0527d1..4347fb808 100644 --- a/src/dxr3/dxr3_decode_video.c +++ b/src/dxr3/dxr3_decode_video.c @@ -143,7 +143,6 @@ typedef struct dxr3_decoder_s { } dxr3_decoder_t; /* helper functions */ -static inline int dxr3_present(xine_stream_t *stream); static inline int dxr3_mvcommand(int fd_control, int command); static void parse_mpeg_header(dxr3_decoder_t *this, uint8_t *buffer); static int get_duration(dxr3_decoder_t *this); @@ -156,20 +155,6 @@ static void dxr3_update_enhanced_mode(void *this_gen, xine_cfg_entry_t *ent static void dxr3_update_correct_durations(void *this_gen, xine_cfg_entry_t *entry); /* inline helper implementations */ -static inline int dxr3_present(xine_stream_t *stream) -{ - int present = 0; - - if (stream->video_driver && stream->video_driver->node && - stream->video_driver->node->plugin_class ) { - const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class; - if (vo_class->identifier) - present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); - } - llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present"); - return present; -} - static inline int dxr3_mvcommand(int fd_control, int command) { em8300_register_t reg; -- cgit v1.2.3 From 5d3fbda90ff2e4ce56da9b7721de41266117ded8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sun, 23 Dec 2007 19:04:21 +0100 Subject: Break immediately if the video driver is found, rather than continuing for the whole list. --- src/dxr3/dxr3.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/dxr3') diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h index 8a55129a0..4ded9cd4c 100644 --- a/src/dxr3/dxr3.h +++ b/src/dxr3/dxr3.h @@ -45,8 +45,10 @@ static inline int dxr3_present(xine_stream_t *stream) if (stream->video_driver && stream->video_driver->node && stream->video_driver->node->plugin_class ) { const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class; - if (vo_class->identifier) + if (vo_class->identifier) { present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); + if ( present ) break; + } } llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present"); return present; -- cgit v1.2.3 From e62ee2e80946b4593826a1fc244829dca5ba526f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 26 Dec 2007 14:34:59 +0100 Subject: Backed out changeset 169a228c8f4e --- src/dxr3/dxr3.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/dxr3') diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h index 4ded9cd4c..8a55129a0 100644 --- a/src/dxr3/dxr3.h +++ b/src/dxr3/dxr3.h @@ -45,10 +45,8 @@ static inline int dxr3_present(xine_stream_t *stream) if (stream->video_driver && stream->video_driver->node && stream->video_driver->node->plugin_class ) { const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class; - if (vo_class->identifier) { + if (vo_class->identifier) present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); - if ( present ) break; - } } llprintf(LOG_VID, "dxr3 %s\n", present ? "present" : "not present"); return present; -- cgit v1.2.3 From ee4127687a00d8aa4e5babe8f142ad6772f48d9c Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 26 Dec 2007 13:45:42 +0000 Subject: Fix remaining dxr3 compilation errors. --- src/dxr3/dxr3.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/dxr3') diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h index 8a55129a0..12dedf07f 100644 --- a/src/dxr3/dxr3.h +++ b/src/dxr3/dxr3.h @@ -25,6 +25,10 @@ #include +#ifndef LOG_VID +#define LOG_VID 0 +#endif + /* data for the device name config entry */ #define CONF_KEY "dxr3.device_number" #define CONF_NAME _("DXR3 device number") @@ -44,7 +48,7 @@ static inline int dxr3_present(xine_stream_t *stream) if (stream->video_driver && stream->video_driver->node && stream->video_driver->node->plugin_class ) { - const video_driver_class_t *const vo_class = (video_driver_class_t *)node->plugin_class; + const video_driver_class_t *const vo_class = (video_driver_class_t *)stream->video_driver->node->plugin_class; if (vo_class->identifier) present = (strcmp(vo_class->identifier, DXR3_VO_ID) == 0); } -- cgit v1.2.3 From 6dbb05a4cba3cdc811308762058d722f11464683 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 30 Dec 2007 15:55:03 +0000 Subject: =?UTF-8?q?Manual=20port=20of=20the=20color=E2=86=92colour=20chang?= =?UTF-8?q?e=20to=201.2;=20should=20make=20merging=20easier.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dxr3/dxr3_spu_encoder.c | 8 ++++---- src/dxr3/video_out_dxr3.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/dxr3') diff --git a/src/dxr3/dxr3_spu_encoder.c b/src/dxr3/dxr3_spu_encoder.c index 1dcc13b77..2517063ac 100644 --- a/src/dxr3/dxr3_spu_encoder.c +++ b/src/dxr3/dxr3_spu_encoder.c @@ -167,11 +167,11 @@ static void create_histogram(spu_encoder_t *this) #ifdef LOG for (i = 0; i < OVL_PALETTE_SIZE; i++) if (this->map[i]) - lprintf("histogram: color #%d 0x%.8x appears %d times\n", + lprintf("histogram: colour #%d 0x%.8x appears %d times\n", i, this->overlay->color[i], this->map[i]); for (i = 0; i < OVL_PALETTE_SIZE; i++) if (this->clip_map[i]) - lprintf("histogram: clip color #%d 0x%.8x appears %d times\n", + lprintf("histogram: clip colour #%d 0x%.8x appears %d times\n", i, this->overlay->hili_color[i], this->clip_map[i]); #endif } @@ -209,7 +209,7 @@ static void generate_clut(spu_encoder_t *this) } #ifdef LOG for (spu_color = 0; spu_color < 4; spu_color++) - lprintf("spu color %d: 0x%.8x, trans: %d\n", spu_color, + lprintf("spu colour %d: 0x%.8x, trans: %d\n", spu_color, this->color[spu_color], this->trans[spu_color]); #endif @@ -243,7 +243,7 @@ static void generate_clut(spu_encoder_t *this) } #ifdef LOG for (spu_color = 0; spu_color < 4; spu_color++) - lprintf("spu clip color %d: 0x%.8x, trans: %d\n", spu_color, + lprintf("spu clip colour %d: 0x%.8x, trans: %d\n", spu_color, this->hili_color[spu_color], this->hili_trans[spu_color]); #endif } diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 716e39976..69b2d3eed 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -420,13 +420,13 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v this->tv_switchable = 1; this->widescreen_enabled = confnum - 2; confstr = config->register_string(config, "dxr3.output.keycolor", "0x80a040", - _("overlay colorkey value"), _("Hexadecimal RGB value of the key color.\n" + _("overlay colour key value"), _("Hexadecimal RGB value of the key colour.\n" "You can try different values, if you experience windows becoming transparent " "when using DXR3 overlay mode."), 20, NULL, NULL); sscanf(confstr, "%x", &this->overlay.colorkey); confstr = config->register_string(config, "dxr3.output.keycolor_interval", "50.0", - _("overlay colorkey tolerance"), _("A greater value widens the tolerance for " - "the overlay keycolor.\nYou can try lower values, if you experience windows " + _("overlay colour key tolerance"), _("A greater value widens the tolerance for " + "the overlay key colour.\nYou can try lower values, if you experience windows " "becoming transparent when using DXR3 overlay mode, but parts of the image borders may " "disappear when using a too low setting."), 20, NULL, NULL); sscanf(confstr, "%f", &this->overlay.color_interval); @@ -498,7 +498,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v if (dxr3_overlay_set_keycolor(&this->overlay) != 0) xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, - "video_out_dxr3: setting the overlay keycolor failed.\n"); + "video_out_dxr3: setting the overlay key colour failed.\n"); if (dxr3_overlay_set_attributes(&this->overlay) != 0) xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, "video_out_dxr3: setting an overlay attribute failed.\n"); -- cgit v1.2.3 From 284db4a4fc4941b7a3b903d3ab23b04840517fd1 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 1 Jan 2008 17:31:12 +0000 Subject: Avoid potential install-time mislinkage against libxine.so.2. --- src/dxr3/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dxr3') diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index 3368dbe94..f1a61ce12 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -42,7 +42,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \ dxr3_scr.c \ video_out_dxr3.c -xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm +xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm xineplug_vo_out_dxr3_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module -- cgit v1.2.3