summaryrefslogtreecommitdiff
path: root/src/settings.c
diff options
context:
space:
mode:
authorMichał Cichoń <michcic@gmail.com>2015-12-05 16:07:26 +0100
committerMichał Cichoń <michcic@gmail.com>2015-12-05 16:07:26 +0100
commit13e06e633d966a7600794deb43d725cbd89e108c (patch)
tree5285721085c225f1a547830471e3a628d0657565 /src/settings.c
parentd25764daa0c4c1e4a5887ca1599d4975a7a799c6 (diff)
parent864afb87798a0669f9a58aaebba5d874546acffe (diff)
downloadpianobar-windows-2015.12.05.tar.gz
pianobar-windows-2015.12.05.tar.bz2
pianobar-windows-2015.12.05.zip
Merge branch 'release/2015.12.05'2015.12.05
Diffstat (limited to 'src/settings.c')
-rw-r--r--src/settings.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/settings.c b/src/settings.c
index d58eb5c..0765bc8 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -131,6 +131,7 @@ void BarSettingsDestroy (BarSettings_t *settings) {
free (settings->npStationFormat);
free (settings->listSongFormat);
free (settings->titleFormat);
+ free (settings->player);
free (settings->fifo);
free (settings->rpcHost);
free (settings->rpcTlsPort);
@@ -177,6 +178,7 @@ void BarSettingsRead (BarSettings_t *settings) {
settings->npStationFormat = strdup ("Station \"%n\" (%i)");
settings->listSongFormat = strdup ("%i) %a - %t%r");
settings->titleFormat = strdup (TITLE " - \"%t\" by \"%a\" on \"%l\"%r%@%s");
+ settings->player = NULL;
settings->rpcHost = strdup (PIANO_RPC_HOST);
settings->rpcTlsPort = NULL;
settings->partnerUser = strdup ("android");
@@ -332,6 +334,9 @@ void BarSettingsRead (BarSettings_t *settings) {
} else if (streq ("format_title", key)) {
free (settings->titleFormat);
settings->titleFormat = strdup (val);
+ } else if (streq ("player", key)) {
+ free (settings->player);
+ settings->player = strdup (val);
} else if (streq ("fifo", key)) {
free (settings->fifo);
settings->fifo = BarSettingsExpandTilde (val, userhome);