diff options
| -rw-r--r-- | Gui/interface.c | 21 | ||||
| -rw-r--r-- | Gui/interface.h | 1 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | mp_msg.c | 23 |
4 files changed, 26 insertions, 22 deletions
diff --git a/Gui/interface.c b/Gui/interface.c index 555b02b850..58e85c4687 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -1292,3 +1292,24 @@ int import_playtree_playlist_into_gui(play_tree_t* my_playtree, m_config_t* conf return result; } + +// wrapper function for mp_msg to display a message box for errors and warnings. + +void guiMessageBox(int level, char * str) { + switch(level) { + case MSGL_FATAL: + gtkMessageBox(GTK_MB_FATAL|GTK_MB_SIMPLE, str); + break; + case MSGL_ERR: + gtkMessageBox(GTK_MB_ERROR|GTK_MB_SIMPLE, str); + 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, str); + break; +#endif + } +} diff --git a/Gui/interface.h b/Gui/interface.h index d9410c90cd..d3c3d2d313 100644 --- a/Gui/interface.h +++ b/Gui/interface.h @@ -150,6 +150,7 @@ extern int guiGetEvent( int type,char * arg ); extern void guiEventHandling( void ); extern void guiLoadFont( void ); extern void guiLoadSubtitle( char * name ); +extern void guiMessageBox(int level, char * str); typedef struct _plItem { @@ -6952,7 +6952,7 @@ AWK = $_awk 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_ALTIVEC = $_altivec TARGET_VIS = $_vis # --- GUI stuff --- +GTKINC = $_inc_gtk GTKLIB = $_ld_static $_ld_gtk GLIBLIB = $_ld_static $_ld_glib GTK_LIBS = $_ld_static $_ld_gui @@ -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 @@ void mp_msg_c( int x, const char *format, ... ){ #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 |