screen_lyrics: optionally ask before starting an editor

[ncmpc.git] / src / options.h

diff --git a/src/options.h b/src/options.h
index 1fc042455948be58082332541859a27b9165a044..c1a833d01066c3157e5badfd5421ac84f87d1213 100644 (file)
--- a/src/options.h
+++ b/src/options.h
@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (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
@@ -25,9 +25,6 @@
 #include <stdbool.h>
 #include <glib.h>
 
-#define MPD_HOST_ENV "MPD_HOST"
-#define MPD_PORT_ENV "MPD_PORT"
-
 typedef struct {
        char *host;
        char *username;
@@ -41,8 +38,9 @@ typedef struct {
        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;
@@ -50,6 +48,9 @@ typedef struct {
 #ifdef ENABLE_LYRICS_SCREEN
        int lyrics_timeout;
        bool lyrics_autosave;
+       bool lyrics_show_plugin;
+       char *text_editor;
+       bool text_editor_ask;
 #endif
        bool find_wrap;
        bool find_show_last_pattern;
@@ -78,6 +79,7 @@ typedef struct {
        bool welcome_screen_list;
        bool display_time;
        bool jump_prefix_only;
+       bool second_column;
 #endif
 } options_t;