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

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/05/31 06:20:13

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

Log message:
        add 'Add Marker at Playhead', 'Playhead to Marker' commands for CTRL-M 
and < V > respectively.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.h?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.h?cvsroot=traverso&r1=1.10&r2=1.11

Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- resources/keymap.xml        31 May 2007 04:32:12 -0000      1.73
+++ resources/keymap.xml        31 May 2007 06:20:13 -0000      1.74
@@ -73,6 +73,7 @@
                <keyfact type="FKEY" key1="V" >
                        <Objects>
                                <Object objectname="SongView" 
slotsignature="touch_play_cursor" modes="All" sortorder="2" submenu="Playhead" 
instantanious="0" />
+                               <Object objectname="TimeLineView" 
slotsignature="playhead_to_marker" modes="All" sortorder="2" instantanious="0" 
/>
                        </Objects>
                </keyfact>
                <keyfact type="FKEY" key1="W" >
@@ -176,6 +177,8 @@
                                <Object objectname="FadeCurve" 
slotsignature="set_mode" modes="All" instantanious="0" />
                                <Object objectname="TimeLineView" 
slotsignature="add_marker" modes="All" instantanious="0" />
                                <Object objectname="SongView" 
slotsignature="add_marker" modes="All" sortorder="23" instantanious="0" />
+                               <Object objectname="TimeLineView" 
slotsignature="add_marker_at_playhead" modes="All" modifierkeys="CTRL" 
instantanious="0" />
+                               <Object objectname="SongView" 
slotsignature="add_marker_at_playhead" modes="All" sortorder="24" 
modifierkeys="CTRL" instantanious="0" />
                        </Objects>
                </keyfact>
                <keyfact type="FKEY" key1="L" >

Index: src/traverso/songcanvas/SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- src/traverso/songcanvas/SongView.cpp        31 May 2007 04:32:12 -0000      
1.66
+++ src/traverso/songcanvas/SongView.cpp        31 May 2007 06:20:13 -0000      
1.67
@@ -568,10 +568,14 @@
 
 Command * SongView::add_marker()
 {
-       stop_follow_play_head();
        return m_tlvp->get_timeline_view()->add_marker();
 }
 
+Command * SongView::add_marker_at_playhead()
+{
+       return m_tlvp->get_timeline_view()->add_marker_at_playhead();
+}
+
 Command * SongView::playhead_to_workcursor( )
 {
        nframes_t work = m_song->get_working_frame();

Index: src/traverso/songcanvas/SongView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/traverso/songcanvas/SongView.h  31 May 2007 04:32:12 -0000      1.29
+++ src/traverso/songcanvas/SongView.h  31 May 2007 06:20:13 -0000      1.30
@@ -58,6 +58,7 @@
        Q_CLASSINFO("play_cursor_move", tr("Playhead: Move"))
        Q_CLASSINFO("work_cursor_move", tr("Workcursor: Move"))
        Q_CLASSINFO("add_marker", tr("Add Marker"))
+       Q_CLASSINFO("add_marker_at_playhead", tr("Add Marker at Playhead"))
        Q_CLASSINFO("playhead_to_workcursor", tr("Playhead: To workcursor"))
        Q_CLASSINFO("center_playhead", tr("Playhead: Center"))
 
@@ -142,6 +143,7 @@
        Command* play_cursor_move();
        Command* work_cursor_move();
        Command* add_marker();
+       Command* add_marker_at_playhead();
        Command* playhead_to_workcursor();
        Command* center_playhead();
        

Index: src/traverso/songcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- src/traverso/songcanvas/TimeLineView.cpp    30 May 2007 06:05:06 -0000      
1.38
+++ src/traverso/songcanvas/TimeLineView.cpp    31 May 2007 06:20:13 -0000      
1.39
@@ -340,6 +340,18 @@
        
        nframes_t when = (uint) (point.x() * m_sv->scalefactor);
        
+       return add_marker_at(when);
+}
+
+Command* TimeLineView::add_marker_at_playhead()
+{
+       nframes_t when = m_sv->get_song()->get_transport_frame();
+       
+       return add_marker_at(when);
+}
+
+Command* TimeLineView::add_marker_at(nframes_t when)
+{
        CommandGroup* group = new CommandGroup(m_timeline, "");
 
        // check if it is the first marker added to the timeline
@@ -366,6 +378,18 @@
        return group;
 }
 
+Command* TimeLineView::playhead_to_marker()
+{
+       
update_softselected_marker(QPoint(cpointer().on_first_input_event_scene_x(), 
cpointer().on_first_input_event_scene_y()));
+
+       if (m_blinkingMarker) {
+               
m_sv->get_song()->set_transport_pos(m_blinkingMarker->get_marker()->get_when());
+               return 0;
+       }
+
+       return ie().did_not_implement();
+}
+
 Command* TimeLineView::remove_marker()
 {
        if (m_blinkingMarker) {

Index: src/traverso/songcanvas/TimeLineView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/traverso/songcanvas/TimeLineView.h      7 May 2007 18:14:38 -0000       
1.10
+++ src/traverso/songcanvas/TimeLineView.h      31 May 2007 06:20:13 -0000      
1.11
@@ -35,9 +35,11 @@
 {
         Q_OBJECT
        Q_CLASSINFO("add_marker", tr("Add Marker"))
+       Q_CLASSINFO("add_marker_at_playhead", tr("Add Marker at Playhead"))
        Q_CLASSINFO("remove_marker", tr("Remove Marker"))
        Q_CLASSINFO("drag_marker", tr("Drag Marker"))
        Q_CLASSINFO("clear_markers", tr("Clear all Markers"))
+       Q_CLASSINFO("playhead_to_marker", tr("Playhead to Marker"))
 
 public:
         TimeLineView(SongView* view);
@@ -61,6 +63,7 @@
 
        QHash<nframes_t, QString>       m_zooms;        
 
+       Command* add_marker_at(nframes_t when);
        void update_softselected_marker(QPoint pos);
        
        
@@ -69,9 +72,11 @@
        
 public slots:
        Command* add_marker();
+       Command* add_marker_at_playhead();
        Command* remove_marker();
        Command* drag_marker();
        Command* clear_markers();
+       Command* playhead_to_marker();
        
 private slots:
        void add_new_marker_view(Marker* marker);