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/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'player/main.c') diff --git a/player/main.c b/player/main.c index ff3b8ab7fe..2a05d3b4f4 100644 --- a/player/main.c +++ b/player/main.c @@ -118,8 +118,8 @@ static void shutdown_clients(struct MPContext *mpctx) void mp_destroy(struct MPContext *mpctx) { - if (mpctx->initialized) - uninit_player(mpctx, INITIALIZED_ALL); + uninit_audio_out(mpctx); + uninit_video_out(mpctx); #if HAVE_ENCODING encode_lavc_finish(mpctx->encode_lavc_ctx); @@ -439,7 +439,6 @@ int mp_initialize(struct MPContext *mpctx) return -1; } mpctx->mouse_cursor_visible = true; - mpctx->initialized_flags |= INITIALIZED_VO; } // Lua user scripts (etc.) can call arbitrary functions. Load them at a point -- cgit v1.2.3