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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/10 17:12:19

Modified files:
        resources      : keymap.xml 
        src/commands   : TrackPan.cpp TrackPan.h 

Log message:
        * << P >> is used for reset pan now

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/TrackPan.cpp?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/TrackPan.h?cvsroot=traverso&r1=1.4&r2=1.5

Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- resources/keymap.xml        9 Apr 2007 15:22:01 -0000       1.48
+++ resources/keymap.xml        10 Apr 2007 17:12:19 -0000      1.49
@@ -30,12 +30,7 @@
                </keyfact>
                <keyfact type="FKEY" key1="F5" >
                        <Objects>
-                               <Object objectname="ProjectManager" 
slotsignature="undo" modes="All" instantanious="0" />
-                       </Objects>
-               </keyfact>
-               <keyfact type="FKEY" key1="F6" >
-                       <Objects>
-                               <Object objectname="ProjectManager" 
slotsignature="redo" modes="All" instantanious="0" />
+                               <Object objectname="TrackView" 
slotsignature="add_new_plugin" modes="All" sortorder="40" instantanious="0" />
                        </Objects>
                </keyfact>
                <keyfact type="FKEY" key1="LARROW" >
@@ -95,6 +90,7 @@
                                <Object objectname="Project" 
slotsignature="select" modes="All" instantanious="0" />
                                <Object objectname="AudioClip" modes="All" 
sortorder="5" submenu="Selection" pluginname="TraversoCommands" 
commandname="ClipSelectionSelect" arguments="select_clip" />
                                <Object objectname="MoveClip" 
slotsignature="prev_snap_pos" modes="All" sortorder="1" instantanious="1" />
+                               <Object objectname="DragMarker" 
slotsignature="move_left" modes="All" sortorder="1" instantanious="1" />
                        </Objects>
                </keyfact>
                <keyfact type="FKEY" key1="SPACE" >
@@ -151,6 +147,7 @@
                                <Object objectname="FadeView" 
slotsignature="edit_properties" modes="All" instantanious="0" />
                                <Object objectname="SpectralMeterView" 
slotsignature="edit_properties" modes="All" instantanious="0" />
                                <Object objectname="AudioClip" modes="All" 
sortorder="18" pluginname="TraversoCommands" 
commandname="AudioClipExternalProcessing" instantanious="0" />
+                               <Object objectname="TimeLineView" 
slotsignature="Interface::show_marker_dialog" modes="All" instantanious="0" />
                        </Objects>
                </keyfact>
                <keyfact type="FKEY" key1="N" >
@@ -227,6 +224,7 @@
                        <Objects>
                                <Object objectname="AudioClipView" 
slotsignature="select_fade_shape" modes="All" sortorder="32" submenu="Fade 
In/Out" instantanious="0" />
                                <Object objectname="MoveClip" 
slotsignature="next_snap_pos" modes="All" sortorder="1" instantanious="1" />
+                               <Object objectname="DragMarker" 
slotsignature="move_right" modes="All" sortorder="1" instantanious="1" />
                        </Objects>
                </keyfact>
                
@@ -460,7 +458,7 @@
                </keyfact>
                <keyfact type="D_FKEY" key1="P" >
                        <Objects>
-                               <Object objectname="TrackView" 
slotsignature="add_new_plugin" modes="All" sortorder="40" instantanious="0" />
+                               <Object objectname="Track" modes="All" 
sortorder="22" pluginname="TraversoCommands" commandname="ResetTrackPan" 
arguments="0" />
                        </Objects>
                </keyfact>
                <keyfact type="D_FKEY" key1="R" >
@@ -479,7 +477,6 @@
                <keyfact type="D_FKEY" key1="MouseButtonLeft" >
                        <Objects>
                                <Object objectname="CurveView" 
slotsignature="add_node" modes="All" instantanious="0" />
-                               <Object objectname="TrackPanelGain" modes="All" 
sortorder="30" pluginname="TraversoCommands" commandname="ResetGain" 
arguments="0.5" />
                        </Objects>
                </keyfact>
                <keyfact type="D_FKEY" key1="HOME" >

Index: src/commands/TrackPan.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/TrackPan.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/commands/TrackPan.cpp   16 Mar 2007 00:09:43 -0000      1.7
+++ src/commands/TrackPan.cpp   10 Apr 2007 17:12:19 -0000      1.8
@@ -28,11 +28,23 @@
 // in case we run with memory leak detection enabled!
 #include "Debugger.h"
 
-TrackPan::TrackPan(Track* track)
-       : Command(track, tr("Track Pan"))
+TrackPan::TrackPan(Track* track, QVariantList args)
+       : Command(track, "")
 {
         m_track = track;
         m_song = track->get_song();
+       
+       QString des;
+       
+       if (args.size() > 0) {
+               newPan = args.at(0).toDouble();
+               des = tr("Track Pan: %1").arg("Reset");
+               origPan = m_track->get_pan();
+       } else {
+               des = tr("Track Pan");
+       }
+       
+       setText(des);
 }
 
 

Index: src/commands/TrackPan.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/TrackPan.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/commands/TrackPan.h     16 Mar 2007 00:09:43 -0000      1.4
+++ src/commands/TrackPan.h     10 Apr 2007 17:12:19 -0000      1.5
@@ -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: TrackPan.h,v 1.4 2007/03/16 00:09:43 r_sijrier Exp $
+    $Id: TrackPan.h,v 1.5 2007/04/10 17:12:19 r_sijrier Exp $
 */
 
 #ifndef TRACKPAN_H
@@ -31,7 +31,7 @@
 class TrackPan : public Command
 {
 public :
-        TrackPan(Track* track);
+       TrackPan(Track* track, QVariantList args);
 
         int begin_hold();
         int finish_hold();