Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix volume restoring

Browse Source
This commit is contained in:
David Sansome 2010-02-03 22:05:39 +00:00
parent 28bcbaa674
commit 226bfb43ee
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/player.cpp
View File

@ -18,6 +18,8 @@ Player::Player(Playlist* playlist, LastFMService* lastfm, QObject* parent)
{ {
settings_.beginGroup("Player"); settings_.beginGroup("Player");
SetVolume(settings_.value("volume", 50).toInt());
connect(init_engine_watcher_, SIGNAL(finished()), SLOT(EngineInitFinished())); connect(init_engine_watcher_, SIGNAL(finished()), SLOT(EngineInitFinished()));
connect(engine_, SIGNAL(error(QString)), SIGNAL(Error(QString))); connect(engine_, SIGNAL(error(QString)), SIGNAL(Error(QString)));
} }
@ -32,8 +34,6 @@ void Player::EngineInitFinished() {
qFatal("Error initialising audio engine"); qFatal("Error initialising audio engine");
} }
SetVolumeInternal(settings_.value("volume", 50).toInt());
connect(engine_, SIGNAL(stateChanged(Engine::State)), SLOT(EngineStateChanged(Engine::State))); connect(engine_, SIGNAL(stateChanged(Engine::State)), SLOT(EngineStateChanged(Engine::State)));
connect(engine_, SIGNAL(trackEnded()), SLOT(TrackEnded())); connect(engine_, SIGNAL(trackEnded()), SLOT(TrackEnded()));
@ -136,13 +136,9 @@ void Player::EngineStateChanged(Engine::State state) {
} }
void Player::SetVolume(int value) { void Player::SetVolume(int value) {
SetVolumeInternal(value);
emit VolumeChanged(value);
}
void Player::SetVolumeInternal(int value) {
settings_.setValue("volume", value); settings_.setValue("volume", value);
engine_->setVolume(value); engine_->setVolume(value);
emit VolumeChanged(value);
} }
int Player::GetVolume() const { int Player::GetVolume() const {

3
src/player.h
View File

@ -56,9 +56,6 @@ class Player : public QObject {
void EngineInitFinished(); void EngineInitFinished();
void EngineStateChanged(Engine::State); void EngineStateChanged(Engine::State);
private:
void SetVolumeInternal(int value);
private: private:
Playlist* playlist_; Playlist* playlist_;
LastFMService* lastfm_; LastFMService* lastfm_;