Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Player: Don't set volume lower than 0 or higher than 100.

Browse Source 
Fixes #884
This commit is contained in:
Jonas Kvinge 2022-01-29 20:32:15 +01:00
parent af38b8f92b
commit fd5970b647
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/player.cpp
View File

@ -23,6 +23,7 @@
#include "player.h" #include "player.h"
#include <algorithm>
#include <memory> #include <memory>
#include <QtGlobal> #include <QtGlobal>
@ -632,6 +633,12 @@ void Player::EngineStateChanged(const Engine::State state) {
} }
uint Player::GetVolume() const {
return engine_->volume();
}
void Player::SetVolume(const uint value) { void Player::SetVolume(const uint value) {
uint old_volume = engine_->volume(); uint old_volume = engine_->volume();
@ -646,7 +653,23 @@ void Player::SetVolume(const uint value) {
} }
uint Player::GetVolume() const { return engine_->volume(); } void Player::VolumeUp() {
uint old_volume = GetVolume();
uint new_volume = std::min(old_volume + 5, static_cast<uint>(100));
if (new_volume == old_volume) return;
SetVolume(new_volume);
}
void Player::VolumeDown() {
uint old_volume = GetVolume();
uint new_volume = static_cast<uint>(std::max(static_cast<int>(old_volume) - 5, 0));
if (new_volume == old_volume) return;
SetVolume(new_volume);
}
void Player::PlayAt(const int index, const quint64 offset_nanosec, Engine::TrackChangeFlags change, const Playlist::AutoScroll autoscroll, const bool reshuffle, const bool force_inform) { void Player::PlayAt(const int index, const quint64 offset_nanosec, Engine::TrackChangeFlags change, const Playlist::AutoScroll autoscroll, const bool reshuffle, const bool force_inform) {

4
src/core/player.h
View File

@ -167,8 +167,8 @@ class Player : public PlayerInterface {
void Previous() override; void Previous() override;
void PlayPlaylist(const QString &playlist_name) override; void PlayPlaylist(const QString &playlist_name) override;
void SetVolume(const uint value) override; void SetVolume(const uint value) override;
void VolumeUp() override { SetVolume(GetVolume() + 5); } void VolumeUp() override;
void VolumeDown() override { SetVolume(GetVolume() - 5); } void VolumeDown() override;
void SeekTo(const quint64 seconds) override; void SeekTo(const quint64 seconds) override;
void SeekForward() override; void SeekForward() override;
void SeekBackward() override; void SeekBackward() override;