fix

1 files changed, 11 insertions, 16 deletions

diff --git a/noncore/multimedia/opierec/vumeter.cpp b/noncore/multimedia/opierec/vumeter.cpp
index c28dbe4..6a3f7c2 100644
--- a/noncore/multimedia/opierec/vumeter.cpp
+++ b/noncore/multimedia/opierec/vumeter.cpp
@@ -1,33 +1,33 @@
 //************************************************************
 //=======-VUMeter
 /////     copyright            : (C) 1999 by Martin Lorenz
 //////    email                : lorenz@ch.tum.de
+// also copyright 2005 lpotter@trolltech.com
 
 #include "vumeter.h"
 #include "qtrec.h"
 
 #include <qpe/config.h>
 #include <qtimer.h>
 #include <qdrawutl.h>
 
-#include <opie2/odebug.h>
-using namespace Opie::Core;
-
 #include <math.h>
 
 VUMeter::VUMeter(QWidget *parent, const char *name, const int tr)
    : QWidget( parent, name )
 {
-   int tracks = tr;
+   tracks = tr;
    int i;
 
    qWarning("initialize peakvalues");
    for(i = 0; i < tracks + 2; i++) {
       peak[i] = hold[i] = 32768;
       holdTime[i] = 20;
    }
 
+   colorScheme = 0;
+   
    readConf();
    
    //rainbow effect
    if( colorScheme == 0 ) {
@@ -38,9 +38,8 @@ VUMeter::VUMeter(QWidget *parent, const char *name, const int tr)
       int j = para.leds - 4;
       for( i = 0; i < para.leds; i++) {
          int i16 = (j);
          color[i] = QColor(( 15 - i16) * 16, 255, 255, QColor::Hsv);
-//         owarn << color[i].name() << oendl;
          j--;
       }
    }
       
@@ -51,13 +50,12 @@ VUMeter::VUMeter(QWidget *parent, const char *name, const int tr)
    connect(vuTimer, SIGNAL(timeout()), this , SLOT(timeSlot()));
 }
 
 VUMeter::~VUMeter(){
-   writeConf();
+//   writeConf();
 }
 
 void VUMeter::update(){
-//   qWarning("vumeter update");
    vuTimer->start(para.update, FALSE);
    if (para.onOff) {
       disconnect(vuTimer, SIGNAL(timeout()), this , SLOT(timeSlot()));
       connect(vuTimer, SIGNAL(timeout()), this , SLOT(timeSlot()));
@@ -68,18 +66,17 @@ void VUMeter::update(){
 }
 
 void VUMeter::slotOn() {
    connect(vuTimer, SIGNAL(timeout()), this , SLOT(timeSlot()));
-   para.onOff=true;
+   para.onOff = true;
 }
 
 void VUMeter::slotOff() {
    disconnect(vuTimer, SIGNAL(timeout()), this , SLOT(timeSlot()));
-   para.onOff=false;
+   para.onOff = false;
 }
 
 void VUMeter::slotProps() {
-   qDebug("VU-Dialog");
 }
 
 void VUMeter::paintEvent(QPaintEvent* e) {
    Q_UNUSED(e);
@@ -97,11 +94,11 @@ void VUMeter::resizeEvent(QResizeEvent* event) {
    resize();
 }
 
 void VUMeter::resize() {
-   qWarning("resize VUMeter painting");
+//   qWarning("resize VUMeter painting");
    if(buffer == 0)
-      qDebug("Dude NULL pixmap buffer!");
+      qWarning("Dude NULL pixmap buffer!");
 
    buffer->fill(black);
 
    x = width() - 7; y = height() - 12;
@@ -120,8 +117,9 @@ void VUMeter::resize() {
       qDrawShadePanel ( &painter, 0,0, width(),height(), colorGroup(), TRUE, 2, 0);
       if (2 * dy - 2 == 10) textOffset = 1;
       font = painter.font(); font.setPointSize( 2 * dy - 2);
       painter.setFont(font);
+
       for(i = 0; i < tracks + 2; i++) {
          painter.setPen(green); painter.setBrush(green);
          str.sprintf("%d",i+1);
          if (i == tracks) str.sprintf("L");
@@ -130,17 +128,16 @@ void VUMeter::resize() {
          painter.drawRect(ox + dx * i, oy + dy * (para.leds) - 2, sx, 2 * dy - 1);
          painter.setPen(black);
          painter.drawText(textOffset + ox + dx * i, oy + dy * (para.leds) - 2, sx, 2 * dy, AlignCenter, str);
       }
+      
       painter.end();
       paint();
    }
 }
 
 void VUMeter::timeSlot() {
    int i;
-// getting stuck here
-//    qDebug("calling paint() from timeSlot()\n");
    paint();
    for(i = 0; i < tracks + 2; i++) {
       peak[i] /= para.resoFactor;
    }
@@ -179,10 +176,8 @@ void VUMeter::paint() {
 }
 
 void VUMeter::setPeak(int a[]) {
    int i;
-//	qDebug("set peak int");
-//    cerr<<"setting peak\n";
    for(i = 0; i < tracks + 2; i++) {
       if (a[i] > i_peak[i]) i_peak[i] = a[i];
       if (a[i] > i_hold[i]) { i_hold[i] = a[i]; holdTime[i] = para.hold; }
    }