From 441dae4a44f60665c9f669a80304b688285c9c22 Mon Sep 17 00:00:00 2001 From: Jon Lund Steffensen Date: Thu, 27 May 2010 02:20:29 +0200 Subject: Split init function of methods and providers into init and start. The set_option function can be called to set options between init and start. --- src/redshift.h | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'src/redshift.h') diff --git a/src/redshift.h b/src/redshift.h index 18b087e..8f488f6 100644 --- a/src/redshift.h +++ b/src/redshift.h @@ -25,35 +25,64 @@ /* Gamma adjustment method */ -typedef int gamma_method_init_func(void *state, char *args); +typedef int gamma_method_init_func(void *state); +typedef int gamma_method_start_func(void *state); typedef void gamma_method_free_func(void *state); typedef void gamma_method_print_help_func(FILE *f); +typedef int gamma_method_set_option_func(void *state, const char *key, + const char *value); typedef void gamma_method_restore_func(void *state); typedef int gamma_method_set_temperature_func(void *state, int temp, float gamma[3]); typedef struct { char *name; + + /* Initialize state. Options can be set between init and start. */ gamma_method_init_func *init; + /* Allocate storage and make connections that depend on options. */ + gamma_method_start_func *start; + /* Free all allocated storage and close connections. */ gamma_method_free_func *free; + + /* Print help on options for this adjustment method. */ gamma_method_print_help_func *print_help; + /* Set an option key, value-pair */ + gamma_method_set_option_func *set_option; + + /* Restore the adjustment to the state before start was called. */ gamma_method_restore_func *restore; + /* Set a specific color temperature. */ gamma_method_set_temperature_func *set_temperature; } gamma_method_t; /* Location provider */ -typedef int location_provider_init_func(void *state, char *args); +typedef int location_provider_init_func(void *state); +typedef int location_provider_start_func(void *state); typedef void location_provider_free_func(void *state); typedef void location_provider_print_help_func(FILE *f); +typedef int location_provider_set_option_func(void *state, const char *key, + const char *value); typedef int location_provider_get_location_func(void *state, float *lat, float *lon); typedef struct { char *name; + + /* Initialize state. Options can be set between init and start. */ location_provider_init_func *init; + /* Allocate storage and make connections that depend on options. */ + location_provider_start_func *start; + /* Free all allocated storage and close connections. */ location_provider_free_func *free; + + /* Print help on options for this location provider. */ location_provider_print_help_func *print_help; + /* Set an option key, value-pair. */ + location_provider_set_option_func *set_option; + + /* Get current location. */ location_provider_get_location_func *get_location; } location_provider_t; -- cgit v1.2.3-70-g09d2