[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso/songcanvas TimeLineView.cpp
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/traverso/songcanvas TimeLineView.cpp |
Date: |
Fri, 20 Apr 2007 13:26:59 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/04/20 13:26:59
Modified files:
src/traverso/songcanvas: TimeLineView.cpp
Log message:
* Also remove/add the start/end marker if the marker that was
added/removed was the first one added!
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.21&r2=1.22
Patches:
Index: TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- TimeLineView.cpp 16 Apr 2007 09:08:31 -0000 1.21
+++ TimeLineView.cpp 20 Apr 2007 13:26:59 -0000 1.22
@@ -280,27 +280,30 @@
nframes_t when = (uint) (point.x() * m_sv->scalefactor);
+ CommandGroup* group = new CommandGroup(m_timeline, "");
+
// check if it is the first marker added to the timeline
if (!m_timeline->get_markers().size()) {
if (when > 0) { // add one at the beginning of the song
Marker* m = new Marker(m_timeline, 0);
m->set_description("");
- AddRemove *ca = (AddRemove*) m_timeline->add_marker(m);
- Command::process_command(ca);
+ group->add_command(m_timeline->add_marker(m));
}
if (when < m_sv->get_song()->get_last_frame()) { // add one at
the end of the song
Marker* me = new Marker(m_timeline,
m_sv->get_song()->get_last_frame(), 10);
me->set_description(tr("End"));
- AddRemove *cb = (AddRemove*) m_timeline->add_marker(me);
- Command::process_command(cb);
+ group->add_command(m_timeline->add_marker(me));
}
}
Marker* marker = new Marker(m_timeline, when);
marker->set_description("");
- return m_timeline->add_marker(marker);
+ group->setText(tr("Add Marker"));
+ group->add_command(m_timeline->add_marker(marker));
+
+ return group;
}
Command* TimeLineView::remove_marker()