[Traverso-commit] traverso/src base.pri traverso/songcanvas/Audio...

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/05/06 18:06:14

Modified files:
        src            : base.pri 
        src/traverso/songcanvas: AudioClipView.cpp 

Log message:
        OS X related fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/base.pri?cvsroot=traverso&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.57&r2=1.58

Patches:
Index: base.pri
===================================================================
RCS file: /sources/traverso/traverso/src/base.pri,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- base.pri    6 May 2007 13:29:40 -0000       1.28
+++ base.pri    6 May 2007 18:06:14 -0000       1.29
@@ -23,9 +23,12 @@
 DEFINES += LV2_SUPPORT
 
 DEFINES += STATIC_BUILD
-DEFINES += PRECOMPILED_HEADER
 #DEFINES += USE_MEM_CHECKER
 
+!macx{
+       #DEFINES += PRECOMPILED_HEADER
+}
+
 #QMAKE_CXXFLAGS +=  -fstack-protector-all
 
 #

Index: traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- traverso/songcanvas/AudioClipView.cpp       6 May 2007 00:02:38 -0000       
1.57
+++ traverso/songcanvas/AudioClipView.cpp       6 May 2007 18:06:14 -0000       
1.58
@@ -384,6 +384,16 @@
                float scaleFactor = ( (float) height * 0.90 / 
(Peak::MAX_DB_VALUE * 2)) * m_clip->get_gain() * m_clip->get_norm_factor();
                float ytrans;
                
+               if (m_mergedView) {
+                       if (m_classicView) {
+                               ytrans = (height / 2) * channels;
+                               scaleFactor *= channels;
+                       } else {
+                               ytrans = height * channels;
+                               scaleFactor *= channels;
+                       }
+               }
+
                // Draw channel seperator horizontal lines, if needed.
                if (channels >= 2 && ! m_mergedView && m_classicView && chan 
>=1 ) {
                        p->save();
@@ -408,7 +418,7 @@
                        int bufferPos = 0;
                        
                        ytrans = (height / 2) + (chan * height);
-                       p->setMatrix(matrix().translate(1, ytrans).scale(1, 
scaleFactor), true);
+                       p->setMatrix(matrix().translate(1, ytrans), true);
                        
                        if (m_clip->is_selected()) {
                                
p->setPen(themer()->get_color("AudioClip:channelseperator:selected"));
@@ -419,7 +429,7 @@
                        p->drawLine(xstart, 0, xstart + pixelcount, 0);
                        
                        for (int x = xstart; x < (pixelcount+xstart); x++) {
-                               polygon.append( QPoint(x, mbuffer[bufferPos++]) 
);
+                               polygon.append( QPoint(x, scaleFactor * 
mbuffer[bufferPos++]) );
                        }
                        
                        if 
(themer()->get_property("AudioClip:wavemicroview:antialiased", 0).toInt()) {
@@ -458,19 +468,31 @@
                                
                                int range = pixelcount+xstart;
                                for (int x = xstart; x < range; x+=2) {
-                                       polygontop.append( QPointF(x, 
pixeldata[chan][bufferpos++]) );
-                                       polygonbottom.append( QPointF(x, - 
pixeldata[chan][bufferpos++]) );
+                                       polygontop.append( QPointF(x, 
scaleFactor * pixeldata[chan][bufferpos++]) );
+                                       polygonbottom.append( QPointF(x, 
-scaleFactor * pixeldata[chan][bufferpos++]) );
                                }
                                
                                path.addPolygon(polygontop);
                                path.lineTo(polygonbottom.last());
                                path.addPolygon(polygonbottom);
                                
+                               if (m_mergedView) {
+                                       ytrans = (height / 2) * channels;
+                               } else {
                                ytrans = (height / 2) + (chan * height);
+                               }
                        
                        } else {
+                               scaleFactor =  (float) height * 0.95 * 
m_clip->get_gain() * m_clip->get_norm_factor() / Peak::MAX_DB_VALUE;
+                               ytrans = height + (chan * height);
+               
+                               if (m_mergedView) {
+                                       ytrans = height * channels;
+                                       scaleFactor *= channels;
+                               }
+
                                for (int x = xstart; x < (pixelcount+xstart); 
x+=2) {
-                                       polygontop.append( QPointF(x, 
pixeldata[chan][bufferpos]) );
+                                       polygontop.append( QPointF(x, 
scaleFactor * pixeldata[chan][bufferpos]) );
                                        bufferpos += 2;
                                }
                                
@@ -478,21 +500,9 @@
                                path.addPolygon(polygontop);
                                path.lineTo(xstart, 0);
                                
-                               ytrans = height + (chan * height);
-                               scaleFactor =  (float) height * 0.95 * 
m_clip->get_gain() * m_clip->get_norm_factor() / Peak::MAX_DB_VALUE;
-                       }
-                       
-                       if (m_mergedView) {
-                               if (m_classicView) {
-                                       ytrans = (height / 2) * channels;
-                                       scaleFactor *= channels;
-                               } else {
-                                       ytrans = height * channels;
-                                       scaleFactor *= channels;
-                               }
                        }
                        
-                       p->setMatrix(matrix().translate(1, ytrans).scale(1, 
scaleFactor), true);
+                       p->setMatrix(matrix().translate(1, ytrans), true);
                        p->drawPath(path);      
                }