[Traverso-commit] traverso src/commands/Fade.cpp src/commands/Fad...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/06/26 20:08:51

Modified files:
        src/commands   : Fade.cpp Fade.h 
        src/core       : AudioClip.cpp FadeCurve.cpp ViewPort.cpp 
        src/traverso/songcanvas: SongView.cpp 
        .              : TODO 

Log message:
        * use holdcursor for setting Fade range 
        * Fix cursor issue when setting cursor during hold command (due new 
canvas item added)
        * default to fast fade type, mode long.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Fade.cpp?cvsroot=traverso&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Fade.h?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FadeCurve.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ViewPort.cpp?cvsroot=traverso&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/traverso/TODO?cvsroot=traverso&r1=1.10&r2=1.11

Patches:
Index: src/commands/Fade.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Fade.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/commands/Fade.cpp       26 Jun 2007 19:06:42 -0000      1.16
+++ src/commands/Fade.cpp       26 Jun 2007 20:08:51 -0000      1.17
@@ -30,6 +30,8 @@
 #include <FadeView.h>
 #include <Peak.h>
 #include <Song.h>
+#include "Project.h"
+#include "ProjectManager.h"
                
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
@@ -77,6 +79,7 @@
 
 int FadeRange::finish_hold()
 {
+       QCursor::setPos(m_mousePos);
        return 1;
 }
 
@@ -101,6 +104,16 @@
        undo_action();
 }
 
+void FadeRange::set_cursor_shape(int useX, int useY)
+{
+       Q_UNUSED(useX);
+       Q_UNUSED(useY);
+       
+       m_mousePos = QCursor::pos();
+       
+       cpointer().get_viewport()->set_holdcursor(":/cursorHoldLr");
+}
+
 
 int FadeRange::jog()
 {
@@ -113,6 +126,8 @@
        
        m_curve->set_range( newFade );
 
+       cpointer().get_viewport()->set_holdcursor_text(frame_to_ms_3(newFade, 
pm().get_project()->get_rate()));
+       
        return 1;
 }
 

Index: src/commands/Fade.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Fade.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/commands/Fade.h 14 May 2007 22:45:06 -0000      1.9
+++ src/commands/Fade.h 26 Jun 2007 20:08:51 -0000      1.10
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: Fade.h,v 1.9 2007/05/14 22:45:06 benjie Exp $
+$Id: Fade.h,v 1.10 2007/06/26 20:08:51 r_sijrier Exp $
 */
 
 #ifndef FADE_H
@@ -47,11 +47,14 @@
 
         int jog();
 
+       void set_cursor_shape(int useX, int useY);
+
 private :
         int origX;
         int m_direction;
         double origFade;
         double newFade;
+       QPoint  m_mousePos;
 
        FadeCurve*      m_curve;
 };

Index: src/core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- src/core/AudioClip.cpp      25 Jun 2007 13:32:28 -0000      1.109
+++ src/core/AudioClip.cpp      26 Jun 2007 20:08:51 -0000      1.110
@@ -947,7 +947,7 @@
 void AudioClip::create_fade_in( )
 {
        fadeIn = new FadeCurve(this, m_song, "FadeIn");
-       fadeIn->set_shape("Linear");
+       fadeIn->set_shape("Fast");
        fadeIn->set_history_stack(get_history_stack());
        THREAD_SAVE_INVOKE_AND_EMIT_SIGNAL(this, fadeIn, 
private_add_fade(FadeCurve*), fadeAdded(FadeCurve*));
 }
@@ -955,7 +955,7 @@
 void AudioClip::create_fade_out( )
 {
        fadeOut = new FadeCurve(this, m_song, "FadeOut");
-       fadeOut->set_shape("Linear");
+       fadeOut->set_shape("Fast");
        fadeOut->set_history_stack(get_history_stack());
        THREAD_SAVE_INVOKE_AND_EMIT_SIGNAL(this, fadeOut, 
private_add_fade(FadeCurve*), fadeAdded(FadeCurve*));
 }

Index: src/core/FadeCurve.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FadeCurve.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/core/FadeCurve.cpp      30 May 2007 13:14:46 -0000      1.19
+++ src/core/FadeCurve.cpp      26 Jun 2007 20:08:51 -0000      1.20
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: FadeCurve.cpp,v 1.19 2007/05/30 13:14:46 r_sijrier Exp $
+$Id: FadeCurve.cpp,v 1.20 2007/06/26 20:08:51 r_sijrier Exp $
 */
  
 #include "FadeCurve.h"
@@ -57,7 +57,8 @@
        
        m_bendFactor = 0.5;
        m_strenghtFactor = 1;
-       m_mode = m_raster = 0;
+       m_mode = 2;
+       m_raster = 0;
        m_bypass = false;
        
        init();

Index: src/core/ViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ViewPort.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/core/ViewPort.cpp       7 May 2007 21:29:07 -0000       1.21
+++ src/core/ViewPort.cpp       26 Jun 2007 20:08:51 -0000      1.22
@@ -146,6 +146,13 @@
                        
itemsUnderCursor.first()->setCursor(itemsUnderCursor.first()->cursor());
                }
                QApplication::sendEvent(scene(), &mouseEvent);
+       } else {
+               // It can happen that a cursor is set for a newly created 
viewitem
+               // but we don't want that when the holdcursor is set!
+               // So force it back to be a blankcursor.
+               if (m_holdcursor->isVisible() && viewport()->cursor().shape() 
!= Qt::BlankCursor) {
+                       viewport()->setCursor(Qt::BlankCursor);
+               }
        }
 
 //     QGraphicsView::mouseMoveEvent(event);

Index: src/traverso/songcanvas/SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- src/traverso/songcanvas/SongView.cpp        21 Jun 2007 14:31:11 -0000      
1.70
+++ src/traverso/songcanvas/SongView.cpp        26 Jun 2007 20:08:51 -0000      
1.71
@@ -602,6 +602,10 @@
        m_song->set_transport_pos( work );
        m_playCursor->setPos(work / scalefactor, 0);
 
+       if (!m_song->is_transport_rolling()) {
+               center();
+       }
+
        return (Command*) 0;
 }
 

Index: TODO
===================================================================
RCS file: /sources/traverso/traverso/TODO,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- TODO        26 Jun 2007 18:07:57 -0000      1.10
+++ TODO        26 Jun 2007 20:08:51 -0000      1.11
@@ -6,12 +6,8 @@
 
 * add docs for preparing pc for realtime use! (limits.conf stuff)
 
-* sometimes audible glitch when playing over splitpoint..
-
 * Curve copy should not use the same id!!!!!!
 
-* when changing the width of fades, the cursor should remain static (as in 
gain)
-
 * libsndfile:
        How to record to files larger 4 GB
        Sector misalignment, how to handle.