summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opierec/vumeter.cpp19
1 files changed, 6 insertions, 13 deletions
diff --git a/noncore/multimedia/opierec/vumeter.cpp b/noncore/multimedia/opierec/vumeter.cpp
index 0edc806..c28dbe4 100644
--- a/noncore/multimedia/opierec/vumeter.cpp
+++ b/noncore/multimedia/opierec/vumeter.cpp
@@ -25,29 +25,24 @@ VUMeter::VUMeter(QWidget *parent, const char *name, const int tr)
25 for(i = 0; i < tracks + 2; i++) { 25 for(i = 0; i < tracks + 2; i++) {
26 peak[i] = hold[i] = 32768; 26 peak[i] = hold[i] = 32768;
27 holdTime[i] = 20; 27 holdTime[i] = 20;
28 } 28 }
29 29
30 readConf(); 30 readConf();
31 31
32// QColor c;
33// c.setHsv( (x * 255)/w, 255, 255 );// rainbow effect
34// c.setRgb( 255, 0, 255);
35// p.setPen(c);
36
37 //rainbow effect 32 //rainbow effect
38 if( colorScheme = 0 ) { 33 if( colorScheme == 0 ) {
39 for( i = 0; i < para.leds; i++) color[i] = green; 34 for( i = 0; i < para.leds; i++) color[i] = green;
40 color[0] = color[1] = red; 35 color[0] = color[1] = red;
41 color[2] = color[3] = color[4] = color[5] = yellow; 36 color[2] = color[3] = color[4] = color[5] = yellow;
42 } else { 37 } else {
43 int j = para.leds - 4; 38 int j = para.leds - 4;
44 for( i = 0; i < para.leds; i++) { 39 for( i = 0; i < para.leds; i++) {
45 int i16 = (j);// & 15; 40 int i16 = (j);
46 color[i] = QColor(( 15 - i16) * 16, 255, 255, QColor::Hsv); 41 color[i] = QColor(( 15 - i16) * 16, 255, 255, QColor::Hsv);
47 owarn << color[i].name() << oendl; 42// owarn << color[i].name() << oendl;
48 j--; 43 j--;
49 } 44 }
50 } 45 }
51 46
52 buffer = new QPixmap(); 47 buffer = new QPixmap();
53 setBackgroundMode(NoBackground); 48 setBackgroundMode(NoBackground);
@@ -58,13 +53,13 @@ VUMeter::VUMeter(QWidget *parent, const char *name, const int tr)
58 53
59VUMeter::~VUMeter(){ 54VUMeter::~VUMeter(){
60 writeConf(); 55 writeConf();
61} 56}
62 57
63void VUMeter::update(){ 58void VUMeter::update(){
64 qWarning("vumeter update"); 59// qWarning("vumeter update");
65 vuTimer->start(para.update, FALSE); 60 vuTimer->start(para.update, FALSE);
66 if (para.onOff) { 61 if (para.onOff) {
67 disconnect(vuTimer, SIGNAL(timeout()), this , SLOT(timeSlot())); 62 disconnect(vuTimer, SIGNAL(timeout()), this , SLOT(timeSlot()));
68 connect(vuTimer, SIGNAL(timeout()), this , SLOT(timeSlot())); 63 connect(vuTimer, SIGNAL(timeout()), this , SLOT(timeSlot()));
69 } else { 64 } else {
70 disconnect(vuTimer, SIGNAL(timeout()), this , SLOT(timeSlot())); 65 disconnect(vuTimer, SIGNAL(timeout()), this , SLOT(timeSlot()));
@@ -219,15 +214,13 @@ void VUMeter::readConf() {
219 para.update = config.readNumEntry("Update", 25); 214 para.update = config.readNumEntry("Update", 25);
220 para.hold = config.readNumEntry("Hold", 20); 215 para.hold = config.readNumEntry("Hold", 20);
221 para.reso = config.readNumEntry("Resolution", 3); 216 para.reso = config.readNumEntry("Resolution", 3);
222 para.leds = config.readNumEntry("LEDs", 20); 217 para.leds = config.readNumEntry("LEDs", 20);
223 para.resoFactor = pow(2, para.reso / 6.0); 218 para.resoFactor = pow(2, para.reso / 6.0);
224 219
225 colorScheme = config.readNumEntry("colorScheme", 0); 220 colorScheme = config.readNumEntry("colorScheme", 1);
226// update();
227// dia->updatePara();
228} 221}
229 222
230 223
231void VUMeter::writeConf() { 224void VUMeter::writeConf() {
232 Config config("OpieRec"); 225 Config config("OpieRec");
233 config.setGroup("VU-Meter"); 226 config.setGroup("VU-Meter");