[Traverso-commit] traverso/src core/Song.h core/Song.cpp core/Tim...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/12/29 03:00:26

Modified files:
        src/core       : Song.h Song.cpp TimeLine.cpp 
        src/traverso/songcanvas: TimeLineView.cpp 

Log message:
        Allow removing the End Marker only if it's the only Marker left.
        Consider Marker positions when determining the length of the Sheet.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.h?cvsroot=traverso&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.165&r2=1.166
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/TimeLine.cpp?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.57&r2=1.58

Patches:
Index: core/Song.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- core/Song.h 11 Dec 2007 17:30:11 -0000      1.77
+++ core/Song.h 29 Dec 2007 03:00:25 -0000      1.78
@@ -218,6 +218,7 @@
        Track* create_track();
        
        friend class AudioClipManager;
+       friend class TimeLine;
 
 public slots :
        void seek_finished();

Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- core/Song.cpp       18 Dec 2007 18:16:48 -0000      1.165
+++ core/Song.cpp       29 Dec 2007 03:00:25 -0000      1.166
@@ -1053,7 +1053,10 @@
 
 const TimeRef& Song::get_last_location() const
 {
-       return m_acmanager->get_last_location();
+       TimeRef lastAudio = m_acmanager->get_last_location();
+       TimeRef lastMarker = m_timeline->get_markers().last()->get_when();
+
+       return (lastAudio > lastMarker) ? lastAudio : lastMarker;
 }
 
 void Song::private_add_track(Track* track)

Index: core/TimeLine.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/TimeLine.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- core/TimeLine.cpp   23 Nov 2007 14:21:08 -0000      1.13
+++ core/TimeLine.cpp   29 Dec 2007 03:00:25 -0000      1.14
@@ -166,5 +166,6 @@
 {
        qSort(m_markers.begin(), m_markers.end(), smallerMarker);
        emit markerPositionChanged((Marker*)snap);
+       emit m_song->lastFramePositionChanged();
 }
 

Index: traverso/songcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- traverso/songcanvas/TimeLineView.cpp        17 Dec 2007 21:17:08 -0000      
1.57
+++ traverso/songcanvas/TimeLineView.cpp        29 Dec 2007 03:00:26 -0000      
1.58
@@ -378,8 +378,8 @@
 {
        if (m_blinkingMarker) {
                Marker* marker = m_blinkingMarker->get_marker();
-               if (marker->get_type() == Marker::ENDMARKER) {
-                       info().information(tr("It's not possible to remove the 
endmarker!!"));
+               if (marker->get_type() == Marker::ENDMARKER && 
m_markerViews.size() > 1) {
+                       info().information(tr("You have to remove all other 
markers first."));
                        return ie().failure();
                }
                return m_timeline->remove_marker(marker);