[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/commands MoveEdge.cpp MoveEdge.h
From: |
Remon Sijrier |
Subject: |
[Traverso-commit] traverso/src/commands MoveEdge.cpp MoveEdge.h |
Date: |
Sat, 07 Mar 2009 17:33:12 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 09/03/07 17:33:12
Modified files:
src/commands : MoveEdge.cpp MoveEdge.h
Log message:
* cleanups, and revert last change as it broke move left edge
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveEdge.cpp?cvsroot=traverso&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveEdge.h?cvsroot=traverso&r1=1.10&r2=1.11
Patches:
Index: MoveEdge.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveEdge.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- MoveEdge.cpp 7 Mar 2009 16:54:27 -0000 1.24
+++ MoveEdge.cpp 7 Mar 2009 17:33:12 -0000 1.25
@@ -37,7 +37,6 @@
MoveEdge::MoveEdge(AudioClipView* cv, SheetView* sv, QByteArray whichEdge)
: Command(cv->get_clip(), tr("Move Clip Edge"))
{
- m_cv = cv;
m_sv = sv;
m_clip = cv->get_clip();
m_edge = whichEdge;
@@ -95,21 +94,29 @@
int MoveEdge::do_action()
{
- int r = QMetaObject::invokeMethod(m_clip, m_edge.data(), Q_ARG(TimeRef,
m_newPos));
- if (!r) {
- PERROR("MoveEdge::do_action: invokeMethod failed!");
+ if (m_edge == "set_right_edge") {
+ m_clip->set_right_edge(m_newPos);
+ }
+
+ if (m_edge == "set_left_edge") {
+ m_clip->set_left_edge(m_newPos);
}
- return r;
+
+ return 1;
}
int MoveEdge::undo_action()
{
- int r = QMetaObject::invokeMethod(m_clip, m_edge.data(), Q_ARG(TimeRef,
m_originalPos));
- if (!r) {
- PERROR("MoveEdge::undo_action: invokeMethod failed!");
+ if (m_edge == "set_right_edge") {
+ m_clip->set_right_edge(m_originalPos);
}
- return r;
+
+ if (m_edge == "set_left_edge") {
+ m_clip->set_left_edge(m_originalPos);
+ }
+
+ return 1;
}
@@ -130,12 +137,7 @@
m_newPos = m_otherEdgePos - (2 * m_sv->timeref_scalefactor);
}
- // use this function to actually set the clip edge
- do_action();
-
- // AudioClip does the calculation and corrects is we wanted to move the
- // edge to far. So set m_newPos to the _real_ track end location.
- m_newPos = m_clip->get_track_end_location();
+ return do_action();
}
// eof
Index: MoveEdge.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveEdge.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- MoveEdge.h 21 Jan 2008 16:22:11 -0000 1.10
+++ MoveEdge.h 7 Mar 2009 17:33:12 -0000 1.11
@@ -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: MoveEdge.h,v 1.10 2008/01/21 16:22:11 r_sijrier Exp $
+ $Id: MoveEdge.h,v 1.11 2009/03/07 17:33:12 r_sijrier Exp $
*/
#ifndef MOVEEDGE_H
@@ -28,7 +28,6 @@
#include <QByteArray>
class AudioClip;
-class Sheet;
class SheetView;
class AudioClipView;
@@ -49,8 +48,6 @@
private :
AudioClip* m_clip;
- Sheet* m_sheet;
- AudioClipView* m_cv;
SheetView* m_sv;
QByteArray m_edge;
TimeRef m_originalPos;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/commands MoveEdge.cpp MoveEdge.h,
Remon Sijrier <=