From 226bfb43ee5c308acf7acce91eada6eb60afb68a Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Wed, 3 Feb 2010 22:05:39 +0000
Subject: [PATCH] Fix volume restoring

---
 src/player.cpp | 10 +++-------
 src/player.h   |  3 ---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/player.cpp b/src/player.cpp
index f034ffce0..d569cd169 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -18,6 +18,8 @@ Player::Player(Playlist* playlist, LastFMService* lastfm, QObject* parent)
 {
   settings_.beginGroup("Player");
 
+  SetVolume(settings_.value("volume", 50).toInt());
+
   connect(init_engine_watcher_, SIGNAL(finished()), SLOT(EngineInitFinished()));
   connect(engine_, SIGNAL(error(QString)), SIGNAL(Error(QString)));
 }
@@ -32,8 +34,6 @@ void Player::EngineInitFinished() {
     qFatal("Error initialising audio engine");
   }
 
-  SetVolumeInternal(settings_.value("volume", 50).toInt());
-
   connect(engine_, SIGNAL(stateChanged(Engine::State)), SLOT(EngineStateChanged(Engine::State)));
   connect(engine_, SIGNAL(trackEnded()), SLOT(TrackEnded()));
 
@@ -136,13 +136,9 @@ void Player::EngineStateChanged(Engine::State state) {
 }
 
 void Player::SetVolume(int value) {
-  SetVolumeInternal(value);
-  emit VolumeChanged(value);
-}
-
-void Player::SetVolumeInternal(int value) {
   settings_.setValue("volume", value);
   engine_->setVolume(value);
+  emit VolumeChanged(value);
 }
 
 int Player::GetVolume() const {
diff --git a/src/player.h b/src/player.h
index c741b1507..fbfbb7151 100644
--- a/src/player.h
+++ b/src/player.h
@@ -56,9 +56,6 @@ class Player : public QObject {
   void EngineInitFinished();
   void EngineStateChanged(Engine::State);
 
- private:
-  void SetVolumeInternal(int value);
-
  private:
   Playlist* playlist_;
   LastFMService* lastfm_;