skinned: moved to the new volume api

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3842 90c681e8-e032-0410-971d-27865f9a5e38

7 files changed, 23 insertions, 53 deletions

diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp
index a5d9bd798..505725800 100644
--- a/src/plugins/Ui/skinned/display.cpp
+++ b/src/plugins/Ui/skinned/display.cpp
@@ -99,14 +99,14 @@ MainDisplay::MainDisplay (MainWindow *parent)
 
     m_volumeBar = new VolumeBar(this);
     m_volumeBar->setToolTip(tr("Volume"));
-    connect(m_volumeBar, SIGNAL(sliderMoved(int)),SLOT(updateVolume()));
-    connect(m_volumeBar, SIGNAL(sliderPressed()),SLOT(updateVolume()));
+    connect(m_volumeBar, SIGNAL(sliderMoved(int)),SLOT(displayVolume()));
+    connect(m_volumeBar, SIGNAL(sliderPressed()),SLOT(displayVolume()));
     connect(m_volumeBar, SIGNAL(sliderReleased()),m_text,SLOT(clear()));
 
     m_balanceBar = new BalanceBar(this);
     m_balanceBar->setToolTip(tr("Balance"));
-    connect(m_balanceBar, SIGNAL(sliderMoved(int)),SLOT(updateVolume()));
-    connect(m_balanceBar, SIGNAL(sliderPressed()),SLOT(updateVolume()));
+    connect(m_balanceBar, SIGNAL(sliderMoved(int)),SLOT(displayVolume()));
+    connect(m_balanceBar, SIGNAL(sliderPressed()),SLOT(displayVolume()));
     connect(m_balanceBar, SIGNAL(sliderReleased()),m_text,SLOT(clear()));
 
     m_posbar = new PositionBar(this);
@@ -122,8 +122,14 @@ MainDisplay::MainDisplay (MainWindow *parent)
     connect(m_core, SIGNAL(frequencyChanged(quint32)), SLOT(setSampleRate(quint32)));
     connect(m_core, SIGNAL(channelsChanged(int)), m_monoster, SLOT(setChannels(int)));
     connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(setState(Qmmp::State)));
-    connect(m_core, SIGNAL(volumeChanged(int,int)), SLOT(setVolume(int, int)));
+    connect(m_core, SIGNAL(volumeChanged(int)), m_volumeBar, SLOT(setValue(int)));
+    connect(m_core, SIGNAL(balanceChanged(int)), m_balanceBar, SLOT(setValue(int)));
     connect(m_core, SIGNAL(elapsedChanged(qint64)),m_titlebar, SLOT(setTime(qint64)));
+    connect(m_balanceBar, SIGNAL(sliderMoved(int)), m_core, SLOT(setBalance(int)));
+    connect(m_volumeBar, SIGNAL(sliderMoved(int)), m_core, SLOT(setVolume(int)));
+    m_volumeBar->setValue(m_core->volume());
+    m_balanceBar->setValue(m_core->balance());
+
     PlayListManager *pl_manager = MediaPlayer::instance()->playListManager();
     connect(pl_manager, SIGNAL(repeatableListChanged(bool)), m_repeatButton, SLOT(setChecked(bool)));
     connect(pl_manager, SIGNAL(shuffleChanged(bool)), m_shuffleButton, SLOT(setChecked(bool)));
@@ -198,14 +204,6 @@ void MainDisplay::setState(Qmmp::State state)
     }
 }
 
-void MainDisplay::setVolume(int left, int right)
-{
-    int maxVol = qMax(left, right);
-    m_volumeBar->setValue(maxVol);
-    if (maxVol && !m_volumeBar->isPressed())
-        m_balanceBar->setValue((right - left) * 100/maxVol);
-}
-
 void MainDisplay::updateSkin()
 {
     setPixmap (m_skin->getMain());
@@ -290,7 +288,7 @@ bool MainDisplay::isEqualizerVisible() const
     return m_eqButton->isChecked();
 }
 
-void MainDisplay::updateVolume()
+void MainDisplay::displayVolume()
 {
     if(sender() == m_volumeBar)
         m_text->setText(tr("Volume: %1%").arg(m_volumeBar->value()));
@@ -303,7 +301,6 @@ void MainDisplay::updateVolume()
         else
             m_text->setText(tr("Balance: center"));
     }
-    m_mw->setVolume(m_volumeBar->value(), m_balanceBar->value());
 }
 
 void MainDisplay::showPosition()
@@ -323,7 +320,7 @@ void MainDisplay::updatePosition()
 
 void MainDisplay::wheelEvent (QWheelEvent *e)
 {
-    m_mw->setVolume(m_volumeBar->value()+e->delta()/10, m_balanceBar->value());
+    m_core->changeVolume(e->delta()/10);
 }
 
 bool MainDisplay::isRepeatable() const
diff --git a/src/plugins/Ui/skinned/display.h b/src/plugins/Ui/skinned/display.h
index aa750203b..e394a440d 100644
--- a/src/plugins/Ui/skinned/display.h
+++ b/src/plugins/Ui/skinned/display.h
@@ -77,14 +77,12 @@ protected:
 
 private slots:
     void updateSkin();
-    void updateVolume();
+    void displayVolume();
     void showPosition();
     void updatePosition();
     void setSampleRate(quint32 rate);
     void setTime(qint64);
     void setState(Qmmp::State state);
-    void setVolume(int left, int right);
-
 
 private:
     void updatePositions();
diff --git a/src/plugins/Ui/skinned/eqtitlebar.cpp b/src/plugins/Ui/skinned/eqtitlebar.cpp
index c533aca3b..b7e6e504d 100644
--- a/src/plugins/Ui/skinned/eqtitlebar.cpp
+++ b/src/plugins/Ui/skinned/eqtitlebar.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2009 by Ilya Kotov                                 *
+ *   Copyright (C) 2007-2013 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,6 +20,7 @@
 #include <QMouseEvent>
 #include <QMenu>
 #include <QSettings>
+#include <qmmp/soundcore.h>
 #include "eqwidget.h"
 #include "skin.h"
 #include "shadedbar.h"
@@ -93,19 +94,6 @@ void EqTitleBar::setActive(bool active)
     }
 }
 
-void EqTitleBar::setVolume(int left, int right)
-{
-    m_left = left;
-    m_right = right;
-    if (m_volumeBar && m_balanceBar)
-    {
-        int maxVol = qMax(left, right);
-        m_volumeBar->setValue(maxVol);
-        if (maxVol && !m_volumeBar->isPressed())
-            m_balanceBar->setValue((right - left)*100/maxVol);
-    }
-}
-
 void EqTitleBar::mousePressEvent(QMouseEvent* event)
 {
     switch ((int) event->button ())
@@ -153,13 +141,17 @@ void EqTitleBar::shade()
         m_volumeBar = new ShadedBar(this, Skin::EQ_VOLUME1, Skin::EQ_VOLUME2, Skin::EQ_VOLUME3);
         m_volumeBar->move(r*61,r*4);
         m_volumeBar->show();
-        connect(m_volumeBar, SIGNAL(sliderMoved(int)),SLOT(updateVolume()));
         m_balanceBar = new ShadedBar(this, Skin::EQ_BALANCE1, Skin::EQ_BALANCE2, Skin::EQ_BALANCE3);
         m_balanceBar->move(r*164,r*4);
         m_balanceBar->setRange(-100, 100);
         m_balanceBar->show();
-        connect(m_balanceBar, SIGNAL(sliderMoved(int)),SLOT(updateVolume()));
-        setVolume(m_left, m_right); //show current volume and balance
+        SoundCore *core = SoundCore::instance();
+        connect(core, SIGNAL(volumeChanged(int)), m_volumeBar, SLOT(setValue(int)));
+        connect(core, SIGNAL(balanceChanged(int)), m_balanceBar, SLOT(setValue(int)));
+        connect(m_volumeBar, SIGNAL(sliderMoved(int)), core, SLOT(setVolume(int)));
+        connect(m_balanceBar, SIGNAL(sliderMoved(int)), core, SLOT(setBalance(int)));
+        m_volumeBar->setValue(core->volume());
+        m_balanceBar->setValue(core->balance());
     }
     else
     {
@@ -177,11 +169,6 @@ void EqTitleBar::shade()
         Dock::instance()->align(m_eq, m_shaded? -102*r: 102*r);
 }
 
-void EqTitleBar::updateVolume()
-{
-    m_mw->setVolume(m_volumeBar->value(), m_balanceBar->value());
-}
-
 void EqTitleBar::updateSkin()
 {
     setCursor(m_skin->getCursor(Skin::CUR_EQTITLE));
diff --git a/src/plugins/Ui/skinned/eqtitlebar.h b/src/plugins/Ui/skinned/eqtitlebar.h
index 8b4fc7648..62a0fb2b5 100644
--- a/src/plugins/Ui/skinned/eqtitlebar.h
+++ b/src/plugins/Ui/skinned/eqtitlebar.h
@@ -41,12 +41,8 @@ public:
 
     void setActive(bool);
 
-public slots:
-    void setVolume(int left, int right);
-
 private slots:
     void shade();
-    void updateVolume();
     void updateSkin();
 
 private:
diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index a44d2c82f..e6a1ef470 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -74,7 +74,6 @@ EqWidget::EqWidget (QWidget *parent)
     createActions();
     updatePositions();
     updateMask();
-    connect(SoundCore::instance(), SIGNAL(volumeChanged(int, int)), m_titleBar, SLOT(setVolume(int, int)));
 #ifdef Q_WS_X11
     QString wm_name = WindowSystem::netWindowManagerName();
     if(wm_name.contains("metacity", Qt::CaseInsensitive) ||
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index d09a5e44f..c1ec27841 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -141,12 +141,6 @@ void MainWindow::backward()
     m_core->seek(qMax(qint64(0), m_core->elapsed() - KEY_OFFSET));
 }
 
-void MainWindow::setVolume(int volume, int balance)
-{
-    m_core->setVolume(volume-qMax(balance,0)*volume/100,
-                      volume+qMin(balance,0)*volume/100);
-}
-
 void MainWindow::pause(void)
 {
     m_core->pause();
diff --git a/src/plugins/Ui/skinned/mainwindow.h b/src/plugins/Ui/skinned/mainwindow.h
index c04ed697b..ec50fe483 100644
--- a/src/plugins/Ui/skinned/mainwindow.h
+++ b/src/plugins/Ui/skinned/mainwindow.h
@@ -55,7 +55,6 @@ public:
     PlayList *playlist(){return m_playlist;}
 
     QMenu* menu();
-    void setVolume(int volume, int balance);
     MainDisplay* mainDisplay()const;
 
 public slots: