[Traverso-commit] traverso/src core/AudioClip.cpp core/Peak.cpp t...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/10/16 21:53:05

Modified files:
        src/core       : AudioClip.cpp Peak.cpp 
        src/traverso/songcanvas: AudioClipView.cpp 

Log message:
        Fix 2 compile errors on windows
         - AudioClip.cpp: mempcpy() not supported on windows.
           (Any reason not to just use memcpy?)
         - Peak.cpp: fix an #else if ==> #elseif
        
        Fix a peak drawing problem I was seeing (peak area not entirely filled)
         - reverse the order of the bottom polygon
         - close the polygon with another lineTo()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.143&r2=1.144
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.105&r2=1.106

Patches:
Index: core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- core/AudioClip.cpp  13 Oct 2007 13:53:10 -0000      1.143
+++ core/AudioClip.cpp  16 Oct 2007 21:53:04 -0000      1.144
@@ -454,7 +454,7 @@
        } else {
                read_frames = 
m_readSource->file_read(m_song->renderDecodeBuffer, mix_pos, nframes);
                for (int chan=0; chan<bus->get_channel_count(); ++chan) {
-                       mempcpy(mixdown[chan], 
m_song->renderDecodeBuffer->destination[chan], nframes * 
sizeof(audio_sample_t));
+                       memcpy(mixdown[chan], 
m_song->renderDecodeBuffer->destination[chan], nframes * 
sizeof(audio_sample_t));
                }
        }
        

Index: core/Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- core/Peak.cpp       15 Oct 2007 21:12:22 -0000      1.65
+++ core/Peak.cpp       16 Oct 2007 21:53:04 -0000      1.66
@@ -142,7 +142,7 @@
                if (data->memory) {
                        PMESG3("Peak:: sucessfully mapped data into memory 
(%s)\n", QS_C(data->fileName));
                }
-#else if defined Q_WS_X11 || Q_WS_MAC
+#elseif (defined Q_WS_X11 || defined Q_WS_MAC)
                int offset = 0;
                int size = data->file.size();
                int pagesSize = getpagesize();

Index: traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- traverso/songcanvas/AudioClipView.cpp       16 Oct 2007 20:52:10 -0000      
1.105
+++ traverso/songcanvas/AudioClipView.cpp       16 Oct 2007 21:53:05 -0000      
1.106
@@ -481,12 +481,13 @@
                                int range = pixelcount;
                                for (int x = 0; x < range; x+=2) {
                                        m_polygontop.append( QPointF(x, 
scaleFactor * pixeldata[chan][bufferpos++]) );
-                                       m_polygonbottom.append( QPointF(x, 
-scaleFactor * pixeldata[chan][bufferpos++]) );
+                                       m_polygonbottom.append( 
QPointF(range-x, -scaleFactor * pixeldata[chan][range - bufferpos++]) );
                                }
                                
                                path.addPolygon(m_polygontop);
-                               path.lineTo(m_polygonbottom.last());
+                               path.lineTo(m_polygonbottom.first());
                                path.addPolygon(m_polygonbottom);
+                               path.lineTo(m_polygontop.first());
                                
                                if (m_mergedView) {
                                        ytrans = (height / 2) * channels;