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 /mp_core.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 'mp_core.h')
-rw-r--r-- | mp_core.h | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -117,14 +117,14 @@ extern float playback_speed; extern int forced_subs_only; -int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data); -void uninit_player(unsigned int mask); -void reinit_audio_chain(void); -void init_vo_spudec(void); +int build_afilter_chain(struct MPContext *mpctx, sh_audio_t *sh_audio, ao_data_t *ao_data); +void uninit_player(struct MPContext *mpctx, unsigned int mask); +void reinit_audio_chain(struct MPContext *mpctx); +void init_vo_spudec(struct MPContext *mpctx); double playing_audio_pts(sh_audio_t *sh_audio, demux_stream_t *d_audio, const ao_functions_t *audio_out); -void exit_player_with_rc(const char* how, int rc); -void add_subtitles(char *filename, float fps, int noerr); -int reinit_video_chain(void); +void exit_player_with_rc(struct MPContext *mpctx, const char* how, int rc); +void add_subtitles(struct MPContext *mpctx, char *filename, float fps, int noerr); +int reinit_video_chain(struct MPContext *mpctx); #endif /* MPLAYER_MP_CORE_H */ |