Add option "text-editor"

[ncmpc.git] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 3ec37b855776cde142e8eae35e854daa45bb835a..9d1f8828d8d28d59dab74bbc71cf8bed4fe54801 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -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.
-*/
+ */
 
 #include "conf.h"
 #include "config.h"
@@ -69,7 +69,6 @@
 #define CONF_PORT "port"
 #define CONF_PASSWORD "password"
 #define CONF_LYRICS_TIMEOUT "lyrics-timeout"
-#define CONF_SHOW_SPLASH "show-splash"
 #define CONF_SCROLL "scroll"
 #define CONF_SCROLL_SEP "scroll-sep"
 #define CONF_VISIBLE_BITRATE "visible-bitrate"
@@ -77,6 +76,9 @@
 #define CONF_DISPLAY_TIME "display-time"
 #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_SECOND_COLUMN "second-column"
 
 static bool
 str2bool(char *str)
@@ -301,10 +303,8 @@ check_screen_list(char *value)
 {
        char **tmp = g_strsplit_set(value, " \t,", 100);
        char **screen = NULL;
-       int i,j;
+       int i = 0, j = 0;
 
-       i=0;
-       j=0;
        while( tmp && tmp[i] ) {
                char *name = g_ascii_strdown(tmp[i], -1);
                if (*name != '\0') {
@@ -372,17 +372,14 @@ get_search_mode(char *value)
 static bool
 parse_line(char *line)
 {
-       size_t len = strlen(line), i = 0, j;
+       size_t len = strlen(line), i = 0, j = 0;
        char name[MAX_LINE_LENGTH];
        char value[MAX_LINE_LENGTH];
        bool match_found;
 
        /* get the name part */
-       j = 0;
-       while (i < len && line[i] != '=' &&
-              !g_ascii_isspace(line[i])) {
+       while (i < len && line[i] != '=' && !g_ascii_isspace(line[i]))
                name[j++] = line[i++];
-       }
 
        name[j] = '\0';
 
@@ -486,8 +483,6 @@ parse_line(char *line)
        else if (!strcasecmp(CONF_SCREEN_LIST, name)) {
                g_strfreev(options.screen_list);
                options.screen_list = check_screen_list(value);
-       } else if (!strcasecmp(CONF_SHOW_SPLASH, name)) {
-               /* the splash screen was removed */
        } else if (!strcasecmp(CONF_HOST, name))
                options.host = get_format(value);
        else if (!strcasecmp(CONF_PORT, name))
@@ -522,13 +517,33 @@ parse_line(char *line)
                options.lyrics_autosave = str2bool(value);
 #else
        {}
+#endif
+       else if (!strcasecmp(CONF_LYRICS_SHOW_PLUGIN, name))
+#ifdef ENABLE_LYRICS_SCREEN
+               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(CONF_SECOND_COLUMN, name))
+#ifdef NCMPC_MINI
+               {}
+#else
+               options.second_column = str2bool(value);
 #endif
        else
                match_found = false;
 
        if (!match_found)
-               print_error(_("Unknown configuration parameter"),
-                           name);
+               print_error(_("Unknown configuration parameter"), name);
 
        return match_found;
 }
@@ -570,7 +585,11 @@ check_user_conf_dir(void)
                return 0;
        }
 
+#ifndef WIN32
        retval = mkdir(directory, 0755);
+#else
+       retval = mkdir(directory);
+#endif
        g_free(directory);
        return retval;
 }