[MPlayer-cvslog] r31377 - in trunk: Changelog Makefile mp_msg-mencoder.c mp_msg.c stream/cache2.c

[reimar]

Author: reimar
Date: Sun Jun 13 13:17:26 2010
New Revision: 31377

Log:
Remove mp_msg related GUI hacks.

Deleted:
   trunk/mp_msg-mencoder.c
Modified:
   trunk/Changelog
   trunk/Makefile
   trunk/mp_msg.c
   trunk/stream/cache2.c

Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog	Sun Jun 13 12:45:20 2010	(r31376)
+++ trunk/Changelog	Sun Jun 13 13:17:26 2010	(r31377)
@@ -1,6 +1,9 @@
 MPlayer (1.0)
 
   rc4: "Yes We Can"
+    Gui: Changes towards removing the Gui
+    * The Gui will no longer display any error or warning messages
+
     Decoders:
     * YUY2 Lossless Codec (YLC0) via binary DLL
     * Truemotion RT codec (TR20) via binary DLL

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Jun 13 12:45:20 2010	(r31376)
+++ trunk/Makefile	Sun Jun 13 13:17:26 2010	(r31377)
@@ -336,6 +336,7 @@ SRCS_COMMON = asxparser.c \
               m_config.c \
               m_option.c \
               m_struct.c \
+              mp_msg.c \
               mpcommon.c \
               parser-cfg.c \
               path.c \
@@ -668,7 +669,6 @@ SRCS_MPLAYER = command.c \
                m_property.c \
                mixer.c \
                mp_fifo.c \
-               mp_msg.c \
                mplayer.c \
                parser-mpcmd.c \
                input/input.c \
@@ -700,7 +700,6 @@ SRCS_MENCODER-$(X264)             += lib
 SRCS_MENCODER-$(XVID4)            += libmpcodecs/ve_xvid4.c
 
 SRCS_MENCODER = mencoder.c \
-                mp_msg-mencoder.c \
                 parser-mecmd.c \
                 xvid_vbr.c \
                 libmpcodecs/ae.c \
@@ -1000,7 +999,7 @@ tags:
 
 ###### tests / tools #######
 
-TEST_OBJS = mp_msg-mencoder.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm
+TEST_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm
 
 codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS)
 	$(CC) -I. -DTESTING -o $@ $^

Modified: trunk/mp_msg.c
==============================================================================
--- trunk/mp_msg.c	Sun Jun 13 12:45:20 2010	(r31376)
+++ trunk/mp_msg.c	Sun Jun 13 13:17:26 2010	(r31377)
@@ -29,13 +29,6 @@
 #include <errno.h>
 #endif
 
-#if defined(FOR_MENCODER)
-#undef CONFIG_GUI
-int use_gui;
-#else
-#include "gui/interface.h"
-#endif
-
 #include "mp_msg.h"
 
 /* maximum message length of mp_msg */
@@ -196,11 +189,6 @@ void mp_msg(int mod, int lev, const char
     tmp[MSGSIZE_MAX-2] = '\n';
     tmp[MSGSIZE_MAX-1] = 0;
 
-#ifdef CONFIG_GUI
-    if(use_gui)
-        guiMessageBox(lev, tmp);
-#endif
-
 #if defined(CONFIG_ICONV) && defined(MSG_CHARSET)
     if (mp_msg_charset && strcasecmp(mp_msg_charset, "noconv")) {
       char tmp2[MSGSIZE_MAX];

Modified: trunk/stream/cache2.c
==============================================================================
--- trunk/stream/cache2.c	Sun Jun 13 12:45:20 2010	(r31376)
+++ trunk/stream/cache2.c	Sun Jun 13 13:17:26 2010	(r31377)
@@ -64,7 +64,6 @@ static void *ThreadProc(void *s);
 
 #include "stream.h"
 #include "cache2.h"
-extern int use_gui;
 
 typedef struct {
   // constats:
@@ -473,9 +472,6 @@ err_out:
   }
 
 #if FORKED_CACHE
-#ifdef CONFIG_GUI
-  use_gui = 0; // mp_msg may not use gui stuff in forked code
-#endif
   signal(SIGTERM,exit_sighandler); // kill
   cache_mainloop(s);
   // make sure forked code never leaves this function