diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-21 06:07:22 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:48:33 +0300 |
commit | c1f9fe7d673ab7c34232a1fe9312e60f81503ccf (patch) | |
tree | 2bfe895f3b56deede80ca8243bc0ed3c46231cd7 /mplayer.h | |
parent | ef74d21b1f1d96b2e3f180c021998fbdd80ffcba (diff) | |
download | mpv-c1f9fe7d673ab7c34232a1fe9312e60f81503ccf.tar.bz2 mpv-c1f9fe7d673ab7c34232a1fe9312e60f81503ccf.tar.xz |
Remove static mpctx from mplayer.c
Pass it in function calls instead. There's no reasonable way to pass
it to exit_player() when used outside mplayer.c. However most of those
uses seem to be wrong (the code should not make the program exit) and
should be removed. For now just make exit_player() uses outside
mplayer.c simply call exit() without any shutdown code.
Diffstat (limited to 'mplayer.h')
-rw-r--r-- | mplayer.h | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -2,6 +2,8 @@ #ifndef MPLAYER_MPLAYER_H #define MPLAYER_MPLAYER_H +#include "mp_msg.h" + extern char* current_module; extern char * dvd_device; @@ -47,7 +49,15 @@ extern int video_id; extern int dvdsub_id; extern int vobsub_id; -extern void exit_player(const char* how); -extern void update_set_of_subtitles(void); +static inline void exit_player(const char *how) +{ + if (how) + mp_msg(MSGT_CPLAYER, MSGL_INFO, "Deprecated exit call: %s", how); + exit(1); +} + +struct MPContext; + +extern void update_set_of_subtitles(struct MPContext *mpctx); #endif /* MPLAYER_MPLAYER_H */ |