skinned: fixed visualization

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

4 files changed, 8 insertions, 17 deletions

diff --git a/src/plugins/Ui/skinned/mainvisual.cpp b/src/plugins/Ui/skinned/mainvisual.cpp
index 7a705a24d..5667f3f06 100644
--- a/src/plugins/Ui/skinned/mainvisual.cpp
+++ b/src/plugins/Ui/skinned/mainvisual.cpp
@@ -47,8 +47,6 @@ MainVisual::MainVisual (QWidget *parent) : Visual (parent), m_vis (0)
     connect(m_skin, SIGNAL(skinChanged()), this, SLOT(readSettings()));
     m_timer = new QTimer (this);
     connect(m_timer, SIGNAL (timeout()), this, SLOT (timeout()));
-    m_left_buffer = new float[QMMP_VISUAL_NODE_SIZE];
-    m_right_buffer = new float[QMMP_VISUAL_NODE_SIZE];
     m_instance = this;
     m_update = false;
     m_running = false;
@@ -61,12 +59,9 @@ MainVisual::~MainVisual()
     writeSettings();
     if (m_vis)
     {
-
         delete m_vis;
         m_vis = 0;
     }
-    delete [] m_left_buffer;
-    delete [] m_right_buffer;
     m_instance = 0;
 }
 
@@ -95,9 +90,9 @@ void MainVisual::clear()
 
 void MainVisual::timeout()
 {
-    if(m_vis && takeData(m_left_buffer, m_right_buffer))
+    if(m_vis && takeData(m_buffer))
     {
-        m_vis->process(m_left_buffer);
+        m_vis->process(m_buffer);
         m_pixmap = m_bg;
         QPainter p(&m_pixmap);
         m_vis->draw (&p);
@@ -158,7 +153,9 @@ void MainVisual::start()
 
 void MainVisual::stop()
 {
+    m_running = false;
     m_timer->stop();
+    clear();
 }
 
 void MainVisual::drawBackGround()
diff --git a/src/plugins/Ui/skinned/mainvisual.h b/src/plugins/Ui/skinned/mainvisual.h
index 13cd60d31..1ae3b795e 100644
--- a/src/plugins/Ui/skinned/mainvisual.h
+++ b/src/plugins/Ui/skinned/mainvisual.h
@@ -90,8 +90,7 @@ private:
     QAction *m_peaksAction;
     QAction *m_transparentAction;
     int m_ratio;
-    float *m_left_buffer;
-    float *m_right_buffer;
+    float m_buffer[QMMP_VISUAL_NODE_SIZE];
     bool m_update;
     bool m_running;
 };
diff --git a/src/plugins/Ui/skinned/shadedvisual.cpp b/src/plugins/Ui/skinned/shadedvisual.cpp
index 94eac8961..347a7a0c1 100644
--- a/src/plugins/Ui/skinned/shadedvisual.cpp
+++ b/src/plugins/Ui/skinned/shadedvisual.cpp
@@ -34,8 +34,6 @@ ShadedVisual::ShadedVisual(QWidget *parent) : Visual(parent)
     m_timer = new QTimer(this);
     connect(m_timer, SIGNAL (timeout()), this, SLOT (timeout()));
     connect(m_skin, SIGNAL(skinChanged()), this, SLOT(updateSkin()));
-    m_left_buffer = new float[QMMP_VISUAL_NODE_SIZE];
-    m_right_buffer = new float[QMMP_VISUAL_NODE_SIZE];
     m_running = false;
     m_timer->setInterval(50);
     m_timer->start();
@@ -43,10 +41,7 @@ ShadedVisual::ShadedVisual(QWidget *parent) : Visual(parent)
 }
 
 ShadedVisual::~ShadedVisual()
-{
-    delete [] m_left_buffer;
-    delete [] m_right_buffer;
-}
+{}
 
 void ShadedVisual::clear()
 {
diff --git a/src/plugins/Ui/skinned/shadedvisual.h b/src/plugins/Ui/skinned/shadedvisual.h
index 2febec8ca..b5482af98 100644
--- a/src/plugins/Ui/skinned/shadedvisual.h
+++ b/src/plugins/Ui/skinned/shadedvisual.h
@@ -58,8 +58,8 @@ private:
     Skin *m_skin;
     QTimer *m_timer;
     QPixmap m_pixmap;
-    float *m_left_buffer;
-    float *m_right_buffer;
+    float m_left_buffer[QMMP_VISUAL_NODE_SIZE];
+    float m_right_buffer[QMMP_VISUAL_NODE_SIZE];
     double m_l, m_r;
     int m_ratio;
     bool m_running;