[MPlayer-cvslog] CVS: main configure, 1.1049, 1.1050 mp_msg.c, 1.25, 1.26

[Oded Shimon CVS]

CVS change done by Oded Shimon CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv22174

Modified Files:
	configure mp_msg.c 
Log Message:
Remove many annoying GTK includes in every compile line and remove GTK 
stuff from mp_msg by using a wrapper function.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1049
retrieving revision 1.1050
diff -u -r1.1049 -r1.1050
--- configure	3 Sep 2005 08:53:48 -0000	1.1049
+++ configure	3 Sep 2005 15:19:52 -0000	1.1050
@@ -6952,7 +6952,7 @@
 RANLIB = $_ranlib
 INSTALL = $_install
 # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu $_pipe -fomit-frame-pointer -ffast-math
-EXTRA_INC = $_inc_extra $_inc_gtk
+EXTRA_INC = $_inc_extra
 OPTFLAGS = -I../libvo -I../../libvo $_inc_x11 $CFLAGS \$(EXTRA_INC)
 STRIPBINARIES = $_stripbinaries
 CHARSET = $_charset
@@ -7129,6 +7129,7 @@
 TARGET_VIS = $_vis
 
 # --- GUI stuff ---
+GTKINC = $_inc_gtk
 GTKLIB = $_ld_static $_ld_gtk
 GLIBLIB = $_ld_static  $_ld_glib
 GTK_LIBS =  $_ld_static $_ld_gui

Index: mp_msg.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp_msg.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mp_msg.c	20 Jan 2005 13:22:52 -0000	1.25
+++ mp_msg.c	3 Sep 2005 15:19:52 -0000	1.26
@@ -16,8 +16,7 @@
 #endif
 
 #if ENABLE_GUI_CODE
-#include "Gui/mplayer/widgets.h"
-extern void gtkMessageBox( int type,char * str );
+#include "Gui/interface.h"
 extern int use_gui;
 #endif
 #include "mp_msg.h"
@@ -72,25 +71,7 @@
 
 #if ENABLE_GUI_CODE
     if(use_gui)
-    {
-	switch(x & 255)
-	{
-	    case MSGL_FATAL:
-		gtkMessageBox(GTK_MB_FATAL|GTK_MB_SIMPLE, tmp);
-		break;
-	    case MSGL_ERR:
-		gtkMessageBox(GTK_MB_ERROR|GTK_MB_SIMPLE, tmp);
-		break;
-#if 0
-// WARNING! Do NOT enable this! There are too many non-critical messages with
-// MSGL_WARN, for example: broken SPU packets, codec's bit error messages,
-// etc etc, they should not raise up a new window every time.
-	    case MSGL_WARN:
-		gtkMessageBox(GTK_MB_WARNING|GTK_MB_SIMPLE, tmp);
-		break;
-#endif
-	}
-    }
+        guiMessageBox(x&255, tmp);
 #endif
 
 #ifdef MSG_USE_COLORS