[Traverso-commit] traverso resources/keymap.xml src/traverso/song...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/11 23:07:32

Modified files:
        resources      : keymap.xml 
        src/traverso/songcanvas: AudioClipView.cpp AudioClipView.h 

Log message:
        added << F >> for resetting fade in/out

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/AudioClipView.h?cvsroot=traverso&r1=1.18&r2=1.19

Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- resources/keymap.xml        11 Apr 2007 22:46:36 -0000      1.51
+++ resources/keymap.xml        11 Apr 2007 23:07:32 -0000      1.52
@@ -489,6 +489,11 @@
                                <Object objectname="AudioClipView" 
mousehint="LRUD" modes="All" sortorder="8" pluginname="TraversoCommands" 
commandname="MoveClip"  arguments="move_to_end" />
                        </Objects>
                </keyfact>
+               <keyfact type="D_FKEY" key1="F" >
+                       <Objects>
+                               <Object objectname="AudioClipView" 
slotsignature="reset_fade" modes="All" sortorder="37" submenu="Fade In/Out" 
instantanious="0" />
+                       </Objects>
+               </keyfact>
                
                
                

Index: src/traverso/songcanvas/AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- src/traverso/songcanvas/AudioClipView.cpp   11 Apr 2007 15:56:35 -0000      
1.37
+++ src/traverso/songcanvas/AudioClipView.cpp   11 Apr 2007 23:07:32 -0000      
1.38
@@ -623,6 +623,19 @@
        return 0;
 }
 
+Command * AudioClipView::reset_fade()
+{
+       Q_ASSERT(m_song);
+       int x = (int) ( cpointer().scene_pos() - scenePos()).x();
+
+       if (x < (m_boundingRect.width() / 2)) {
+               return m_clip->reset_fade_in();
+       } else {
+               return m_clip->reset_fade_out();
+       }
+
+       return 0;
+}
 
 void AudioClipView::position_changed()
 {
@@ -729,4 +742,3 @@
 
 
 //eof
-

Index: src/traverso/songcanvas/AudioClipView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/AudioClipView.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/traverso/songcanvas/AudioClipView.h     10 Apr 2007 17:11:48 -0000      
1.18
+++ src/traverso/songcanvas/AudioClipView.h     11 Apr 2007 23:07:32 -0000      
1.19
@@ -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: AudioClipView.h,v 1.18 2007/04/10 17:11:48 r_sijrier Exp $
+$Id: AudioClipView.h,v 1.19 2007/04/11 23:07:32 r_sijrier Exp $
 */
 
 #ifndef AUDIO_CLIP_VIEW_H
@@ -44,6 +44,7 @@
        Q_CLASSINFO("fade_range", tr("In/Out: Range"))
        Q_CLASSINFO("select_fade_in_shape", tr("In: Select shape"));
        Q_CLASSINFO("select_fade_out_shape", tr("Out: Select shape"));
+       Q_CLASSINFO("reset_fade", tr("In/Out: Reset"));
 
 public:
        AudioClipView(SongView* view, TrackView* parent, AudioClip* clip);
@@ -120,6 +121,7 @@
        Command* fade_range();
        Command* select_fade_in_shape();
        Command* select_fade_out_shape();
+       Command* reset_fade();
        
 private slots:
        void update_progress_info(int progress);