summaryrefslogtreecommitdiff
path: root/src/settings.c
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2018-04-07 20:17:23 +0200
committerMichał Cichoń <michcic@gmail.com>2018-10-30 13:08:55 +0100
commita9d5d2c3eb9d29d54509936b9e45f8eb034c033f (patch)
treec8473f5ef1a0f62c77df537cc1bf6d628b894d92 /src/settings.c
parentaed0f7555f7c684c0ef46304ecb5218c75b605cd (diff)
downloadpianobar-windows-a9d5d2c3eb9d29d54509936b9e45f8eb034c033f.tar.gz
pianobar-windows-a9d5d2c3eb9d29d54509936b9e45f8eb034c033f.tar.bz2
pianobar-windows-a9d5d2c3eb9d29d54509936b9e45f8eb034c033f.zip
Add network timeouts and retries
All network operations can time out now. API requests are retried up to three times (default). Replaces setting max_player_errors with max_retries, which is used for player and API. Adds timeout setting. Partially reverts 436a1d4012553a2f33d0e3a5180b3b5ae0378bdd and fixes (at least) issue #657. Thanks to @exarkun for testing.
Diffstat (limited to 'src/settings.c')
-rw-r--r--src/settings.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/settings.c b/src/settings.c
index 553c86e..c8a413e 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -173,8 +173,9 @@ void BarSettingsRead (BarSettings_t *settings) {
settings->autoselect = true;
settings->history = 5;
settings->volume = 0;
+ settings->timeout = 30; /* seconds */
settings->gainMul = 1.0;
- settings->maxPlayerErrors = 5;
+ settings->maxRetry = 3;
settings->sortOrder = BAR_SORT_NAME_AZ;
settings->loveIcon = strdup (" <3");
settings->banIcon = strdup (" </3");
@@ -353,8 +354,10 @@ void BarSettingsRead (BarSettings_t *settings) {
settings->eventCmd = BarSettingsExpandTilde (val, userhome);
} else if (streq ("history", key)) {
settings->history = atoi (val);
- } else if (streq ("max_player_errors", key)) {
- settings->maxPlayerErrors = atoi (val);
+ } else if (streq ("max_retry", key)) {
+ settings->maxRetry = atoi (val);
+ } else if (streq ("timeout", key)) {
+ settings->timeout = atoi (val);
} else if (streq ("sort", key)) {
size_t i;
static const char *mapping[] = {"name_az",