summaryrefslogtreecommitdiff
path: root/src/settings.c
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2010-12-26 18:56:40 +0100
committerLars-Dominik Braun <lars@6xq.net>2010-12-27 13:43:06 +0100
commitb452bc6cd392fcb7631a5d5c4d794aafd5e380e9 (patch)
tree252ca5a8b261f7ffc33b058c13cba49eb6385398 /src/settings.c
parent46b837ce695ca844db9f408512b43b592eab5126 (diff)
downloadpianobar-b452bc6cd392fcb7631a5d5c4d794aafd5e380e9.tar.gz
pianobar-b452bc6cd392fcb7631a5d5c4d794aafd5e380e9.tar.bz2
pianobar-b452bc6cd392fcb7631a5d5c4d794aafd5e380e9.zip
Software volume control
Diffstat (limited to 'src/settings.c')
-rw-r--r--src/settings.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/settings.c b/src/settings.c
index 259c9f0..d181b7a 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -95,7 +95,7 @@ void BarSettingsRead (BarSettings_t *settings) {
/* _must_ have same order as in BarKeyShortcutId_t */
static const char defaultKeys[] = {'?', '+', '-', 'a', 'c', 'd', 'e', 'g',
'h', 'i', 'j', 'm', 'n', 'p', 'q', 'r', 's', 't', 'u', 'x', '$',
- 'b',
+ 'b', '(', ')',
};
static const char *shortcutFileKeys[] = {
"act_help", "act_songlove", "act_songban", "act_stationaddmusic",
@@ -104,7 +104,7 @@ void BarSettingsRead (BarSettings_t *settings) {
"act_addshared", "act_songmove", "act_songnext", "act_songpause",
"act_quit", "act_stationrename", "act_stationchange",
"act_songtired", "act_upcoming", "act_stationselectquickmix",
- "act_debug", "act_bookmark",
+ "act_debug", "act_bookmark", "act_voldown", "act_volup",
};
/* apply defaults */
@@ -116,6 +116,7 @@ void BarSettingsRead (BarSettings_t *settings) {
#endif
#endif
settings->history = 5;
+ settings->volume = 0;
settings->sortOrder = BAR_SORT_NAME_AZ;
memcpy (settings->keys, defaultKeys, sizeof (defaultKeys));
settings->loveIcon = strdup ("<3");
@@ -187,6 +188,8 @@ void BarSettingsRead (BarSettings_t *settings) {
} else if (streq ("ban_icon", key)) {
free (settings->banIcon);
settings->banIcon = strdup (val);
+ } else if (streq ("volume", key)) {
+ settings->volume = atoi (val);
}
}