diff options
| author | Mattias Andrée <maandree@kth.se> | 2016-07-18 13:58:46 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2016-07-18 13:58:46 +0200 |
| commit | 81b2c557d3adeaaee70fa5f1ff040cb9a9695920 (patch) | |
| tree | 4e50d7472a29bd6ff6bf61443a6fe5be435ecf7f /src/servers/crtc.h | |
| parent | Use ‘- ’ instead of ‘-#’ (diff) | |
| download | coopgammad-81b2c557d3adeaaee70fa5f1ff040cb9a9695920.tar.gz coopgammad-81b2c557d3adeaaee70fa5f1ff040cb9a9695920.tar.bz2 coopgammad-81b2c557d3adeaaee70fa5f1ff040cb9a9695920.tar.xz | |
m + do state merge in servers/crtc.c
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'src/servers/crtc.h')
| -rw-r--r-- | src/servers/crtc.h | 11 |
1 files changed, 11 insertions, 0 deletions
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 <libgamma.h> @@ -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 |