*Allow users to choose between SDL and OpenGL for monitor display

[kdenlive] / src / audiosignal.cpp

diff --git a/src/audiosignal.cpp b/src/audiosignal.cpp
index f35db088e28ba5debd76ed3e89ef033d0e96bcdc..64a59c925727e1fe321c7d1c566fcdc7c4c7f65d 100644 (file)
--- a/src/audiosignal.cpp
+++ b/src/audiosignal.cpp
@@ -7,43 +7,43 @@
 #include <QList>
 
 
-AudioSignal::AudioSignal(QWidget *parent):QWidget(parent)
+AudioSignal::AudioSignal(QWidget *parent): QWidget(parent)
 {
-       //QVBoxLayout *vbox=new QVBoxLayout(this);
-       //label=new QLabel();
-       //vbox->addWidget(label);
-       setMaximumHeight(12);
-       col << Qt::green <<  Qt::green << Qt::green << Qt::green << Qt::green << Qt::green << Qt::green << Qt::green << Qt::green << Qt::green ;
-       col << Qt::yellow <<  Qt::yellow << Qt::yellow << Qt::yellow << Qt::yellow  ;
-       col << Qt::darkYellow << Qt::darkYellow << Qt::darkYellow;
-       col << Qt::red << Qt::red;
+    //QVBoxLayout *vbox=new QVBoxLayout(this);
+    //label=new QLabel();
+    //vbox->addWidget(label);
+    setMinimumHeight(10);
+    col << Qt::green <<  Qt::green << Qt::green << Qt::green << Qt::green << Qt::green << Qt::green << Qt::green << Qt::green << Qt::green ;
+    col << Qt::yellow <<  Qt::yellow << Qt::yellow << Qt::yellow << Qt::yellow  ;
+    col << Qt::darkYellow << Qt::darkYellow << Qt::darkYellow;
+    col << Qt::red << Qt::red;
 }
 
 
-void AudioSignal::showAudio(QByteArray arr)
+void AudioSignal::showAudio(const QByteArray arr)
 {
-       channels=arr;
-       update();
+    channels = arr;
+    update();
 }
-void AudioSignal::paintEvent(QPaintEvent* e)
+void AudioSignal::paintEvent(QPaintEvent* /*e*/)
 {
     QPainter p(this);
     //p.begin();
-       //p.fillRect(0,0,(unsigned char)channels[0]*width()/255,height()/2,QBrush(Qt::SolidPattern));
-       //p.fillRect(0,height()/2,(unsigned char)channels[1]*width()/255,height()/2,QBrush(Qt::SolidPattern));
-       int numchan=channels.size();
-       for (int i=0;i<numchan;i++){
-               int maxx=(unsigned char)channels[i]*width()/255;
-               int xdelta=width()/20;
-               int y1=height()*i/numchan;
-               int _h=height()/numchan-1;
-               for (int x=0;x<20;x++){
-                               if (maxx>0){
-                               p.fillRect(x*xdelta,y1,maxx>xdelta?xdelta-1:maxx-1,_h,QBrush(col.at(x),Qt::SolidPattern));
-                               maxx-=xdelta;
-                               }
-               }
-       }
+    //p.fillRect(0,0,(unsigned char)channels[0]*width()/255,height()/2,QBrush(Qt::SolidPattern));
+    //p.fillRect(0,height()/2,(unsigned char)channels[1]*width()/255,height()/2,QBrush(Qt::SolidPattern));
+    int numchan = channels.size();
+    for (int i = 0; i < numchan; i++) {
+        int maxx = (unsigned char)channels[i] * width() / 255;
+        int xdelta = width() / 20;
+        int y1 = height() * i / numchan;
+        int _h = height() / numchan - 1;
+        for (int x = 0; x < 20; x++) {
+            if (maxx > 0) {
+                p.fillRect(x * xdelta, y1, maxx > xdelta ? xdelta - 1 : maxx - 1, _h, QBrush(col.at(x), Qt::SolidPattern));
+                maxx -= xdelta;
+            }
+        }
+    }
     p.end();
 }
 #include "audiosignal.moc"