fabian/esmp3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Player: Only change volume and report a position if we are actually playing something.

Browse Source
This commit is contained in:
Fabian Schlenz 2019-11-19 20:48:43 +01:00
parent 20041dd483
commit 82d8f07eea
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/player.cpp
View File

@ -463,12 +463,14 @@ void Player::set_volume(uint8_t vol, bool save) {
} }
void Player::vol_up() { void Player::vol_up() {
if (!is_playing()) return;
uint8_t vol = _volume + VOLUME_STEP; uint8_t vol = _volume + VOLUME_STEP;
if (vol > VOLUME_MAX) vol=VOLUME_MAX; if (vol > VOLUME_MAX) vol=VOLUME_MAX;
set_volume(vol); set_volume(vol);
} }
void Player::vol_down() { void Player::vol_down() {
if (!is_playing()) return;
uint8_t vol = _volume - VOLUME_STEP; uint8_t vol = _volume - VOLUME_STEP;
if (vol < VOLUME_MIN) vol=VOLUME_MIN; if (vol < VOLUME_MIN) vol=VOLUME_MIN;
set_volume(vol); set_volume(vol);
@ -755,6 +757,7 @@ String Player::json() {
} }
String Player::position_json() { String Player::position_json() {
if (!is_playing()) return "null";
DynamicJsonDocument json(200); DynamicJsonDocument json(200);
json["_type"] = "position"; json["_type"] = "position";
json["position"] = _current_play_position; json["position"] = _current_play_position;