[MPlayer-cvslog] r32964 - in trunk: gui/skin/skin.c help/help_mp-cs.h help/help_mp-de.h help/help_mp-dk.h help/help_mp-el.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it.h ...

[ib]

Author: ib
Date: Thu Feb 24 18:47:40 2011
New Revision: 32964

Log:
Change message levels to 'error'.

Because all these messages indicate that an error has occurred and
additionally the processing stops, 'error' is the right message level.

The GUI user will now be informed about these errors.

Furthermore, the message names and texts have been revised.

Modified:
   trunk/gui/skin/skin.c

Changes in other areas also in this revision:
Modified:
   trunk/help/help_mp-cs.h
   trunk/help/help_mp-de.h
   trunk/help/help_mp-dk.h
   trunk/help/help_mp-el.h
   trunk/help/help_mp-en.h
   trunk/help/help_mp-es.h
   trunk/help/help_mp-fr.h
   trunk/help/help_mp-hu.h
   trunk/help/help_mp-it.h
   trunk/help/help_mp-ja.h
   trunk/help/help_mp-ko.h
   trunk/help/help_mp-mk.h
   trunk/help/help_mp-nb.h
   trunk/help/help_mp-nl.h
   trunk/help/help_mp-pt_BR.h
   trunk/help/help_mp-ru.h
   trunk/help/help_mp-sk.h
   trunk/help/help_mp-sv.h
   trunk/help/help_mp-tr.h
   trunk/help/help_mp-uk.h
   trunk/help/help_mp-zh_CN.h
   trunk/help/help_mp-zh_TW.h

Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c	Thu Feb 24 16:28:37 2011	(r32963)
+++ trunk/gui/skin/skin.c	Thu Feb 24 18:47:40 2011	(r32964)
@@ -55,7 +55,7 @@ static void ERRORMESSAGE(const char *for
     vsnprintf(p, sizeof(p), format, ap);
     va_end(ap);
 
-    mp_msg(MSGT_GPLAYER, MSGL_STATUS, MSGTR_SKIN_ERRORMESSAGE, linenumber, p);
+    mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_ERRORMESSAGE, linenumber, p);
     snprintf(tmp, sizeof(tmp), MSGTR_SKIN_ERRORMESSAGE, linenumber, p);
     gtkMessageBox(GTK_MB_FATAL, tmp);
 }
@@ -64,7 +64,7 @@ static void ERRORMESSAGE(const char *for
     { \
         if (defList == NULL) \
         { \
-            mp_msg(MSGT_GPLAYER, MSGL_STATUS, MSGTR_SKIN_WARNING1, linenumber, str); \
+            ERRORMESSAGE(MSGTR_SKIN_ERROR_SECTION, str); \
             return 1; \
         } \
     }
@@ -73,7 +73,7 @@ static void ERRORMESSAGE(const char *for
     { \
         if (!window_name[0]) \
         { \
-            mp_msg(MSGT_GPLAYER, MSGL_STATUS, MSGTR_SKIN_WARNING2, linenumber, str); \
+            ERRORMESSAGE(MSGTR_SKIN_ERROR_WINDOW, str); \
             return 1; \
         } \
     }
@@ -82,7 +82,7 @@ static void ERRORMESSAGE(const char *for
     { \
         if (!strcmp(window_name, name)) \
         { \
-            mp_msg(MSGT_GPLAYER, MSGL_STATUS, MSGTR_SKIN_WARNING3, linenumber, name); \
+            ERRORMESSAGE(MSGTR_SKIN_ERROR_IN_WINDOW, name); \
             return 1; \
         } \
     }
@@ -875,7 +875,7 @@ int skinRead(char *dname)
         fn = setname(skinMPlayerDir, dname);
 
         if ((skinFile = fopen(fn, "rt")) == NULL) {
-            mp_msg(MSGT_GPLAYER, MSGL_STATUS, MSGTR_SKIN_SkinFileNotFound, fn);
+            mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_SkinFileNotFound, fn);
             return -1;
         }
     }
@@ -911,7 +911,7 @@ int skinRead(char *dname)
     }
 
     if (linenumber == 0) {
-        mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SkinFileNotReadable, fn);
+        mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_SKIN_SkinFileNotReadable, fn);
         return -1;
     }