From 787b6edfc00b22b32e574cfaeb9db0e101dbd2ab Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 2 Nov 2016 16:42:33 +0100 Subject: [PATCH] Audio: print volume also in dB --- src/keyboard_control.cpp | 2 +- src/rtp/audio_decoders.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/keyboard_control.cpp b/src/keyboard_control.cpp index af3a5f73f..6b99db021 100644 --- a/src/keyboard_control.cpp +++ b/src/keyboard_control.cpp @@ -259,7 +259,7 @@ void keyboard_control::usage() if (response_get_status(resp) == 200) { double vol = atof(response_get_text(resp)); double db = 20.0 * log10(vol / 100.0); - cout << "Received audio volume: " << fixed << setprecision(2) << vol << " % (" << (db >= 0.0 ? "+" : "") << db << " dB)\n"; + cout << "Received audio volume: " << fixed << setprecision(2) << vol << "% (" << (db >= 0.0 ? "+" : "") << db << " dB)\n"; } free_response(resp); } diff --git a/src/rtp/audio_decoders.cpp b/src/rtp/audio_decoders.cpp index 82f6248af..ba9c1e35d 100644 --- a/src/rtp/audio_decoders.cpp +++ b/src/rtp/audio_decoders.cpp @@ -698,14 +698,16 @@ void audio_decoder_increase_volume(void *state) { auto s = (struct state_audio_decoder *) state; s->scale->scale *= 1.1; - log_msg(LOG_LEVEL_INFO, "Volume: %f%%\n", s->scale->scale * 100.0); + double db = 20.0 * log10(s->scale->scale); + log_msg(LOG_LEVEL_INFO, "Volume: %.2f%% (%+.2f dB)\n", s->scale->scale * 100.0, db); } void audio_decoder_decrease_volume(void *state) { auto s = (struct state_audio_decoder *) state; s->scale->scale /= 1.1; - log_msg(LOG_LEVEL_INFO, "Volume: %f%%\n", s->scale->scale * 100.0); + double db = 20.0 * log10(s->scale->scale); + log_msg(LOG_LEVEL_INFO, "Volume: %.2f%% (%+.2f dB)\n", s->scale->scale * 100.0, db); } void audio_decoder_mute(void *state)