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

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/06/03 22:41:58

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

Log message:
        more key changes! <<W>> = work-to-start, <<SHIFT>> = play-to-start 
<<V>> does nothing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.h?cvsroot=traverso&r1=1.31&r2=1.32

Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- resources/keymap.xml        2 Jun 2007 23:02:32 -0000       1.78
+++ resources/keymap.xml        3 Jun 2007 22:41:57 -0000       1.79
@@ -523,12 +523,12 @@
                </keyfact>
                <keyfact type="D_FKEY" key1="W">
                        <Objects>
-                               <Object objectname="SongView" 
slotsignature="playhead_to_workcursor" modes="All" sortorder="12" 
submenu="Playhead" instantanious="0" />
+                               <Object objectname="SongView" 
slotsignature="goto_begin" modes="All" sortorder="5" submenu="Work Cursor" 
instantanious="0" />
                        </Objects>
                </keyfact>
-               <keyfact type="D_FKEY" key1="V">
+               <keyfact type="D_FKEY" key1="SHIFT">
                        <Objects>
-                               <Object objectname="SongView" 
slotsignature="center_playhead" modes="All" sortorder="15" submenu="Playhead" 
instantanious="0" />
+                               <Object objectname="SongView" 
slotsignature="play_to_begin" modes="All" sortorder="1" submenu="Playhead" 
instantanious="0" />
                        </Objects>
                </keyfact>
 

Index: src/traverso/songcanvas/SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- src/traverso/songcanvas/SongView.cpp        2 Jun 2007 23:02:33 -0000       
1.68
+++ src/traverso/songcanvas/SongView.cpp        3 Jun 2007 22:41:58 -0000       
1.69
@@ -507,6 +507,14 @@
        return 0;
 }
 
+Command * SongView::play_to_begin( )
+{
+       m_playCursor->setPos(0, 0);
+       m_song->set_transport_pos(0);
+
+       return 0;
+}
+
 Command * SongView::play_cursor_move( )
 {
        return new PlayHeadMove(m_playCursor, this);

Index: src/traverso/songcanvas/SongView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- src/traverso/songcanvas/SongView.h  2 Jun 2007 23:02:33 -0000       1.31
+++ src/traverso/songcanvas/SongView.h  3 Jun 2007 22:41:58 -0000       1.32
@@ -55,6 +55,7 @@
        Q_CLASSINFO("shuttle", tr("Shuttle"))
        Q_CLASSINFO("goto_begin", tr("To start"))
        Q_CLASSINFO("goto_end", tr("To end"))
+       Q_CLASSINFO("play_to_begin", tr("Playhead: To Start"))
        Q_CLASSINFO("play_cursor_move", tr("Playhead: Move"))
        Q_CLASSINFO("work_cursor_move", tr("Workcursor: Move"))
        Q_CLASSINFO("add_marker", tr("Add Marker"))
@@ -141,6 +142,7 @@
         Command* shuttle();
         Command* goto_begin();
         Command* goto_end();
+       Command* play_to_begin();
        Command* play_cursor_move();
        Command* work_cursor_move();
        Command* add_marker();