Rename mp_msg to ass_msg

1 files changed, 45 insertions, 45 deletions

diff --git a/libass/ass_render.c b/libass/ass_render.c
index f99a8aa..f21069d 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -239,7 +239,7 @@ static void ass_lazy_track_init(ass_renderer_t *render_priv)
     if (track->PlayResX && track->PlayResY)
         return;
     if (!track->PlayResX && !track->PlayResY) {
-        mp_msg(MSGT_ASS, MSGL_WARN,
+        ass_msg(MSGL_WARN,
                MSGTR_LIBASS_NeitherPlayResXNorPlayResYDefined);
         track->PlayResX = 384;
         track->PlayResY = 288;
@@ -250,19 +250,19 @@ static void ass_lazy_track_init(ass_renderer_t *render_priv)
             render_priv->width;
         if (!track->PlayResY && track->PlayResX == 1280) {
             track->PlayResY = 1024;
-            mp_msg(MSGT_ASS, MSGL_WARN,
+            ass_msg(MSGL_WARN,
                    MSGTR_LIBASS_PlayResYUndefinedSettingY, track->PlayResY);
         } else if (!track->PlayResY) {
             track->PlayResY = track->PlayResX / orig_aspect + .5;
-            mp_msg(MSGT_ASS, MSGL_WARN,
+            ass_msg(MSGL_WARN,
                    MSGTR_LIBASS_PlayResYUndefinedSettingY, track->PlayResY);
         } else if (!track->PlayResX && track->PlayResY == 1024) {
             track->PlayResX = 1280;
-            mp_msg(MSGT_ASS, MSGL_WARN,
+            ass_msg(MSGL_WARN,
                    MSGTR_LIBASS_PlayResXUndefinedSettingX, track->PlayResX);
         } else if (!track->PlayResX) {
             track->PlayResX = track->PlayResY * orig_aspect + .5;
-            mp_msg(MSGT_ASS, MSGL_WARN,
+            ass_msg(MSGL_WARN,
                    MSGTR_LIBASS_PlayResXUndefinedSettingX, track->PlayResX);
         }
     }
@@ -277,14 +277,14 @@ ass_renderer_t *ass_renderer_init(ass_library_t *library)
 
     error = FT_Init_FreeType(&ft);
     if (error) {
-        mp_msg(MSGT_ASS, MSGL_FATAL, MSGTR_LIBASS_FT_Init_FreeTypeFailed);
+        ass_msg(MSGL_FATAL, MSGTR_LIBASS_FT_Init_FreeTypeFailed);
         goto ass_init_exit;
     }
 
     FT_Library_Version(ft, &vmajor, &vminor, &vpatch);
-    mp_msg(MSGT_ASS, MSGL_V, "FreeType library version: %d.%d.%d\n",
+    ass_msg(MSGL_V, "FreeType library version: %d.%d.%d\n",
            vmajor, vminor, vpatch);
-    mp_msg(MSGT_ASS, MSGL_V, "FreeType headers version: %d.%d.%d\n",
+    ass_msg(MSGL_V, "FreeType headers version: %d.%d.%d\n",
            FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
 
     priv = calloc(1, sizeof(ass_renderer_t));
@@ -312,9 +312,9 @@ ass_renderer_t *ass_renderer_init(ass_library_t *library)
 
   ass_init_exit:
     if (priv)
-        mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_Init);
+        ass_msg(MSGL_INFO, MSGTR_LIBASS_Init);
     else
-        mp_msg(MSGT_ASS, MSGL_ERR, MSGTR_LIBASS_InitFailed);
+        ass_msg(MSGL_ERR, MSGTR_LIBASS_InitFailed);
 
     return priv;
 }
@@ -404,22 +404,22 @@ static ass_image_t **render_glyph(ass_renderer_t *render_priv,
 
     tmp = dst_x - clip_x0;
     if (tmp < 0) {
-        mp_msg(MSGT_ASS, MSGL_DBG2, "clip left\n");
+        ass_msg(MSGL_DBG2, "clip left\n");
         b_x0 = -tmp;
     }
     tmp = dst_y - clip_y0;
     if (tmp < 0) {
-        mp_msg(MSGT_ASS, MSGL_DBG2, "clip top\n");
+        ass_msg(MSGL_DBG2, "clip top\n");
         b_y0 = -tmp;
     }
     tmp = clip_x1 - dst_x - bm->w;
     if (tmp < 0) {
-        mp_msg(MSGT_ASS, MSGL_DBG2, "clip right\n");
+        ass_msg(MSGL_DBG2, "clip right\n");
         b_x1 = bm->w + tmp;
     }
     tmp = clip_y1 - dst_y - bm->h;
     if (tmp < 0) {
-        mp_msg(MSGT_ASS, MSGL_DBG2, "clip bottom\n");
+        ass_msg(MSGL_DBG2, "clip bottom\n");
         b_y1 = bm->h + tmp;
     }
 
@@ -816,7 +816,7 @@ static void change_border(ass_renderer_t *render_priv, double border)
                                memory, &render_priv->state.stroker);
 #endif
             if (error) {
-                mp_msg(MSGT_ASS, MSGL_V, "failed to get stroker\n");
+                ass_msg(MSGL_V, "failed to get stroker\n");
                 render_priv->state.stroker = 0;
             }
         }
@@ -915,19 +915,19 @@ static char *parse_tag(ass_renderer_t *render_priv, char *p, double pwr)
     if (mystrcmp(&p, "xbord")) {
         double val;
         if (mystrtod(&p, &val))
-            mp_msg(MSGT_ASS, MSGL_V, "stub: \\xbord%.2f\n", val);
+            ass_msg(MSGL_V, "stub: \\xbord%.2f\n", val);
     } else if (mystrcmp(&p, "ybord")) {
         double val;
         if (mystrtod(&p, &val))
-            mp_msg(MSGT_ASS, MSGL_V, "stub: \\ybord%.2f\n", val);
+            ass_msg(MSGL_V, "stub: \\ybord%.2f\n", val);
     } else if (mystrcmp(&p, "xshad")) {
         int val;
         if (mystrtoi(&p, &val))
-            mp_msg(MSGT_ASS, MSGL_V, "stub: \\xshad%d\n", val);
+            ass_msg(MSGL_V, "stub: \\xshad%d\n", val);
     } else if (mystrcmp(&p, "yshad")) {
         int val;
         if (mystrtoi(&p, &val))
-            mp_msg(MSGT_ASS, MSGL_V, "stub: \\yshad%d\n", val);
+            ass_msg(MSGL_V, "stub: \\yshad%d\n", val);
     } else if (mystrcmp(&p, "fax")) {
         double val;
         if (mystrtod(&p, &val))
@@ -952,7 +952,7 @@ static char *parse_tag(ass_renderer_t *render_priv, char *p, double pwr)
         skip(',');
         res &= mystrtoi(&p, &y1);
         skip(')');
-        mp_msg(MSGT_ASS, MSGL_V, "stub: \\iclip(%d,%d,%d,%d)\n", x0, y0,
+        ass_msg(MSGL_V, "stub: \\iclip(%d,%d,%d,%d)\n", x0, y0,
                x1, y1);
     } else if (mystrcmp(&p, "blur")) {
         double val;
@@ -1024,14 +1024,14 @@ static char *parse_tag(ass_renderer_t *render_priv, char *p, double pwr)
             mystrtoll(&p, &t1);
             skip(',');
             mystrtoll(&p, &t2);
-            mp_msg(MSGT_ASS, MSGL_DBG2,
+            ass_msg(MSGL_DBG2,
                    "movement6: (%f, %f) -> (%f, %f), (%" PRId64 " .. %"
                    PRId64 ")\n", x1, y1, x2, y2, (int64_t) t1,
                    (int64_t) t2);
         } else {
             t1 = 0;
             t2 = render_priv->state.event->Duration;
-            mp_msg(MSGT_ASS, MSGL_DBG2,
+            ass_msg(MSGL_DBG2,
                    "movement: (%f, %f) -> (%f, %f)\n", x1, y1, x2, y2);
         }
         skip(')');
@@ -1112,12 +1112,12 @@ static char *parse_tag(ass_renderer_t *render_priv, char *p, double pwr)
         int val;
         if (mystrtoi(&p, &val) && val) {
             int v = (val - 1) / 3;      // 0, 1 or 2 for vertical alignment
-            mp_msg(MSGT_ASS, MSGL_DBG2, "an %d\n", val);
+            ass_msg(MSGL_DBG2, "an %d\n", val);
             if (v != 0)
                 v = 3 - v;
             val = ((val - 1) % 3) + 1;  // horizontal alignment
             val += v * 4;
-            mp_msg(MSGT_ASS, MSGL_DBG2, "align %d\n", val);
+            ass_msg(MSGL_DBG2, "align %d\n", val);
             render_priv->state.alignment = val;
         } else
             render_priv->state.alignment =
@@ -1136,9 +1136,9 @@ static char *parse_tag(ass_renderer_t *render_priv, char *p, double pwr)
         skip(',');
         mystrtod(&p, &v2);
         skip(')');
-        mp_msg(MSGT_ASS, MSGL_DBG2, "pos(%f, %f)\n", v1, v2);
+        ass_msg(MSGL_DBG2, "pos(%f, %f)\n", v1, v2);
         if (render_priv->state.evt_type == EVENT_POSITIONED) {
-            mp_msg(MSGT_ASS, MSGL_V, "Subtitle has a new \\pos "
+            ass_msg(MSGL_V, "Subtitle has a new \\pos "
                    "after \\move or \\pos, ignoring\n");
         } else {
             render_priv->state.evt_type = EVENT_POSITIONED;
@@ -1191,7 +1191,7 @@ static char *parse_tag(ass_renderer_t *render_priv, char *p, double pwr)
         skip(',');
         mystrtoi(&p, &v2);
         skip(')');
-        mp_msg(MSGT_ASS, MSGL_DBG2, "org(%d, %d)\n", v1, v2);
+        ass_msg(MSGL_DBG2, "org(%d, %d)\n", v1, v2);
         //                              render_priv->state.evt_type = EVENT_POSITIONED;
         if (!render_priv->state.have_origin) {
             render_priv->state.org_x = v1;
@@ -1280,7 +1280,7 @@ static char *parse_tag(ass_renderer_t *render_priv, char *p, double pwr)
         uint32_t val;
         if (!strtocolor(&p, &val))
             val = render_priv->state.style->PrimaryColour;
-        mp_msg(MSGT_ASS, MSGL_DBG2, "color: %X\n", val);
+        ass_msg(MSGL_DBG2, "color: %X\n", val);
         change_color(&render_priv->state.c[0], val, pwr);
     } else if ((*p >= '1') && (*p <= '4') && (++p)
                && (mystrcmp(&p, "c") || mystrcmp(&p, "a"))) {
@@ -1315,10 +1315,10 @@ static char *parse_tag(ass_renderer_t *render_priv, char *p, double pwr)
             change_alpha(render_priv->state.c + cidx, val >> 24, pwr);
             break;
         default:
-            mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_BadCommand, n, cmd);
+            ass_msg(MSGL_WARN, MSGTR_LIBASS_BadCommand, n, cmd);
             break;
         }
-        mp_msg(MSGT_ASS, MSGL_DBG2, "single c/a at %f: %c%c = %X   \n",
+        ass_msg(MSGL_DBG2, "single c/a at %f: %c%c = %X   \n",
                pwr, n, cmd, render_priv->state.c[cidx]);
     } else if (mystrcmp(&p, "r")) {
         reset_render_context(render_priv);
@@ -1415,7 +1415,7 @@ static unsigned get_next_char(ass_renderer_t *render_priv, char **str)
                 } else
                     break;
             } else if (*p != '\\')
-                mp_msg(MSGT_ASS, MSGL_V, "Unable to parse: \"%s\" \n", p);
+                ass_msg(MSGL_V, "Unable to parse: \"%s\" \n", p);
             if (*p == 0)
                 break;
         }
@@ -1461,7 +1461,7 @@ apply_transition_effects(ass_renderer_t *render_priv, ass_event_t *event)
     if (strncmp(event->Effect, "Banner;", 7) == 0) {
         int delay;
         if (cnt < 1) {
-            mp_msg(MSGT_ASS, MSGL_V, "Error parsing effect: %s \n",
+            ass_msg(MSGL_V, "Error parsing effect: %s \n",
                    event->Effect);
             return;
         }
@@ -1484,7 +1484,7 @@ apply_transition_effects(ass_renderer_t *render_priv, ass_event_t *event)
     } else if (strncmp(event->Effect, "Scroll down;", 12) == 0) {
         render_priv->state.scroll_direction = SCROLL_TB;
     } else {
-        mp_msg(MSGT_ASS, MSGL_V, "Unknown transition effect: %s \n",
+        ass_msg(MSGL_V, "Unknown transition effect: %s \n",
                event->Effect);
         return;
     }
@@ -1493,7 +1493,7 @@ apply_transition_effects(ass_renderer_t *render_priv, ass_event_t *event)
         int delay;
         int y0, y1;
         if (cnt < 3) {
-            mp_msg(MSGT_ASS, MSGL_V, "Error parsing effect: %s \n",
+            ass_msg(MSGL_V, "Error parsing effect: %s \n",
                    event->Effect);
             return;
         }
@@ -1731,7 +1731,7 @@ get_outline_glyph(ass_renderer_t *render_priv, int symbol,
                 FT_Glyph_StrokeBorder(&(info->outline_glyph),
                                       render_priv->state.stroker, 0, 1);
             if (error) {
-                mp_msg(MSGT_ASS, MSGL_WARN,
+                ass_msg(MSGL_WARN,
                        MSGTR_LIBASS_FT_Glyph_Stroke_Error, error);
             }
         }
@@ -1881,7 +1881,7 @@ wrap_lines_smart(ass_renderer_t *render_priv, double max_text_width)
         if (cur->symbol == '\n') {
             break_type = 2;
             break_at = i;
-            mp_msg(MSGT_ASS, MSGL_DBG2, "forced line break at %d\n",
+            ass_msg(MSGL_DBG2, "forced line break at %d\n",
                    break_at);
         }
 
@@ -1893,8 +1893,8 @@ wrap_lines_smart(ass_renderer_t *render_priv, double max_text_width)
                 break_at = i - 1;
             if (break_at == -1)
                 break_at = 0;
-            mp_msg(MSGT_ASS, MSGL_DBG2, "overfill at %d\n", i);
-            mp_msg(MSGT_ASS, MSGL_DBG2, "line break at %d\n", break_at);
+            ass_msg(MSGL_DBG2, "overfill at %d\n", i);
+            ass_msg(MSGL_DBG2, "line break at %d\n", break_at);
         }
 
         if (break_at != -1) {
@@ -1993,7 +1993,7 @@ wrap_lines_smart(ass_renderer_t *render_priv, double max_text_width)
             cur_line++;
             pen_shift_x = d6_to_double(-cur->pos.x);
             pen_shift_y += height + render_priv->settings.line_spacing;
-            mp_msg(MSGT_ASS, MSGL_DBG2,
+            ass_msg(MSGL_DBG2,
                    "shifting from %d to %d by (%f, %f)\n", i,
                    text_info->length - 1, pen_shift_x, pen_shift_y);
         }
@@ -2058,7 +2058,7 @@ static void process_karaoke_effects(ass_renderer_t *render_priv)
                     dt /= (tm_end - tm_start);
                     x = x_start + (x_end - x_start) * dt;
                 } else {
-                    mp_msg(MSGT_ASS, MSGL_ERR,
+                    ass_msg(MSGL_ERR,
                            MSGTR_LIBASS_UnknownEffectType_InternalError);
                     continue;
                 }
@@ -2207,11 +2207,11 @@ ass_render_event(ass_renderer_t *render_priv, ass_event_t *event,
     text_info_t *text_info = &render_priv->text_info;
 
     if (event->Style >= render_priv->track->n_styles) {
-        mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_NoStyleFound);
+        ass_msg(MSGL_WARN, MSGTR_LIBASS_NoStyleFound);
         return 1;
     }
     if (!event->Text) {
-        mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_EmptyEvent);
+        ass_msg(MSGL_WARN, MSGTR_LIBASS_EmptyEvent);
         return 1;
     }
 
@@ -2465,7 +2465,7 @@ ass_render_event(ass_renderer_t *render_priv, ass_event_t *event,
         } else {                // subtitle
             double scr_y;
             if (valign != VALIGN_SUB)
-                mp_msg(MSGT_ASS, MSGL_V,
+                ass_msg(MSGL_V,
                        "Invalid valign, supposing 0 (subtitle)\n");
             scr_y =
                 y2scr_sub(render_priv,
@@ -2491,7 +2491,7 @@ ass_render_event(ass_renderer_t *render_priv, ass_event_t *event,
     if (render_priv->state.evt_type == EVENT_POSITIONED) {
         double base_x = 0;
         double base_y = 0;
-        mp_msg(MSGT_ASS, MSGL_DBG2, "positioned event at %f, %f\n",
+        ass_msg(MSGL_DBG2, "positioned event at %f, %f\n",
                render_priv->state.pos_x, render_priv->state.pos_y);
         get_base_point(&bbox, alignment, &base_x, &base_y);
         device_x =
@@ -2865,7 +2865,7 @@ fix_collisions(ass_renderer_t *render_priv, event_images_t *imgs, int cnt)
             s.a = priv->top;
             s.b = priv->top + priv->height;
             if (priv->height != imgs[i].height) {       // no, it's not
-                mp_msg(MSGT_ASS, MSGL_WARN,
+                ass_msg(MSGL_WARN,
                        MSGTR_LIBASS_EventHeightHasChanged);
                 priv->top = 0;
                 priv->height = 0;