diff options
| author | wm4 <wm4@nowhere> | 2012-08-04 03:46:11 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-04 19:59:56 +0200 |
| commit | 9a2f4e10e71aa1c0c2970f807fe14000861b602b (patch) | |
| tree | 35785a60a5befd494de2a790b44d35d9bfa3a044 /parser-cfg.c | |
| parent | c7be71ae710280f750c14973e303ec3550e94ec3 (diff) | |
| download | mpv-9a2f4e10e71aa1c0c2970f807fe14000861b602b.tar.bz2 mpv-9a2f4e10e71aa1c0c2970f807fe14000861b602b.tar.xz | |
mplayer: never exit mplayer from within the play loop
The only place exit_player() should be called is the main() function.
exit_player() should be the only function allowed to call exit(). This
makes it easier to guarantee proper deinitialization, and allows using
the --leak-report flag without showing false positives.
The quit slave command now sets a flag only. It uses the same mechanism
that's normally used to advance to the next file on the playlist, so the
rest of the playback path should be able to react to the quit command
quickly enough. That is, the player should react just as fast to quit
requests in practice as before this commit.
In reinit_audio_chain(), the player was actually exited if
init_audio_filters() failed. Reuse the normal error handling path to
handle this condition.
Diffstat (limited to 'parser-cfg.c')
| -rw-r--r-- | parser-cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/parser-cfg.c b/parser-cfg.c index f6a4c67d3a..91ef37be53 100644 --- a/parser-cfg.c +++ b/parser-cfg.c @@ -41,7 +41,7 @@ static int recursion_depth = 0; /// Setup the \ref Config from a config file. /** \param config The config object. * \param conffile Path to the config file. - * \return 1 on sucess, -1 on error. + * \return 1 on sucess, -1 on error, 0 if file not accessible. */ int m_config_parse_config_file(m_config_t *config, const char *conffile) { |