From f567083006a88f0a67390318e6e6011afdcce334 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Mon, 15 May 2017 22:40:23 +0200
Subject: [PATCH] Main: refactor DEFAULT_BUFFER_SIZE to represent bytes
---
src/Main.cxx | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/Main.cxx b/src/Main.cxx
index 4924fbb2a..0f9368b1a 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -117,7 +117,10 @@
#include <limits.h>
-static constexpr unsigned DEFAULT_BUFFER_SIZE = 4096;
+static constexpr size_t KILOBYTE = 1024;
+static constexpr size_t MEGABYTE = 1024 * KILOBYTE;
+
+static constexpr size_t DEFAULT_BUFFER_SIZE = 4 * MEGABYTE;
static constexpr unsigned DEFAULT_BUFFER_BEFORE_PLAY = 10;
#ifdef ANDROID
@@ -306,12 +309,10 @@ initialize_decoder_and_player(const ReplayGainConfig &replay_gain_config)
FormatFatalError("buffer size \"%s\" is not a "
"positive integer, line %i",
param->value.c_str(), param->line);
- buffer_size = tmp;
+ buffer_size = tmp * KILOBYTE;
} else
buffer_size = DEFAULT_BUFFER_SIZE;
- buffer_size *= 1024;
-
const unsigned buffered_chunks = buffer_size / CHUNK_SIZE;
if (buffered_chunks >= 1 << 15)