From 485ae095f77a27bd3bca08b0e221dff14581e0d3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 3 May 2016 22:29:12 +0200 Subject: osd: make osd_ass_0/1 defines So we can concatenate them with strings at compile time. --- sub/osd_libass.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'sub/osd_libass.c') diff --git a/sub/osd_libass.c b/sub/osd_libass.c index 30d404d8c6..6a2efa6603 100644 --- a/sub/osd_libass.c +++ b/sub/osd_libass.c @@ -179,13 +179,10 @@ static void clear_ass(struct ass_state *ass) void osd_get_function_sym(char *buffer, size_t buffer_size, int osd_function) { // 0xFF is never valid UTF-8, so we can use it to escape OSD symbols. + // (Same trick as OSD_ASS_0/OSD_ASS_1.) snprintf(buffer, buffer_size, "\xFF%c", osd_function); } -// Same trick as above: never valid UTF-8, so we expect it's free for use. -const char *const osd_ass_0 = "\xFD"; -const char *const osd_ass_1 = "\xFE"; - static void mangle_ass(bstr *dst, const char *in) { bool escape_ass = true; @@ -198,8 +195,8 @@ static void mangle_ass(bstr *dst, const char *in) in += 2; continue; } - if (*in == '\xFD' || *in == '\xFE') { - escape_ass = *in == '\xFE'; + if (*in == OSD_ASS_0[0] || *in == OSD_ASS_1[0]) { + escape_ass = *in == OSD_ASS_1[0]; in += 1; continue; } -- cgit v1.2.3