diff options
| author | wm4 <wm4@nowhere> | 2014-10-03 19:57:49 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-10-03 23:05:09 +0200 |
| commit | 9d5d031b6d23402a465618892a40b7af6d4e3c28 (patch) | |
| tree | 143f43c4b002ec74f7172038e58409723647d892 /player/command.c | |
| parent | 9570976255083c1ec32add62613c52ad98fa28c8 (diff) | |
| download | mpv-9d5d031b6d23402a465618892a40b7af6d4e3c28.tar.bz2 mpv-9d5d031b6d23402a465618892a40b7af6d4e3c28.tar.xz | |
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().
Diffstat (limited to 'player/command.c')
| -rw-r--r-- | player/command.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/player/command.c b/player/command.c index 9818385abc..8d4e3170a9 100644 --- a/player/command.c +++ b/player/command.c @@ -1686,10 +1686,10 @@ static int mp_property_hwdec(void *ctx, struct m_property *prop, int new = *(int *)arg; if (current == new) return M_PROPERTY_OK; - if (!(mpctx->initialized_flags & INITIALIZED_VCODEC)) + if (!mpctx->d_video) return M_PROPERTY_ERROR; double last_pts = mpctx->last_vo_pts; - uninit_player(mpctx, INITIALIZED_VCODEC); + uninit_video_chain(mpctx); opts->hwdec_api = new; reinit_video_chain(mpctx); if (last_pts != MP_NOPTS_VALUE) |