summaryrefslogtreecommitdiffstats
path: root/mp_msg.c
diff options
context:
space:
mode:
Diffstat (limited to 'mp_msg.c')
-rw-r--r--mp_msg.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/mp_msg.c b/mp_msg.c
index b20d99ee6f..7314dd25af 100644
--- a/mp_msg.c
+++ b/mp_msg.c
@@ -18,13 +18,6 @@
char* get_term_charset(void);
#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 */
@@ -172,24 +165,17 @@ static void print_msg_module(FILE* stream, int mod)
fprintf(stream, ": ");
}
-void mp_msg(int mod, int lev, const char *format, ... ){
- va_list va;
+void mp_msg_va(int mod, int lev, const char *format, va_list va)
+{
char tmp[MSGSIZE_MAX];
FILE *stream = lev <= MSGL_WARN ? stderr : stdout;
static int header = 1;
if (!mp_msg_test(mod, lev)) return; // do not display
- va_start(va, format);
vsnprintf(tmp, MSGSIZE_MAX, format, va);
- va_end(va);
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];
@@ -229,3 +215,17 @@ void mp_msg(int mod, int lev, const char *format, ... ){
fprintf(stream, "%s", tmp);
fflush(stream);
}
+
+void mp_msg(int mod, int lev, const char *format, ...)
+{
+ va_list va;
+ va_start(va, format);
+ mp_msg_va(mod, lev, format, va);
+ va_end(va);
+}
+
+
+char *mp_gtext(const char *string)
+{
+ return string;
+}