qsui: fixed visualization

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

1 files changed, 19 insertions, 26 deletions

diff --git a/src/plugins/Ui/qsui/logo.cpp b/src/plugins/Ui/qsui/logo.cpp
index af46bac2a..c3d035c58 100644
--- a/src/plugins/Ui/qsui/logo.cpp
+++ b/src/plugins/Ui/qsui/logo.cpp
@@ -63,15 +63,12 @@ Logo::Logo(QWidget *parent) : Visual(parent)
         m_source_lines.append(line);
     }
 
-    QTimer *m_timer = new QTimer(this);
+    m_timer = new QTimer(this);
     connect(m_timer, SIGNAL(timeout()), SLOT(updateLetters()));
     m_timer->setInterval(50);
-    m_timer->start();
 
     m_value = 0;
     m_elapsed = 0;
-    m_left_buffer = new float[QMMP_VISUAL_NODE_SIZE];
-    m_right_buffer = new float[QMMP_VISUAL_NODE_SIZE];
     updateLetters();
     Visual::add(this);
 }
@@ -79,13 +76,17 @@ Logo::Logo(QWidget *parent) : Visual(parent)
 Logo::~Logo()
 {
     Visual::remove(this);
-    delete[] m_left_buffer;
-    delete[] m_left_buffer;
 }
 
-void Logo::start(){}
+void Logo::start()
+{
+    m_timer->start();
+}
 
-void Logo::stop(){}
+void Logo::stop()
+{
+    m_timer->stop();
+}
 
 void Logo::paintEvent(QPaintEvent *)
 {
@@ -206,43 +207,36 @@ void Logo::processPreset4()
 
     int max = 0;
 
-    if(takeData(m_left_buffer, m_right_buffer))
+    if(takeData(m_buffer))
     {
         for(int j = 0; j < QMMP_VISUAL_NODE_SIZE; j+=8)
         {
-            if(m_left_buffer[j] > max)
-                max = abs(m_left_buffer[j] * 65536.0);
+            max = qMax(max, abs(m_buffer[j] * 65536.0));
         }
-        m_value -= 512;
-        m_value = qMax(m_value, max);
-    }
-    else
-    {
-       m_value -= 512;
-       m_value = qMax(m_value, max);
     }
 
-    //int at = 0;
+    m_value -= 512;
+    m_value = qMax(m_value, max);
+
+    int at = 0;
 
-    /*
     foreach(QString line, m_source_lines)
     {
-
         int count = line.count("X");
         int k = 0;
 
-        while(k < m_value * count / 2048 / 16 / 2)
+        while(k < m_value * count / 65536 / 2)
         {
-            int value = abs(m_left_buffer[qMin(at++, m_buffer_at)] * 16);
+            int value = abs(m_buffer[qMin(at++, QMMP_VISUAL_NODE_SIZE)] * 16);
             line.replace(line.indexOf("X"), 1, QString("%1").arg(value, 0, 16).toUpper());
             k++;
         }
 
         k = 0;
 
-        while(k < m_value * count / 2048 / 16 / 2)
+        while(k < m_value * count / 65536 / 2)
         {
-            int value = abs(m_left_buffer[qMin(at++, m_buffer_at)] * 16);
+            int value = abs(m_buffer[qMin(at++, QMMP_VISUAL_NODE_SIZE)] * 16);
             line.replace(line.lastIndexOf("X"), 1, QString("%1").arg(value, 0, 16).toUpper());
             k++;
         }
@@ -254,6 +248,5 @@ void Logo::processPreset4()
 
         m_lines.append(line);
     }
-    */
     update();
 }