From 81b2c557d3adeaaee70fa5f1ff040cb9a9695920 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 18 Jul 2016 13:58:46 +0200 Subject: m + do state merge in servers/crtc.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/servers/crtc.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/servers/crtc.h') diff --git a/src/servers/crtc.h b/src/servers/crtc.h index 4c96045..1670ee2 100644 --- a/src/servers/crtc.h +++ b/src/servers/crtc.h @@ -19,6 +19,8 @@ #define SERVERS_CRTC_H +#include "../types/output.h" + #include @@ -62,6 +64,15 @@ char* get_crtc_name(const libgamma_crtc_information_t* restrict info, */ int initialise_crtcs(void); +/** + * Merge the new state with an old state + * + * @param old_outputs The old `outputs` + * @param old_outputs_n The old `outputs_n` + * @return Zero on success, -1 on error + */ +int merge_state(struct output* restrict old_outputs, size_t old_outputs_n); + #endif -- cgit v1.2.3-70-g09d2