From 7fca69ed2b8698bf46bcef0d489ab72f5ad3abfe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jonathan=20Neusch=C3=A4fer?= Date: Tue, 26 Jul 2011 13:04:12 +0200 Subject: [PATCH] remove the rest of the splash screen See http://musicpd.org/mantis/view.php?id=2981 --- doc/ncmpc.1 | 3 --- src/conf.c | 3 --- src/options.c | 4 ---- 3 files changed, 10 deletions(-) diff --git a/doc/ncmpc.1 b/doc/ncmpc.1 index 4d74052..fe97763 100644 --- a/doc/ncmpc.1 +++ b/doc/ncmpc.1 @@ -60,9 +60,6 @@ Read configuration from file. .B \-k, \-\-key\-file=FILE Read key bindings from FILE. .TP -.B \-S, \-\-no\-splash -Disable the splash screen. -.TP Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options. .SH "CONFIGURATION" When ncmpc start it tries to read user setting from the ~/.ncmpc/config. If no user configuration is found ncmpc tries to load global settings from $SYSCONFDIR/ncmpc/config (the actual path is displayed on the help screen). An example configuration file (config.sample) should be provided with ncmpc. diff --git a/src/conf.c b/src/conf.c index ea35486..a537663 100644 --- a/src/conf.c +++ b/src/conf.c @@ -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" @@ -484,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)) diff --git a/src/options.c b/src/options.c index e863c72..53e68d0 100644 --- a/src/options.c +++ b/src/options.c @@ -84,7 +84,6 @@ static const arg_opt_t option_table[] = { { 'P', "password","PASSWORD", "Connect with password" }, { 'f', "config", "FILE", "Read configuration from file" }, { 'k', "key-file","FILE", "Read configuration from file" }, - { 'S', "no-splash", NULL, "Don't show the splash screen" }, #ifndef NDEBUG { 'K', "dump-keys", NULL, "Dump key bindings to stdout" }, #endif @@ -266,9 +265,6 @@ handle_option(int c, const char *arg) g_free(options.key_file); options.key_file = g_strdup(arg); break; - case 'S': /* --key-file */ - /* the splash screen was removed */ - break; #ifndef NDEBUG #ifndef NCMPC_MINI case 'K': /* --dump-keys */ -- 2.30.2