Merge config-ini.h and options.h into common.h

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

1 files changed, 0 insertions, 63 deletions

diff --git a/src/options.h b/src/options.h
deleted file mode 100644
index 2978672..0000000
--- a/src/options.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* options.h -- Program options header
-   This file is part of Redshift.
-
-   Redshift is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   Redshift is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Redshift.  If not, see <http://www.gnu.org/licenses/>.
-
-   Copyright (c) 2017  Jon Lund Steffensen <jonlst@gmail.com>
-*/
-
-#ifndef REDSHIFT_OPTIONS_H
-#define REDSHIFT_OPTIONS_H
-
-#include "common.h"
-
-struct options {
-	/* Path to config file */
-	char *config_filepath;
-
-	struct transition_scheme scheme;
-	enum program_mode mode;
-	int verbose;
-
-	/* Temperature to set in manual mode. */
-	int temp_set;
-	/* Whether to fade between large skips in color temperature. */
-	int use_fade;
-	/* Whether to preserve gamma ramps if supported by gamma method. */
-	int preserve_gamma;
-
-	/* Selected gamma method. */
-	const struct gamma_method *method;
-	/* Arguments for gamma method. */
-	char *method_args;
-
-	/* Selected location provider. */
-	const struct location_provider *provider;
-	/* Arguments for location provider. */
-	char *provider_args;
-};
-
-
-void options_init(struct options *options);
-void options_parse_args(
-	struct options *options, int argc, char *argv[],
-	const struct gamma_method *gamma_methods,
-	const struct location_provider *location_providers);
-void options_parse_config_file(
-	struct options *options, struct config_ini_state *config_state,
-	const struct gamma_method *gamma_methods,
-	const struct location_provider *location_providers);
-void options_set_defaults(struct options *options);
-
-#endif /* ! REDSHIFT_OPTIONS_H */