options: don't override the libmpdclient default timeout

libmpdclient's default is 30s, which is just as good as our 5s
timeout.  Why change that with extra code?

diff --git a/src/defaults.h b/src/defaults.h
index bcd21ac201ce7b10437431946b0101478f668a70..258a8743eaecf8cf2efbd299830f09732e56c6c0 100644 (file)
--- a/src/defaults.h
+++ b/src/defaults.h
@@ -34,8 +34,6 @@
 
 #define DEFAULT_LYRICS_TIMEOUT 100
 
-#define DEFAULT_MPD_TIMEOUT 5000 /* 5 seconds */
-
 #define DEFAULT_SCROLL TRUE
 #define DEFAULT_SCROLL_SEP " *** "
 

diff --git a/src/options.c b/src/options.c
index f6fa63f6573319e89ba424143890ab07d0a1fdab..ca6d415e41e5da28f0c08376f3039e0af189cd80 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -61,7 +61,7 @@ options_t options = {
        .audible_bell = true,
        .bell_on_wrap = true,
        .status_message_time = 3,
-       .timeout_ms = DEFAULT_MPD_TIMEOUT,
+       .timeout_ms = 0,
 #ifndef NCMPC_MINI
        .scroll = DEFAULT_SCROLL,
        .welcome_screen_list = true,
@@ -384,9 +384,6 @@ options_init(void)
 #ifndef NCMPC_MINI
        options.scroll_sep = g_strdup(DEFAULT_SCROLL_SEP);
 #endif
-       if (getenv("MPD_TIMEOUT") != NULL)
-               /* let libmpdclient parse the environment variable */
-               options.timeout_ms = 0;
 }
 
 void