Refactor

Signed-off-by: Mattias Andrée <m@maandree.se>

1 files changed, 9 insertions, 20 deletions

diff --git a/src/gamma-dummy.c b/src/gamma-dummy.c
index abb5d22..1751bbd 100644
--- a/src/gamma-dummy.c
+++ b/src/gamma-dummy.c
@@ -20,42 +20,41 @@
 
 
 static int
-gamma_dummy_init(struct gamma_state **state)
+dummy_create(struct gamma_state **state_out)
 {
-	*state = NULL;
+	*state_out = NULL;
 	return 0;
 }
 
 static int
-gamma_dummy_start(struct gamma_state *state, enum program_mode mode)
+dummy_start(struct gamma_state *state)
 {
 	(void) state;
-	(void) mode;
 	weprintf(_("WARNING: Using dummy gamma method! Display will not be affected by this gamma method.\n"));
 	return 0;
 }
 
 static void
-gamma_dummy_restore(struct gamma_state *state)
+dummy_restore(struct gamma_state *state)
 {
 	(void) state;
 }
 
 static void
-gamma_dummy_free(struct gamma_state *state)
+dummy_free(struct gamma_state *state)
 {
 	(void) state;
 }
 
 static void
-gamma_dummy_print_help(FILE *f)
+dummy_print_help(FILE *f)
 {
 	fputs(_("Does not affect the display but prints the color temperature to the terminal.\n"), f);
 	fputs("\n", f);
 }
 
 static int
-gamma_dummy_set_option(struct gamma_state *state, const char *key, const char *value)
+dummy_set_option(struct gamma_state *state, const char *key, const char *value)
 {
 	(void) state;
 	(void) value;
@@ -64,8 +63,7 @@ gamma_dummy_set_option(struct gamma_state *state, const char *key, const char *v
 }
 
 static int
-gamma_dummy_set_temperature(
-	struct gamma_state *state, const struct colour_setting *setting, int preserve)
+dummy_apply(struct gamma_state *state, const struct colour_setting *setting, int preserve)
 {
 	(void) state;
 	(void) preserve;
@@ -74,13 +72,4 @@ gamma_dummy_set_temperature(
 }
 
 
-const struct gamma_method dummy_gamma_method = {
-	"dummy", 0,
-	&gamma_dummy_init,
-	&gamma_dummy_start,
-	&gamma_dummy_free,
-	&gamma_dummy_print_help,
-	&gamma_dummy_set_option,
-	&gamma_dummy_restore,
-	&gamma_dummy_set_temperature
-};
+const struct gamma_method dummy_gamma_method = GAMMA_METHOD_INIT("dummy", 0, dummy);