From 7eca787571aab982acaadee79abb0f40f9f14b6a Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 27 Jun 2017 13:47:46 +0200 Subject: build: change how some OS specific source files are selected In a bunch of cases, we emulate highly platform specific APIs on a higher level across all OSes, such as IPC, terminal, subprocess handling, and more. We have source files for each OS, and they implement all the same mpv internal API. Selecting which source file to use on an OS can be tricky, because there is partially overlapping and emulated APIs (consider Cygwin on Windows). Add a pick_first_matching_dep() function to make this slightly easier and more structured. Also add dummy backends in some cases, to deal with APIs not being available. Clarify the Windows dependency identifiers, as these are the most confusing. --- input/input.c | 2 +- input/input.h | 2 ++ input/ipc-dummy.c | 13 +++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 input/ipc-dummy.c (limited to 'input') diff --git a/input/input.c b/input/input.c index ee58709017..4a20ab1311 100644 --- a/input/input.c +++ b/input/input.c @@ -1392,7 +1392,7 @@ void mp_input_load_config(struct input_ctx *ictx) talloc_free(tmp); } -#if defined(__MINGW32__) +#if HAVE_WIN32_PIPES if (ictx->global->opts->input_file && *ictx->global->opts->input_file) mp_input_pipe_add(ictx, ictx->global->opts->input_file); #endif diff --git a/input/input.h b/input/input.h index ea8460889c..00f5473f7b 100644 --- a/input/input.h +++ b/input/input.h @@ -259,6 +259,8 @@ void mp_input_pipe_add(struct input_ctx *ictx, const char *filename); struct mp_ipc_ctx; struct mp_client_api; + +// Platform specific implementation, provided by ipc-*.c. struct mp_ipc_ctx *mp_init_ipc(struct mp_client_api *client_api, struct mpv_global *global); void mp_uninit_ipc(struct mp_ipc_ctx *ctx); diff --git a/input/ipc-dummy.c b/input/ipc-dummy.c new file mode 100644 index 0000000000..d9c31c046c --- /dev/null +++ b/input/ipc-dummy.c @@ -0,0 +1,13 @@ +#include + +#include "input/input.h" + +struct mp_ipc_ctx *mp_init_ipc(struct mp_client_api *client_api, + struct mpv_global *global) +{ + return NULL; +} + +void mp_uninit_ipc(struct mp_ipc_ctx *ctx) +{ +} -- cgit v1.2.3