diff options
author | wm4 <wm4@nowhere> | 2012-11-20 17:23:17 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-20 18:00:16 +0100 |
commit | ef75d0ff260fff688c23e72f86d437d8d1e59a58 (patch) | |
tree | f92a5a6076bc5feb1eeca81acc77797c37cd11d5 /core/mp_osd.h | |
parent | 2cdbaaf31c85b27923c1795b5c4e3e576cdb4567 (diff) | |
download | mpv-ef75d0ff260fff688c23e72f86d437d8d1e59a58.tar.bz2 mpv-ef75d0ff260fff688c23e72f86d437d8d1e59a58.tar.xz |
core: minor cleanups
Enable printf format warnings for set_osd_[t]msg.
Remove the pointless assertion in mplayer.c (the assertion proved that
the following NULL check is probably pointless, but leave that check
anyway for robustness - it's not really clear whether it's needed).
Diffstat (limited to 'core/mp_osd.h')
-rw-r--r-- | core/mp_osd.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/mp_osd.h b/core/mp_osd.h index 78957fb3bf..d0ebc02639 100644 --- a/core/mp_osd.h +++ b/core/mp_osd.h @@ -19,6 +19,8 @@ #ifndef MPLAYER_MP_OSD_H #define MPLAYER_MP_OSD_H +#include "compat/compiler.h" + #define OSD_MSG_TEXT 1 #define OSD_MSG_SUB_DELAY 2 #define OSD_MSG_SPEED 3 @@ -38,8 +40,8 @@ struct MPContext; void set_osd_bar(struct MPContext *mpctx, int type,const char* name,double min,double max,double val); -void set_osd_msg(struct MPContext *mpctx, int id, int level, int time, const char* fmt, ...); -void set_osd_tmsg(struct MPContext *mpctx, int id, int level, int time, const char* fmt, ...); +void set_osd_msg(struct MPContext *mpctx, int id, int level, int time, const char* fmt, ...) PRINTF_ATTRIBUTE(5,6); +void set_osd_tmsg(struct MPContext *mpctx, int id, int level, int time, const char* fmt, ...) PRINTF_ATTRIBUTE(5,6); void rm_osd_msg(struct MPContext *mpctx, int id); // osd_function is the symbol appearing in the video status, such as OSD_PLAY |