diff --git a/src/options.h b/src/options.h
index 6acf88b0902ccc03a9754d33fdab619abb61be5e..98ad3156ecbfd91482667d63e10e8c7c7af9c927 100644 (file)
--- a/src/options.h
+++ b/src/options.h
+#ifndef OPTIONS_H
+#define OPTIONS_H
+
+#include "config.h"
+
+#include <stdbool.h>
#define MPD_HOST_ENV "MPD_HOST"
#define MPD_PORT_ENV "MPD_PORT"
-typedef struct
-{
- char *host;
- char *username;
- char *password;
- char *config_file;
- char *key_file;
- char *list_format;
- char *status_format;
- char *xterm_title_format;
- char **screen_list;
- int port;
- int crossfade_time;
- int search_mode;
- int hide_cursor;
- int seek_time;
- gboolean reconnect;
- gboolean debug;
- gboolean find_wrap;
- gboolean list_wrap;
- gboolean auto_center;
- gboolean wide_cursor;
- gboolean enable_colors;
- gboolean audible_bell;
- gboolean visible_bell;
- gboolean enable_xterm_title;
- gboolean enable_mouse;
-
+typedef struct {
+ char *host;
+ char *username;
+ char *password;
+ char *config_file;
+ char *key_file;
+ char *list_format;
+ char *status_format;
+#ifndef NCMPC_MINI
+ char *xterm_title_format;
+ char *scroll_sep;
+#endif
+ char **screen_list;
+ char *timedisplay_type;
+ int port;
+ int crossfade_time;
+ int search_mode;
+ int hide_cursor;
+ int seek_time;
+#ifdef ENABLE_LYRICS_SCREEN
+ int lyrics_timeout;
+#endif
+ bool find_wrap;
+ bool find_show_last_pattern;
+ bool list_wrap;
+ bool auto_center;
+ bool wide_cursor;
+#ifdef ENABLE_COLORS
+ bool enable_colors;
+#endif
+ bool audible_bell;
+ bool visible_bell;
+#ifndef NCMPC_MINI
+ bool enable_xterm_title;
+#endif
+#ifdef HAVE_GETMOUSE
+ bool enable_mouse;
+#endif
+#ifndef NCMPC_MINI
+ bool scroll;
+ bool visible_bitrate;
+ bool welcome_screen_list;
+#endif
} options_t;
extern options_t options;
-options_t *options_init(void);
-options_t *options_parse(int argc, const char **argv);
-
-
+void options_init(void);
+void options_parse(int argc, const char **argv);
+#endif