[Traverso-commit] traverso AUTHORS src/traverso/songcanvas/AudioC...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/05/15 06:53:01

Modified files:
        .              : AUTHORS 
        src/traverso/songcanvas: AudioClipView.cpp 

Log message:
        use on_first_input_event for fade range, reset.  fix a couple of 
compile warnings, etc...   :)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/AUTHORS?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.64&r2=1.65

Patches:
Index: AUTHORS
===================================================================
RCS file: /sources/traverso/traverso/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AUTHORS     20 Apr 2006 14:48:52 -0000      1.1
+++ AUTHORS     15 May 2007 06:53:00 -0000      1.2
@@ -1,6 +1,7 @@
 Traverso Developers
 =================
 Remon Sijrier ( remon at vt dot shuis dot tudelft dot nl ) - Netherlands - 
Developer
+Ben Levitt ( levittben at yahoo dot com ) - USA - Developer
 
 
 Past Developers/Contributors (These are developers before the fork from Protux 
project)

Index: src/traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- src/traverso/songcanvas/AudioClipView.cpp   14 May 2007 15:04:06 -0000      
1.64
+++ src/traverso/songcanvas/AudioClipView.cpp   15 May 2007 06:53:00 -0000      
1.65
@@ -250,7 +250,7 @@
        // boundary checking, important for microview only, macroview needs the 
additional
        // pixels to paint the waveform correctly
        if ( microView && ((xstart + pixelcount) > m_boundingRect.width()) ) {
-               pixelcount = m_boundingRect.width() - xstart;
+               pixelcount = (int) m_boundingRect.width() - xstart;
        }
        int channels = m_clip->get_channels();
        int peakdatacount = microView ? pixelcount : pixelcount * 2;
@@ -433,7 +433,7 @@
                        p->drawLine(xstart, 0, xstart + pixelcount, 0);
                        
                        for (int x = xstart; x < (pixelcount+xstart); x++) {
-                               polygon.append( QPoint(x, scaleFactor * 
mbuffer[bufferPos++]) );
+                               polygon.append( QPoint(x, (int) (scaleFactor * 
mbuffer[bufferPos++])) );
                        }
                        
                        if 
(themer()->get_property("AudioClip:wavemicroview:antialiased", 0).toInt()) {
@@ -627,7 +627,7 @@
 Command * AudioClipView::fade_range()
 {
        Q_ASSERT(m_song);
-       int x = (int) ( cpointer().scene_pos() - scenePos()).x();
+       int x = (int) cpointer().on_first_input_event_scene_x() - 
scenePos().x();
 
        if (x < (m_boundingRect.width() / 2)) {
                return m_clip->clip_fade_in();
@@ -641,7 +641,7 @@
 Command * AudioClipView::reset_fade()
 {
        Q_ASSERT(m_song);
-       int x = (int) ( cpointer().scene_pos() - scenePos()).x();
+       int x = (int) cpointer().on_first_input_event_scene_x() - 
scenePos().x();
 
        if (x < (m_boundingRect.width() / 2)) {
                return m_clip->reset_fade_in();