qsui: optimization

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

2 files changed, 13 insertions, 30 deletions

diff --git a/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp b/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp
index af3c59f0c..01f3aac40 100644
--- a/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp
+++ b/src/plugins/Ui/qsui/qsuiwaveformseekbar.cpp
@@ -33,7 +33,6 @@
 QSUIWaveformSeekBar::QSUIWaveformSeekBar(QWidget *parent) : QWidget(parent)
 {
     m_core = SoundCore::instance();
-    connect(m_core, SIGNAL(trackInfoChanged()), SLOT(onTrackInfoChanged()));
     connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(onStateChanged(Qmmp::State)));
     connect(m_core, SIGNAL(elapsedChanged(qint64)), SLOT(onElapsedChanged(qint64)));
 }
@@ -43,11 +42,6 @@ QSize QSUIWaveformSeekBar::sizeHint() const
     return QSize(200, 100);
 }
 
-void QSUIWaveformSeekBar::onTrackInfoChanged()
-{
-    m_core->trackInfo().path();
-}
-
 void QSUIWaveformSeekBar::onStateChanged(Qmmp::State state)
 {
     switch (state)
@@ -113,17 +107,8 @@ void QSUIWaveformSeekBar::paintEvent(QPaintEvent *e)
 
     float step = float(width()) * 3 * m_channels / m_data.size();
 
-
-    if(m_duration > 0)
-    {
-        QColor color(Qt::darkMagenta);
-        QBrush brush(color);
-        painter.fillRect(0, 0, width() * m_elapsed / m_duration, height(), brush);
-    }
-
-
-    painter.setPen(Qt::cyan);
-    painter.setBrush(Qt::cyan);
+    painter.setPen("#BECBFF");
+    painter.setBrush(QColor("#BECBFF"));
 
     for(int i = 0; i < m_data.size() - m_channels * 3; i+=3)
     {
@@ -131,12 +116,6 @@ void QSUIWaveformSeekBar::paintEvent(QPaintEvent *e)
         float x1 = step * (i / m_channels / 3);
         float x2 = step * (i / m_channels / 3 + 1);
 
-        if(x1 > (float) width() * m_elapsed / m_duration)
-        {
-            painter.setPen("#BECBFF");
-            painter.setBrush(QColor("#BECBFF"));
-        }
-
         if(ch == 0 && m_channels == 1)
         {
             float y1 = height()/2 - m_data[i] * (height() / 4) / 1000;
@@ -196,12 +175,6 @@ void QSUIWaveformSeekBar::paintEvent(QPaintEvent *e)
         float x1 = step * (i / m_channels / 3);
         float x2 = step * (i / m_channels / 3 + 1);
 
-        /*if(x1 > (float) width() * m_elapsed / m_duration)
-        {
-            painter.setPen("#BECBFF");
-            painter.setBrush(QColor("#BECBFF"));
-        }*/
-
         if(ch == 0 && m_channels == 1)
         {
             float y1 = height()/2 - m_data[i + 2] * (height() / 4) / 1000;
@@ -251,6 +224,17 @@ void QSUIWaveformSeekBar::paintEvent(QPaintEvent *e)
             painter.drawPolygon(points, 4);
         }
     }
+
+    if(m_duration > 0)
+    {
+        QColor color(Qt::magenta);
+        color.setAlpha(150);
+        QBrush brush(color);
+        painter.fillRect(0, 0, width() * m_elapsed / m_duration, height(), brush);
+        color.setAlpha(255);
+        painter.setPen(color);
+        painter.drawLine(width() * m_elapsed / m_duration, 0, width() * m_elapsed / m_duration, height());
+    }
 }
 
 QSUIWaveformScanner::QSUIWaveformScanner(QObject *parent) : QThread(parent)
diff --git a/src/plugins/Ui/qsui/qsuiwaveformseekbar.h b/src/plugins/Ui/qsui/qsuiwaveformseekbar.h
index 2edde1ee7..b335656be 100644
--- a/src/plugins/Ui/qsui/qsuiwaveformseekbar.h
+++ b/src/plugins/Ui/qsui/qsuiwaveformseekbar.h
@@ -40,7 +40,6 @@ public:
     QSize sizeHint() const override;
 
 private slots:
-    void onTrackInfoChanged();
     void onStateChanged(Qmmp::State state);
     void onScanFinished();
     void onElapsedChanged(qint64 elapsed);