Rename mp_msg to ass_msg

1 files changed, 21 insertions, 21 deletions

diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
index 54479cf..4fb2155 100644
--- a/libass/ass_fontconfig.c
+++ b/libass/ass_fontconfig.c
@@ -193,7 +193,7 @@ static char *_select_font(fc_instance_t *priv, const char *family,
     if (!treat_family_as_pattern &&
         !(r_family && strcasecmp((const char *) r_family, family) == 0) &&
         !(r_fullname && strcasecmp((const char *) r_fullname, family) == 0))
-        mp_msg(MSGT_ASS, MSGL_WARN,
+        ass_msg(MSGL_WARN,
                MSGTR_LIBASS_SelectedFontFamilyIsNotTheRequestedOne,
                (const char *) (r_fullname ? r_fullname : r_family), family);
 
@@ -213,7 +213,7 @@ static char *_select_font(fc_instance_t *priv, const char *family,
     if (result != FcResultMatch)
         r_embolden = 0;
 
-    mp_msg(MSGT_ASS, MSGL_V,
+    ass_msg(MSGL_V,
            "[ass] Font info: family '%s', style '%s', fullname '%s',"
            " slant %d, weight %d%s\n", (const char *) r_family,
            (const char *) r_style, (const char *) r_fullname, r_slant,
@@ -258,23 +258,23 @@ char *fontconfig_select(fc_instance_t *priv, const char *family,
             _select_font(priv, priv->family_default, 0, bold, italic, index,
                          code);
         if (res)
-            mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingDefaultFontFamily,
+            ass_msg(MSGL_WARN, MSGTR_LIBASS_UsingDefaultFontFamily,
                    family, bold, italic, res, *index);
     }
     if (!res && priv->path_default) {
         res = priv->path_default;
         *index = priv->index_default;
-        mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingDefaultFont,
+        ass_msg(MSGL_WARN, MSGTR_LIBASS_UsingDefaultFont,
                family, bold, italic, res, *index);
     }
     if (!res) {
         res = _select_font(priv, "Arial", 0, bold, italic, index, code);
         if (res)
-            mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_UsingArialFontFamily,
+            ass_msg(MSGL_WARN, MSGTR_LIBASS_UsingArialFontFamily,
                    family, bold, italic, res, *index);
     }
     if (res)
-        mp_msg(MSGT_ASS, MSGL_V,
+        ass_msg(MSGL_V,
                "fontconfig_select: (%s, %d, %d) -> %s, %d\n", family, bold,
                italic, res, *index);
     return res;
@@ -350,11 +350,11 @@ static void process_fontdata(fc_instance_t *priv, ass_library_t *library,
         res = mkdir(fonts_dir);
 #endif
         if (res) {
-            mp_msg(MSGT_ASS, MSGL_WARN,
+            ass_msg(MSGL_WARN,
                    MSGTR_LIBASS_FailedToCreateDirectory, fonts_dir);
         }
     } else if (!S_ISDIR(st.st_mode)) {
-        mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_NotADirectory, fonts_dir);
+        ass_msg(MSGL_WARN, MSGTR_LIBASS_NotADirectory, fonts_dir);
     }
 
     fname = validate_fname((char *) name);
@@ -380,7 +380,7 @@ static void process_fontdata(fc_instance_t *priv, ass_library_t *library,
         rc = FT_New_Memory_Face(ftlibrary, (unsigned char *) data,
                                 data_size, face_index, &face);
         if (rc) {
-            mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_ErrorOpeningMemoryFont,
+            ass_msg(MSGL_WARN, MSGTR_LIBASS_ErrorOpeningMemoryFont,
                    name);
             return;
         }
@@ -390,7 +390,7 @@ static void process_fontdata(fc_instance_t *priv, ass_library_t *library,
             FcFreeTypeQueryFace(face, (unsigned char *) name, 0,
                                 FcConfigGetBlanks(priv->config));
         if (!pattern) {
-            mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed,
+            ass_msg(MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed,
                    "FcFreeTypeQueryFace");
             FT_Done_Face(face);
             return;
@@ -398,7 +398,7 @@ static void process_fontdata(fc_instance_t *priv, ass_library_t *library,
 
         fset = FcConfigGetFonts(priv->config, FcSetSystem);     // somehow it failes when asked for FcSetApplication
         if (!fset) {
-            mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed,
+            ass_msg(MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed,
                    "FcConfigGetFonts");
             FT_Done_Face(face);
             return;
@@ -406,7 +406,7 @@ static void process_fontdata(fc_instance_t *priv, ass_library_t *library,
 
         res = FcFontSetAdd(fset, pattern);
         if (!res) {
-            mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed,
+            ass_msg(MSGL_WARN, MSGTR_LIBASS_FunctionCallFailed,
                    "FcFontSetAdd");
             FT_Done_Face(face);
             return;
@@ -435,7 +435,7 @@ fc_instance_t *fontconfig_init(ass_library_t *library,
     int i;
 
     if (!fc) {
-        mp_msg(MSGT_ASS, MSGL_WARN,
+        ass_msg(MSGL_WARN,
                MSGTR_LIBASS_FontconfigDisabledDefaultFontWillBeUsed);
         goto exit;
     }
@@ -453,7 +453,7 @@ fc_instance_t *fontconfig_init(ass_library_t *library,
     }
 
     if (!rc || !priv->config) {
-        mp_msg(MSGT_ASS, MSGL_FATAL,
+        ass_msg(MSGL_FATAL,
                MSGTR_LIBASS_FcInitLoadConfigAndFontsFailed);
         goto exit;
     }
@@ -463,9 +463,9 @@ fc_instance_t *fontconfig_init(ass_library_t *library,
 
     if (dir) {
         if (FcDirCacheValid((const FcChar8 *) dir) == FcFalse) {
-            mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_UpdatingFontCache);
+            ass_msg(MSGL_INFO, MSGTR_LIBASS_UpdatingFontCache);
             if (FcGetVersion() >= 20390 && FcGetVersion() < 20400)
-                mp_msg(MSGT_ASS, MSGL_WARN,
+                ass_msg(MSGL_WARN,
                        MSGTR_LIBASS_BetaVersionsOfFontconfigAreNotSupported);
             // FontConfig >= 2.4.0 updates cache automatically in FcConfigAppFontAddDir()
             if (FcGetVersion() < 20390) {
@@ -475,7 +475,7 @@ fc_instance_t *fontconfig_init(ass_library_t *library,
                 fss = FcStrSetCreate();
                 rc = FcStrSetAdd(fss, (const FcChar8 *) dir);
                 if (!rc) {
-                    mp_msg(MSGT_ASS, MSGL_WARN,
+                    ass_msg(MSGL_WARN,
                            MSGTR_LIBASS_FcStrSetAddFailed);
                     goto ErrorFontCache;
                 }
@@ -484,14 +484,14 @@ fc_instance_t *fontconfig_init(ass_library_t *library,
                                FcConfigGetBlanks(priv->config),
                                (const FcChar8 *) dir, FcFalse);
                 if (!rc) {
-                    mp_msg(MSGT_ASS, MSGL_WARN,
+                    ass_msg(MSGL_WARN,
                            MSGTR_LIBASS_FcDirScanFailed);
                     goto ErrorFontCache;
                 }
 
                 rc = FcDirSave(fcs, fss, (const FcChar8 *) dir);
                 if (!rc) {
-                    mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FcDirSave);
+                    ass_msg(MSGL_WARN, MSGTR_LIBASS_FcDirSave);
                     goto ErrorFontCache;
                 }
               ErrorFontCache:
@@ -501,7 +501,7 @@ fc_instance_t *fontconfig_init(ass_library_t *library,
 
         rc = FcConfigAppFontAddDir(priv->config, (const FcChar8 *) dir);
         if (!rc) {
-            mp_msg(MSGT_ASS, MSGL_WARN,
+            ass_msg(MSGL_WARN,
                    MSGTR_LIBASS_FcConfigAppFontAddDirFailed);
         }
     }
@@ -530,7 +530,7 @@ fc_instance_t *fontconfig_init(ass_library_t *library,
 {
     fc_instance_t *priv;
 
-    mp_msg(MSGT_ASS, MSGL_WARN,
+    ass_msg(MSGL_WARN,
            MSGTR_LIBASS_FontconfigDisabledDefaultFontWillBeUsed);
 
     priv = calloc(1, sizeof(fc_instance_t));