vlc | branch: master | Francois Cartegnie <[email protected]> | Mon Jul 1 18:25:48 2019 +0200| [6f6c9455c575df5b7c0317ade02d1c992a2eb62f] | committer: Francois Cartegnie
vlc_text_style: remove all karaoke styling should be rendered by decoder as multiple pictures > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6f6c9455c575df5b7c0317ade02d1c992a2eb62f --- include/vlc_text_style.h | 8 ++------ src/misc/text_style.c | 4 ---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/vlc_text_style.h b/include/vlc_text_style.h index dc20eaaa76..6517094b37 100644 --- a/include/vlc_text_style.h +++ b/include/vlc_text_style.h @@ -62,11 +62,9 @@ typedef struct uint8_t i_shadow_alpha; /**< The transparency of the shadow. */ int i_shadow_width; /**< The width of the shadow in pixels */ - /* Background (and karaoke) */ + /* Background */ int i_background_color;/**< The color of the background 0xRRGGBB */ uint8_t i_background_alpha;/**< The transparency of the background */ - int i_karaoke_background_color;/**< Background color for karaoke 0xRRGGBB */ - uint8_t i_karaoke_background_alpha;/**< The transparency of the karaoke bg */ /* Line breaking */ enum @@ -92,9 +90,7 @@ typedef struct #define STYLE_HAS_SHADOW_ALPHA (1 << 6) #define STYLE_HAS_BACKGROUND_COLOR (1 << 7) #define STYLE_HAS_BACKGROUND_ALPHA (1 << 8) -#define STYLE_HAS_K_BACKGROUND_COLOR (1 << 9) -#define STYLE_HAS_K_BACKGROUND_ALPHA (1 << 10) -#define STYLE_HAS_WRAP_INFO (1 << 11) +#define STYLE_HAS_WRAP_INFO (1 << 9) /* Style flags for \ref text_style_t */ #define STYLE_BOLD (1 << 0) diff --git a/src/misc/text_style.c b/src/misc/text_style.c index 9a7319b04b..2f334fd118 100644 --- a/src/misc/text_style.c +++ b/src/misc/text_style.c @@ -59,8 +59,6 @@ text_style_t *text_style_Create( int i_defaults ) p_style->i_shadow_alpha = STYLE_ALPHA_OPAQUE; p_style->i_background_color = 0x000000; p_style->i_background_alpha = STYLE_ALPHA_OPAQUE; - p_style->i_karaoke_background_color = 0xffffff; - p_style->i_karaoke_background_alpha = STYLE_ALPHA_OPAQUE; p_style->i_outline_width = 1; p_style->i_shadow_width = 0; p_style->i_spacing = -1; @@ -118,8 +116,6 @@ void text_style_Merge( text_style_t *p_dst, const text_style_t *p_src, bool b_ov MERGE(i_shadow_alpha, STYLE_HAS_SHADOW_ALPHA); MERGE(i_background_color, STYLE_HAS_BACKGROUND_COLOR); MERGE(i_background_alpha, STYLE_HAS_BACKGROUND_ALPHA); - MERGE(i_karaoke_background_color, STYLE_HAS_K_BACKGROUND_COLOR); - MERGE(i_karaoke_background_alpha, STYLE_HAS_K_BACKGROUND_ALPHA); MERGE(e_wrapinfo, STYLE_HAS_WRAP_INFO); p_dst->i_features |= p_src->i_features; p_dst->i_style_flags |= p_src->i_style_flags; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
