screen_lyrics: optionally ask before starting an editor

[ncmpc.git] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index cce0b9408934025c097e139733f7362181e58389..7f3ddd51814b4750c4052a9e0a70c481cc7f75ff 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -68,6 +68,7 @@
 #define CONF_HOST "host"
 #define CONF_PORT "port"
 #define CONF_PASSWORD "password"
+#define CONF_TIMEOUT "timeout"
 #define CONF_LYRICS_TIMEOUT "lyrics-timeout"
 #define CONF_SCROLL "scroll"
 #define CONF_SCROLL_SEP "scroll-sep"
@@ -77,6 +78,8 @@
 #define CONF_JUMP_PREFIX_ONLY "jump-prefix-only"
 #define CONF_LYRICS_AUTOSAVE "lyrics-autosave"
 #define CONF_LYRICS_SHOW_PLUGIN "lyrics-show-plugin"
+#define CONF_TEXT_EDITOR "text-editor"
+#define CONF_TEXT_EDITOR_ASK "text-editor-ask"
 #define CONF_SECOND_COLUMN "second-column"
 
 static bool
@@ -488,6 +491,9 @@ parse_line(char *line)
                options.port = atoi(get_format(value));
        else if (!strcasecmp(CONF_PASSWORD, name))
                options.password = get_format(value);
+       else if (!strcasecmp(CONF_TIMEOUT, name))
+               options.timeout_ms = atoi(get_format(value))
+                                    * 1000 /* seconds -> milliseconds */;
        else if (!strcasecmp(CONF_LYRICS_TIMEOUT, name))
 #ifdef ENABLE_LYRICS_SCREEN
                options.lyrics_timeout = atoi(get_format(value));
@@ -522,6 +528,21 @@ parse_line(char *line)
                options.lyrics_show_plugin = str2bool(value);
 #else
                {}
+#endif
+       else if (!strcasecmp(name, CONF_TEXT_EDITOR))
+#ifdef ENABLE_LYRICS_SCREEN
+               {
+                       g_free(options.text_editor);
+                       options.text_editor = get_format(value);
+               }
+#else
+               {}
+#endif
+       else if (!strcasecmp(name, CONF_TEXT_EDITOR_ASK))
+#ifdef ENABLE_LYRICS_SCREEN
+               options.text_editor_ask = str2bool(value);
+#else
+               {}
 #endif
        else if (!strcasecmp(CONF_SECOND_COLUMN, name))
 #ifdef NCMPC_MINI