summaryrefslogtreecommitdiffstats
path: root/input/input.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-09-27 15:47:49 +0200
committerwm4 <wm4@nowhere>2014-09-27 16:01:55 +0200
commitb4d149433651bf45de89a44d621e6985235b090f (patch)
treeb9a3ae74a949a4dc4105acac3323bdf92f30c198 /input/input.h
parentacf6aef882eae08d87e353e7c6b33a179f4dea78 (diff)
downloadmpv-b4d149433651bf45de89a44d621e6985235b090f.tar.bz2
mpv-b4d149433651bf45de89a44d621e6985235b090f.tar.xz
input: separate creation and loading of config
Until now, creating the input_ctx was delayed until the command line and config files were parsed. Separate creation and loading so that input_ctx is available from start. This should make it possible to simplify some things. For example, some complications with Cocoa were apparently only because input_ctx was available only "later". (Although I'm not sure if this is still relevant, or if the Cocoa code should even be organized this way.)
Diffstat (limited to 'input/input.h')
-rw-r--r--input/input.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/input/input.h b/input/input.h
index c37a55da1c..9a6596d3d2 100644
--- a/input/input.h
+++ b/input/input.h
@@ -221,6 +221,9 @@ bool mp_input_test_dragging(struct input_ctx *ictx, int x, int y);
struct mpv_global;
struct input_ctx *mp_input_init(struct mpv_global *global);
+// Load config, options, and devices.
+void mp_input_load(struct input_ctx *ictx);
+
void mp_input_uninit(struct input_ctx *ictx);
// Sleep for the given amount of seconds, until mp_input_wakeup() is called,