[Traverso-commit] traverso resources/keymap.xml src/core/Song.cpp...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/04/04 02:24:38

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

Log message:
        Changed Views to View, moved playhead_to_workcursor from Song to 
SongView

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.h?cvsroot=traverso&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.cpp?cvsroot=traverso&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/SongView.h?cvsroot=traverso&r1=1.16&r2=1.17

Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- resources/keymap.xml        2 Apr 2007 04:52:49 -0000       1.42
+++ resources/keymap.xml        4 Apr 2007 02:24:38 -0000       1.43
@@ -65,7 +65,7 @@
                </keyfact>
                <keyfact type="FKEY" key1="W" >
                        <Objects>
-                               <Object objectname="Song" 
slotsignature="playhead_to_workcursor" modes="All" sortorder="8" 
instantanious="0" />
+                               <Object objectname="SongView" 
slotsignature="playhead_to_workcursor" modes="All" sortorder="8" 
instantanious="0" />
                        </Objects>
                </keyfact>
                <keyfact type="FKEY" key1="HOME" >

Index: src/core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- src/core/Song.cpp   4 Apr 2007 00:30:38 -0000       1.74
+++ src/core/Song.cpp   4 Apr 2007 02:24:38 -0000       1.75
@@ -880,13 +880,6 @@
        return m_acmanager->get_last_frame();
 }
 
-Command * Song::playhead_to_workcursor( )
-{
-       set_transport_pos( workingFrame );
-
-       return (Command*) 0;
-}
-
 void Song::private_add_track(Track* track)
 {
        m_tracks.append(track);

Index: src/core/Song.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- src/core/Song.h     3 Apr 2007 14:18:54 -0000       1.39
+++ src/core/Song.h     4 Apr 2007 02:24:38 -0000       1.40
@@ -188,7 +188,6 @@
        Command* work_next_edge();
        Command* work_previous_edge();
        Command* toggle_snap();
-       Command* playhead_to_workcursor();
        Command* toggle_solo();
        Command* toggle_mute();
        Command* toggle_arm();

Index: src/traverso/Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- src/traverso/Interface.cpp  4 Apr 2007 00:05:51 -0000       1.55
+++ src/traverso/Interface.cpp  4 Apr 2007 02:24:38 -0000       1.56
@@ -384,7 +384,7 @@
        connect(action, SIGNAL(triggered()), this, SLOT(add_new_song()));
 
        
-       menu = menuBar()->addMenu(tr("&Views"));
+       menu = menuBar()->addMenu(tr("&View"));
 
        menu->addAction(historyDW->toggleViewAction());
        menu->addAction(busMonitorDW->toggleViewAction());

Index: src/traverso/songcanvas/SongView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- src/traverso/songcanvas/SongView.cpp        2 Apr 2007 19:23:06 -0000       
1.35
+++ src/traverso/songcanvas/SongView.cpp        4 Apr 2007 02:24:38 -0000       
1.36
@@ -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: SongView.cpp,v 1.35 2007/04/02 19:23:06 benjie Exp $
+$Id: SongView.cpp,v 1.36 2007/04/04 02:24:38 benjie Exp $
 */
 
 
@@ -697,4 +697,15 @@
        return m_tlvp->get_timeline_view()->add_marker();
 }
 
+Command * SongView::playhead_to_workcursor( )
+{
+       nframes_t work = m_song->get_working_frame();
+
+       m_song->set_transport_pos( work );
+       m_playCursor->setPos(work / scalefactor, 0);
+       m_playCursor->work_moved();
+
+       return (Command*) 0;
+}
+
 //eof

Index: src/traverso/songcanvas/SongView.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/SongView.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/traverso/songcanvas/SongView.h  2 Apr 2007 19:23:06 -0000       1.16
+++ src/traverso/songcanvas/SongView.h  4 Apr 2007 02:24:38 -0000       1.17
@@ -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: SongView.h,v 1.16 2007/04/02 19:23:06 benjie Exp $
+    $Id: SongView.h,v 1.17 2007/04/04 02:24:38 benjie Exp $
 */
 
 #ifndef SONG_VIEW_H
@@ -137,6 +137,7 @@
        Command* set_editing_mode();
        Command* set_curve_mode();
        Command* add_marker();
+       Command* playhead_to_workcursor();
        
 private slots:
        void scale_factor_changed();