From 9d5d031b6d23402a465618892a40b7af6d4e3c28 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 3 Oct 2014 19:57:49 +0200 Subject: player: remove central uninit_player() function and flags mess Each subsystem (or similar thing) had an INITIALIZED_ flag assigned. The main use of this was that you could pass a bitmask of these flags to uninit_player(). Except in some situations where you wanted to uninitialize nearly everything, this wasn't really useful. Moreover, it was quite annoying that subsystems had most of the code in a specific file, but the uninit code in loadfile.c (because that's where uninit_player() was implemented). Simplify all this. Remove the flags; e.g. instead of testing for the INITIALIZED_AO flag, test whether mpctx->ao is set. Move uninit code to separate functions, e.g. uninit_audio_out(). --- player/osd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'player/osd.c') diff --git a/player/osd.c b/player/osd.c index 15cceab95f..2d15c9b904 100644 --- a/player/osd.c +++ b/player/osd.c @@ -156,8 +156,7 @@ static void print_status(struct MPContext *mpctx) if (!opts->use_terminal) return; - if (opts->quiet || !(mpctx->initialized_flags & INITIALIZED_PLAYBACK) || - !mpctx->playing_msg_shown) + if (opts->quiet || !mpctx->playback_initialized || !mpctx->playing_msg_shown) { term_osd_set_status(mpctx, ""); return; -- cgit v1.2.3