summaryrefslogtreecommitdiffstats
path: root/player/core.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-05 11:17:22 +0100
committerwm4 <wm4@nowhere>2015-03-05 11:22:15 +0100
commit2e266391559c2aa867c24593325f07effba97c64 (patch)
treeb92fa5c05190a538fd04b5a0ecc32168795847c5 /player/core.h
parentdcabceb6268d64a16c370504de265d0dcc657301 (diff)
downloadmpv-2e266391559c2aa867c24593325f07effba97c64.tar.bz2
mpv-2e266391559c2aa867c24593325f07effba97c64.tar.xz
player, client API: refactor cplayer init, reduce client API differences
Move the command line parsing and some other things to the common init routine shared between command line player and client API. This means they're using almost exactly the same code now. The main intended side effect is that the client API will load mpv.conf; though still only if config loading is enabled. (The cplayer still avoids creating an extra thread, passes a command line, and prints an exit status to the terminal. It also has some different defaults.)
Diffstat (limited to 'player/core.h')
-rw-r--r--player/core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/core.h b/player/core.h
index 7a65270abc..c995c8ab19 100644
--- a/player/core.h
+++ b/player/core.h
@@ -404,7 +404,7 @@ struct track *select_track(struct MPContext *mpctx, enum stream_type type,
// main.c
int mpv_main(int argc, char *argv[]);
-int mp_initialize(struct MPContext *mpctx);
+int mp_initialize(struct MPContext *mpctx, char **argv);
struct MPContext *mp_create(void);
void mp_destroy(struct MPContext *mpctx);
void mp_print_version(struct mp_log *log, int always);