X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Foptions.h;h=c1a833d01066c3157e5badfd5421ac84f87d1213;hb=07749b7365764dd7a43d476936cb18bf6366e9f8;hp=d0a068f846e98d430f60d5b850933f2c435d5742;hpb=9385f83268296e70b4259c3e40dee747f40468a6;p=ncmpc.git

diff --git a/src/options.h b/src/options.h
index d0a068f..c1a833d 100644
--- a/src/options.h
+++ b/src/options.h
@@ -1,10 +1,29 @@
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2010 The Music Player Daemon Project
+ * Project homepage: http://musicpd.org
+ *
+ * This program 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
 #ifndef OPTIONS_H
 #define OPTIONS_H
 
-#include <glib.h>
+#include "config.h"
 
-#define MPD_HOST_ENV "MPD_HOST"
-#define MPD_PORT_ENV "MPD_PORT"
+#include <stdbool.h>
+#include <glib.h>
 
 typedef struct {
 	char *host;
@@ -14,36 +33,61 @@ typedef struct {
 	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;
+	bool display_remaining_time;
 	int port;
+	int timeout_ms;
 	int crossfade_time;
 	int search_mode;
 	int hide_cursor;
 	int seek_time;
+#ifdef ENABLE_LYRICS_SCREEN
 	int lyrics_timeout;
-	gboolean reconnect;
-	gboolean debug;
-	gboolean find_wrap;
-	gboolean find_show_last_pattern;
-	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;
-	gboolean scroll;
+	bool lyrics_autosave;
+	bool lyrics_show_plugin;
+	char *text_editor;
+	bool text_editor_ask;
+#endif
+	bool find_wrap;
+	bool find_show_last_pattern;
+	bool list_wrap;
+	int scroll_offset;
+	bool auto_center;
+	bool wide_cursor;
+	bool hardware_cursor;
+
+#ifdef ENABLE_COLORS
+	bool enable_colors;
+#endif
+	bool audible_bell;
+	bool visible_bell;
+	bool bell_on_wrap;
+	GTime status_message_time;
+#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;
+	bool display_time;
+	bool jump_prefix_only;
+	bool second_column;
+#endif
 } options_t;
 
-#ifndef NO_GLOBAL_OPTIONS
 extern options_t options;
-#endif
 
-options_t *options_init(void);
-options_t *options_parse(int argc, const char **argv);
+void options_init(void);
+void options_deinit(void);
+
+void options_parse(int argc, const char **argv);
 
 #endif