diff options
Diffstat (limited to 'libass/ass.c')
-rw-r--r-- | libass/ass.c | 75 |
1 files changed, 37 insertions, 38 deletions
diff --git a/libass/ass.c b/libass/ass.c index 5aef1447..135232fe 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -182,8 +182,9 @@ static int lookup_style(ass_track_t *track, char *name) return i; } i = track->default_style; - ass_msg(MSGL_WARN, MSGTR_LIBASS_NoStyleNamedXFoundUsingY, - track, name, track->styles[i].Name); + ass_msg(MSGL_WARN, + "[%p]: Warning: no style named '%s' found, using '%s'", + track, name, track->styles[i].Name); return i; // use the first style } @@ -200,7 +201,7 @@ static long long string2timecode(char *p) long long tm; int res = sscanf(p, "%1d:%2d:%2d.%2d", &h, &m, &s, &ms); if (res < 4) { - ass_msg(MSGL_WARN, MSGTR_LIBASS_BadTimestamp); + ass_msg(MSGL_WARN, "Bad timestamp"); return 0; } tm = ((h * 60 + m) * 60 + s) * 1000 + ms * 10; @@ -228,13 +229,13 @@ static int numpad2align(int val) #define ANYVAL(name,func) \ } else if (strcasecmp(tname, #name) == 0) { \ target->name = func(token); \ - ass_msg(MSGL_DBG2, "%s = %s\n", #name, token); + ass_msg(MSGL_DBG2, "%s = %s", #name, token); #define STRVAL(name) \ } else if (strcasecmp(tname, #name) == 0) { \ if (target->name != NULL) free(target->name); \ target->name = strdup(token); \ - ass_msg(MSGL_DBG2, "%s = %s\n", #name, token); + ass_msg(MSGL_DBG2, "%s = %s", #name, token); #define COLORVAL(name) ANYVAL(name,string2color) #define INTVAL(name) ANYVAL(name,atoi) @@ -243,7 +244,7 @@ static int numpad2align(int val) #define STYLEVAL(name) \ } else if (strcasecmp(tname, #name) == 0) { \ target->name = lookup_style(track, token); \ - ass_msg(MSGL_DBG2, "%s = %s\n", #name, token); + ass_msg(MSGL_DBG2, "%s = %s", #name, token); #define ALIAS(alias,name) \ if (strcasecmp(tname, #alias) == 0) {tname = #name;} @@ -317,7 +318,7 @@ static int process_event_tail(ass_track_t *track, ass_event_t *event, if (last >= event->Text && *last == '\r') *last = 0; } - ass_msg(MSGL_DBG2, "Text = %s\n", event->Text); + ass_msg(MSGL_DBG2, "Text = %s", event->Text); event->Duration -= event->Start; free(format); return 0; // "Text" is always the last @@ -457,7 +458,7 @@ static int process_style(ass_track_t *track, char *str) q = format = strdup(track->style_format); - ass_msg(MSGL_V, "[%p] Style: %s\n", track, str); + ass_msg(MSGL_V, "[%p] Style: %s", track, str); sid = ass_alloc_style(track); @@ -534,7 +535,7 @@ static int process_styles_line(ass_track_t *track, char *str) char *p = str + 7; skip_spaces(&p); track->style_format = strdup(p); - ass_msg(MSGL_DBG2, "Style format: %s\n", + ass_msg(MSGL_DBG2, "Style format: %s", track->style_format); } else if (!strncmp(str, "Style:", 6)) { char *p = str + 6; @@ -571,7 +572,7 @@ static void event_format_fallback(ass_track_t *track) track->event_format = strdup ("Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text"); - ass_msg(MSGL_V, "No event format found, using fallback.\n"); + ass_msg(MSGL_V, "No event format found, using fallback"); } static int process_events_line(ass_track_t *track, char *str) @@ -580,8 +581,7 @@ static int process_events_line(ass_track_t *track, char *str) char *p = str + 7; skip_spaces(&p); track->event_format = strdup(p); - ass_msg(MSGL_DBG2, "Event format: %s\n", - track->event_format); + ass_msg(MSGL_DBG2, "Event format: %s", track->event_format); } else if (!strncmp(str, "Dialogue:", 9)) { // This should never be reached for embedded subtitles. // They have slightly different format and are parsed in ass_process_chunk, @@ -601,7 +601,7 @@ static int process_events_line(ass_track_t *track, char *str) process_event_tail(track, event, str, 0); } else { - ass_msg(MSGL_V, "Not understood: %s \n", str); + ass_msg(MSGL_V, "Not understood: '%s'", str); } return 0; } @@ -636,11 +636,11 @@ static int decode_font(ass_track_t *track) int dsize; // decoded size unsigned char *buf = 0; - ass_msg(MSGL_V, "font: %d bytes encoded data \n", + ass_msg(MSGL_V, "Font: %d bytes encoded data", track->parser_priv->fontdata_used); size = track->parser_priv->fontdata_used; if (size % 4 == 1) { - ass_msg(MSGL_ERR, MSGTR_LIBASS_BadEncodedDataSize); + ass_msg(MSGL_ERR, "Bad encoded data size"); goto error_decode_font; } buf = malloc(size / 4 * 3 + 2); @@ -686,19 +686,19 @@ static int process_fonts_line(ass_track_t *track, char *str) decode_font(track); } track->parser_priv->fontname = strdup(p); - ass_msg(MSGL_V, "fontname: %s\n", + ass_msg(MSGL_V, "Fontname: %s", track->parser_priv->fontname); return 0; } if (!track->parser_priv->fontname) { - ass_msg(MSGL_V, "Not understood: %s \n", str); + ass_msg(MSGL_V, "Not understood: '%s'", str); return 0; } len = strlen(str); if (len > 80) { - ass_msg(MSGL_WARN, MSGTR_LIBASS_FontLineTooLong, len, str); + ass_msg(MSGL_WARN, "Font line too long: %d, %s", len, str); return 0; } if (track->parser_priv->fontdata_used + len > @@ -801,7 +801,7 @@ void ass_process_data(ass_track_t *track, char *data, int size) memcpy(str, data, size); str[size] = '\0'; - ass_msg(MSGL_V, "event: %s\n", str); + ass_msg(MSGL_V, "Event: %s", str); process_text(track, str); free(str); } @@ -852,14 +852,14 @@ void ass_process_chunk(ass_track_t *track, char *data, int size, ass_event_t *event; if (!track->event_format) { - ass_msg(MSGL_WARN, MSGTR_LIBASS_EventFormatHeaderMissing); + ass_msg(MSGL_WARN, "Event format header missing"); return; } str = malloc(size + 1); memcpy(str, data, size); str[size] = '\0'; - ass_msg(MSGL_V, "event at %" PRId64 ", +%" PRId64 ": %s \n", + ass_msg(MSGL_V, "Event at %" PRId64 ", +%" PRId64 ": %s", (int64_t) timecode, (int64_t) duration, str); eid = ass_alloc_event(track); @@ -918,10 +918,9 @@ static char *sub_recode(char *data, size_t size, char *codepage) } #endif if ((icdsc = iconv_open(tocp, cp_tmp)) != (iconv_t) (-1)) { - ass_msg(MSGL_V, "LIBSUB: opened iconv descriptor.\n"); + ass_msg(MSGL_V, "Opened iconv descriptor"); } else - ass_msg(MSGL_ERR, - MSGTR_LIBASS_ErrorOpeningIconvDescriptor); + ass_msg(MSGL_ERR, "Error opening iconv descriptor"); } { @@ -952,8 +951,7 @@ static char *sub_recode(char *data, size_t size, char *codepage) osize += size; oleft += size; } else { - ass_msg(MSGL_WARN, - MSGTR_LIBASS_ErrorRecodingFile); + ass_msg(MSGL_WARN, "Error recoding file"); return NULL; } } else if (clear) @@ -965,7 +963,7 @@ static char *sub_recode(char *data, size_t size, char *codepage) if (icdsc != (iconv_t) (-1)) { (void) iconv_close(icdsc); icdsc = (iconv_t) (-1); - ass_msg(MSGL_V, "LIBSUB: closed iconv descriptor.\n"); + ass_msg(MSGL_V, "Closed iconv descriptor"); } return outbuf; @@ -987,12 +985,12 @@ static char *read_file(char *fname, size_t *bufsize) FILE *fp = fopen(fname, "rb"); if (!fp) { - ass_msg(MSGL_WARN, MSGTR_LIBASS_FopenFailed, fname); + ass_msg(MSGL_WARN, "ass_read_file(%s): fopen failed", fname); return 0; } res = fseek(fp, 0, SEEK_END); if (res == -1) { - ass_msg(MSGL_WARN, MSGTR_LIBASS_FseekFailed, fname); + ass_msg(MSGL_WARN, "ass_read_file(%s): fseek failed", fname); fclose(fp); return 0; } @@ -1002,12 +1000,13 @@ static char *read_file(char *fname, size_t *bufsize) if (sz > 10 * 1024 * 1024) { ass_msg(MSGL_INFO, - MSGTR_LIBASS_RefusingToLoadSubtitlesLargerThan10M, fname); + "ass_read_file(%s): Refusing to load subtitles " + "larger than 10MiB", fname); fclose(fp); return 0; } - ass_msg(MSGL_V, "file size: %ld\n", sz); + ass_msg(MSGL_V, "File size: %ld", sz); buf = malloc(sz + 1); assert(buf); @@ -1015,8 +1014,8 @@ static char *read_file(char *fname, size_t *bufsize) do { res = fread(buf + bytes_read, 1, sz - bytes_read, fp); if (res <= 0) { - ass_msg(MSGL_INFO, MSGTR_LIBASS_ReadFailed, errno, - strerror(errno)); + ass_msg(MSGL_INFO, "Read failed, %d: %s", errno, + strerror(errno)); fclose(fp); free(buf); return 0; @@ -1093,8 +1092,9 @@ ass_track_t *ass_read_memory(ass_library_t *library, char *buf, if (!track) return 0; - ass_msg(MSGL_INFO, MSGTR_LIBASS_AddedSubtitleFileMemory, - track->n_styles, track->n_events); + ass_msg(MSGL_INFO, "Added subtitle file: " + "<memory> (%d styles, %d events)", + track->n_styles, track->n_events); return track; } @@ -1143,10 +1143,9 @@ ass_track_t *ass_read_file(ass_library_t *library, char *fname, track->name = strdup(fname); - ass_msg(MSGL_INFO, MSGTR_LIBASS_AddedSubtitleFileFname, fname, - track->n_styles, track->n_events); + ass_msg(MSGL_INFO, "Added subtitle file: '%s' (%d styles, %d events)", + fname, track->n_styles, track->n_events); -// dump_events(forced_tid); return track; } |