diff options
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/conf.c | 1 | ||||
| -rw-r--r-- | src/defaults.h | 39 | ||||
| -rw-r--r-- | src/ncmpc.h | 15 | ||||
| -rw-r--r-- | src/options.c | 2 |
5 files changed, 42 insertions, 16 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 800799613..4cc501c10 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,6 +31,7 @@ ncmpc_headers = \ strfsong.h\ utils.h\ ncmpc.h\ + defaults.h \ screen_browser.h \ lyrics.h \ str_pool.h \ diff --git a/src/conf.c b/src/conf.c index 79bbfd3a1..e0214ce9d 100644 --- a/src/conf.c +++ b/src/conf.c @@ -21,6 +21,7 @@ #define NO_GLOBAL_OPTIONS #include "conf.h" #include "config.h" +#include "defaults.h" #include "ncmpc.h" #include "support.h" #include "command.h" diff --git a/src/defaults.h b/src/defaults.h new file mode 100644 index 000000000..57337b0f2 --- /dev/null +++ b/src/defaults.h @@ -0,0 +1,39 @@ +/* ncmpc + * Copyright (C) 2008 Max Kellermann <max@duempel.org> + * This project's homepage is: http://www.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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef DEFAULTS_H +#define DEFAULTS_H + +/* mpd crossfade time [s] */ +#define DEFAULT_CROSSFADE_TIME 10 + +/* screen list */ +#define DEFAULT_SCREEN_LIST "playlist browse" + +/* song format - list window */ +#define DEFAULT_LIST_FORMAT "%name%|[%artist% - ]%title%|%shortfile%" + +/* song format - status window */ +#define DEFAULT_STATUS_FORMAT "[%artist% - ]%title%|%shortfile%" + +#define DEFAULT_LYRICS_TIMEOUT 100 + +#define DEFAULT_SCROLL TRUE +#define DEFAULT_SCROLL_SEP " *** " + +#endif diff --git a/src/ncmpc.h b/src/ncmpc.h index 746bc8beb..e7da71778 100644 --- a/src/ncmpc.h +++ b/src/ncmpc.h @@ -20,15 +20,9 @@ #define YES _("y") #define NO _("n") -/* mpd crossfade time [s] */ -#define DEFAULT_CROSSFADE_TIME 10 - /* welcome message time [s] */ #define SCREEN_WELCOME_TIME 10 -/* screen list */ -#define DEFAULT_SCREEN_LIST "playlist browse" - /* status message time [s] */ #define SCREEN_STATUS_MESSAGE_TIME 3 @@ -45,19 +39,10 @@ /* time before trying to reconnect [ms] */ #define MPD_RECONNECT_TIME 1500 -/* song format - list window */ -#define DEFAULT_LIST_FORMAT "%name%|[%artist% - ]%title%|%shortfile%" #define LIST_FORMAT options.list_format -/* song format - status window */ -#define DEFAULT_STATUS_FORMAT "[%artist% - ]%title%|%shortfile%" #define STATUS_FORMAT options.status_format -#define DEFAULT_LYRICS_TIMEOUT 100 - -#define DEFAULT_SCROLL TRUE -#define DEFAULT_SCROLL_SEP " *** " - void sigstop(void); diff --git a/src/options.c b/src/options.c index f6e206aea..2a02dca74 100644 --- a/src/options.c +++ b/src/options.c @@ -18,7 +18,7 @@ #include "options.h" #include "config.h" -#include "ncmpc.h" +#include "defaults.h" #include "support.h" #include "command.h" #include "conf.h" |