oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Main: refactor DEFAULT_BUFFER_SIZE to represent bytes

Browse Source
This commit is contained in:
Max Kellermann
2017-05-15 22:40:23 +02:00
parent a2a677e539
commit f567083006
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Main.cxx
View File

@@ -117,7 +117,10 @@
#include <limits.h> #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; static constexpr unsigned DEFAULT_BUFFER_BEFORE_PLAY = 10;
#ifdef ANDROID #ifdef ANDROID
@@ -306,12 +309,10 @@ initialize_decoder_and_player(const ReplayGainConfig &replay_gain_config)
FormatFatalError("buffer size \"%s\" is not a " FormatFatalError("buffer size \"%s\" is not a "
"positive integer, line %i", "positive integer, line %i",
param->value.c_str(), param->line); param->value.c_str(), param->line);
buffer_size = tmp; buffer_size = tmp * KILOBYTE;
} else } else
buffer_size = DEFAULT_BUFFER_SIZE; buffer_size = DEFAULT_BUFFER_SIZE;
buffer_size *= 1024;
const unsigned buffered_chunks = buffer_size / CHUNK_SIZE; const unsigned buffered_chunks = buffer_size / CHUNK_SIZE;
if (buffered_chunks >= 1 << 15) if (buffered_chunks >= 1 << 15)