[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/commands AudioClipExternalProcessi...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso/src/commands AudioClipExternalProcessi... |
|
Date: |
Mon, 10 Sep 2007 18:42:13 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/09/10 18:42:13
Modified files:
src/commands : AudioClipExternalProcessing.cpp Import.cpp
Import.h MoveClip.cpp MoveClip.h
PlayHeadMove.cpp SplitClip.cpp SplitClip.h
WorkCursorMove.cpp WorkCursorMove.h
Log message:
Conversion work from nframes_t to TimeRef
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/AudioClipExternalProcessing.cpp?cvsroot=traverso&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Import.cpp?cvsroot=traverso&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Import.h?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.h?cvsroot=traverso&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/PlayHeadMove.cpp?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/SplitClip.cpp?cvsroot=traverso&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/SplitClip.h?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/WorkCursorMove.cpp?cvsroot=traverso&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/WorkCursorMove.h?cvsroot=traverso&r1=1.2&r2=1.3
Patches:
Index: AudioClipExternalProcessing.cpp
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/AudioClipExternalProcessing.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- AudioClipExternalProcessing.cpp 28 Aug 2007 19:51:51 -0000 1.27
+++ AudioClipExternalProcessing.cpp 10 Sep 2007 18:42:12 -0000 1.28
@@ -331,7 +331,7 @@
// Clips live at project level, we have to set its Song, Track and
ReadSource explicitely!!
m_acep->m_resultingclip->set_song(m_acep->m_clip->get_song());
m_acep->m_resultingclip->set_track(m_acep->m_clip->get_track());
-
m_acep->m_resultingclip->set_track_start_frame(m_acep->m_clip->get_track_start_frame());
+
m_acep->m_resultingclip->set_track_start_location(m_acep->m_clip->get_track_start_location());
close();
}
Index: Import.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Import.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- Import.cpp 4 Jun 2007 22:44:25 -0000 1.25
+++ Import.cpp 10 Sep 2007 18:42:12 -0000 1.26
@@ -43,7 +43,7 @@
}
-Import::Import(Track* track, bool silent, nframes_t length)
+Import::Import(Track* track, bool silent, const TimeRef& length)
: Command(track, "")
{
m_track = track;
@@ -71,7 +71,7 @@
m_initialLength = 0;
}
-Import::Import(Track* track, const QString& fileName, nframes_t position)
+Import::Import(Track* track, const QString& fileName, const TimeRef& position)
: Command(track, tr("Import Audio File"))
{
m_track = track;
@@ -144,18 +144,18 @@
m_clip->set_song(m_track->get_song());
m_clip->set_track(m_track);
- nframes_t startFrame = 0;
+ TimeRef startLocation(0);
if (!m_hasPosition) {
if (AudioClip* lastClip = m_track->get_cliplist().get_last()) {
- startFrame = lastClip->get_track_end_frame() + 1;
+ startLocation = lastClip->get_track_end_location() + 1;
}
} else {
- startFrame = m_position;
+ startLocation = m_position;
}
- m_clip->set_track_start_frame(startFrame);
+ m_clip->set_track_start_location(startLocation);
if (m_initialLength > 0) {
- m_clip->set_right_edge(m_initialLength + startFrame);
+ m_clip->set_right_edge(m_initialLength + startLocation);
}
}
@@ -165,7 +165,7 @@
}
-void Import::set_position(nframes_t position)
+void Import::set_position(const TimeRef& position)
{
m_hasPosition = true;
m_position = position;
Index: Import.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Import.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Import.h 4 Jun 2007 22:44:25 -0000 1.6
+++ Import.h 10 Sep 2007 18:42:13 -0000 1.7
@@ -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: Import.h,v 1.6 2007/06/04 22:44:25 benjie Exp $
+ $Id: Import.h,v 1.7 2007/09/10 18:42:13 r_sijrier Exp $
*/
#ifndef IMPORT_H
@@ -33,9 +33,9 @@
{
public :
Import(const QString& fileName);
- Import(Track* track, bool silent = false, nframes_t length = 0);
+ Import(Track* track, bool silent = false, const TimeRef& length = 0);
Import(Track* track, const QString& fileName);
- Import(Track* track, const QString& fileName, nframes_t position);
+ Import(Track* track, const QString& fileName, const TimeRef& position);
~Import();
int prepare_actions();
@@ -45,7 +45,7 @@
int create_readsource();
void create_audioclip();
void set_track(Track* track);
- void set_position(nframes_t position);
+ void set_position(const TimeRef& position);
private :
Track* m_track;
@@ -54,9 +54,9 @@
QString m_fileName;
QString m_name;
bool m_silent;
- nframes_t m_initialLength;
+ TimeRef m_initialLength;
bool m_hasPosition;
- nframes_t m_position;
+ TimeRef m_position;
};
#endif
Index: MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- MoveClip.cpp 11 Aug 2007 22:54:58 -0000 1.49
+++ MoveClip.cpp 10 Sep 2007 18:42:13 -0000 1.50
@@ -68,7 +68,7 @@
QString des;
if (m_actionType == "copy") {
des = tr("Copy Clip");
- d->xoffset = cv->get_songview()->scalefactor * 3;
+ d->xoffset = TimeRef(cv->get_songview()->timeref_scalefactor *
3);
} else if (m_actionType == "move") {
des = tr("Move Clip");
} else if (m_actionType == "anchored_left_edge_move" ||
@@ -140,21 +140,21 @@
}
if (m_actionType == "anchored_left_edge_move") {
- m_oldOppositeEdge = m_clip->get_track_start_frame() +
m_clip->get_length();
+ m_oldOppositeEdge = m_clip->get_track_start_location() +
m_clip->get_length();
}
else if (m_actionType == "anchored_right_edge_move") {
- m_oldOppositeEdge = m_clip->get_track_start_frame();
+ m_oldOppositeEdge = m_clip->get_track_start_location();
}
m_originTrack = m_targetTrack = m_clip->get_track();
- m_originalTrackFirstFrame = m_clip->get_track_start_frame();
+ m_originalTrackStartLocation = m_clip->get_track_start_location();
m_posDiff = 0;
d->origXPos = cpointer().on_first_input_event_x();
d->origPos = QPoint(d->origXPos, cpointer().on_first_input_event_y());
d->hScrollbarValue = d->sv->hscrollbar_value();
d->sv->start_shuttle(true, true);
- d->origTrackStartFrame = m_clip->get_track_start_frame();
- d->origTrackEndFrame = m_clip->get_track_end_frame();
+ d->origTrackStartLocation = m_clip->get_track_start_location();
+ d->origTrackEndLocation = m_clip->get_track_end_location();
d->resync = config().get_property("AudioClip", "SyncDuringDrag",
false).toBool();
d->view->set_dragging(true);
d->bypassjog = false;
@@ -169,7 +169,7 @@
d->newclip =
resources_manager()->get_clip(d->view->get_clip()->get_id());
d->newclip->set_song(m_song);
d->newclip->set_track(d->view->get_clip()->get_track());
-
d->newclip->set_track_start_frame(d->view->get_clip()->get_track_start_frame()
+ d->xoffset);
+
d->newclip->set_track_start_location(d->view->get_clip()->get_track_start_location()
+ d->xoffset);
connect(d->view->get_clip()->get_track(),
SIGNAL(audioClipAdded(AudioClip*)),
this, SLOT(audioclip_added(AudioClip*)));
@@ -234,9 +234,9 @@
if (m_actionType == "copy") {
Command::process_command(m_targetTrack->add_clip(m_clip,
false));
- m_clip->set_track_start_frame(m_originalTrackFirstFrame +
m_posDiff);
+ m_clip->set_track_start_location(m_originalTrackStartLocation +
m_posDiff);
} else {
- m_song->move_clip(m_originTrack, m_targetTrack, m_clip,
m_originalTrackFirstFrame + m_posDiff);
+ m_song->move_clip(m_originTrack, m_targetTrack, m_clip,
m_originalTrackStartLocation + m_posDiff);
}
if (m_actionType == "anchored_left_edge_move") {
@@ -257,14 +257,14 @@
if (m_actionType == "copy") {
Command::process_command(m_targetTrack->remove_clip(m_clip,
false));
} else {
- m_song->move_clip(m_targetTrack, m_originTrack, m_clip,
m_originalTrackFirstFrame);
+ m_song->move_clip(m_targetTrack, m_originTrack, m_clip,
m_originalTrackStartLocation);
}
if (m_actionType == "anchored_left_edge_move") {
m_clip->set_right_edge(m_oldOppositeEdge);
}
else if (m_actionType == "anchored_right_edge_move") {
- m_clip->set_track_start_frame(m_oldOppositeEdge - m_posDiff);
+ m_clip->set_track_start_location(m_oldOppositeEdge - m_posDiff);
m_clip->set_left_edge(m_oldOppositeEdge);
}
@@ -279,10 +279,10 @@
Command::process_command(m_originTrack->remove_clip(m_clip,
false));
} else if (m_actionType == "move") {
if (d->resync) {
-
m_clip->set_track_start_frame(m_originalTrackFirstFrame);
+
m_clip->set_track_start_location(m_originalTrackStartLocation);
}
d->view->set_trackview(d->origTrackView);
- d->view->setPos(QPoint(m_originalTrackFirstFrame /
d->sv->scalefactor,
+ d->view->setPos(QPoint(m_originalTrackStartLocation /
d->sv->timeref_scalefactor,
d->origTrackView->get_childview_y_offset()));
}
}
@@ -324,24 +324,24 @@
int newXPos = cpointer().x() - scrollbardif;
// must be signed int because it can be negative
- int diff_f = (cpointer().x() - d->origXPos - scrollbardif) *
d->sv->scalefactor;
- nframes_t newTrackStartFrame;
- nframes_t newTrackEndFrame = d->origTrackEndFrame + diff_f;
+ TimeRef diff_f = TimeRef((cpointer().x() - d->origXPos - scrollbardif)
* d->sv->timeref_scalefactor);
+ TimeRef newTrackStartLocation;
+ TimeRef newTrackEndLocation = d->origTrackEndLocation + diff_f;
- if (diff_f < 0 && d->origTrackStartFrame < (nframes_t) -diff_f) {
- newTrackStartFrame = 0;
+ if (diff_f < 0 && d->origTrackStartLocation < (-1 * diff_f)) {
+ newTrackStartLocation = TimeRef(0);
} else {
- newTrackStartFrame = d->origTrackStartFrame + diff_f;
+ newTrackStartLocation = d->origTrackStartLocation + diff_f;
}
if (m_song->is_snap_on()) {
- calculate_snap_diff(newTrackStartFrame, newTrackEndFrame);
+ calculate_snap_diff(newTrackStartLocation, newTrackEndLocation);
}
- m_posDiff = newTrackStartFrame - m_originalTrackFirstFrame;
+ m_posDiff = newTrackStartLocation - m_originalTrackStartLocation;
// store the new position only if the clip was moved, but not if it
stuck to a snap position
- if (d->origTrackStartFrame != newTrackStartFrame) {
+ if (d->origTrackStartLocation != newTrackStartLocation) {
d->origPos.setX(newXPos);
}
@@ -351,15 +351,15 @@
if (m_actionType == "anchored_right_edge_move") {
m_clip->set_left_edge(m_oldOppositeEdge - m_posDiff);
- newPos.setX(m_originalTrackFirstFrame / d->sv->scalefactor);
+ newPos.setX(m_originalTrackStartLocation /
d->sv->timeref_scalefactor);
newPos.setY(d->view->pos().y());
d->view->setPos(newPos);
} else {
- newPos.setX(newTrackStartFrame / d->sv->scalefactor);
+ newPos.setX(newTrackStartLocation / d->sv->timeref_scalefactor);
newPos.setY(d->view->pos().y());
if (d->resync) {
- if (m_clip->get_track_start_frame() !=
newTrackStartFrame) {
-
m_clip->set_track_start_frame(newTrackStartFrame);
+ if (m_clip->get_track_start_location() !=
newTrackStartLocation) {
+
m_clip->set_track_start_location(newTrackStartLocation);
}
if (m_actionType == "anchored_left_edge_move") {
m_clip->set_right_edge(m_oldOppositeEdge);
@@ -379,34 +379,35 @@
{
Q_UNUSED(autorepeat);
d->bypassjog = true;
- long trackStartFrame =
m_song->get_snap_list()->next_snap_pos(m_clip->get_track_start_frame());
- nframes_t trackEndFrame =
m_song->get_snap_list()->next_snap_pos(m_clip->get_track_end_frame());
- int startdiff = trackStartFrame - m_clip->get_track_start_frame();
- int enddiff = trackEndFrame - m_clip->get_track_end_frame();
- int diff = (abs(startdiff) < abs(enddiff)) ? startdiff : enddiff;
- trackStartFrame = m_clip->get_track_start_frame() + diff;
- m_posDiff = trackStartFrame - m_originalTrackFirstFrame;
- m_clip->set_track_start_frame(trackStartFrame);
+ TimeRef trackStartLocation =
m_song->get_snap_list()->next_snap_pos(m_clip->get_track_start_location());
+ TimeRef trackEndLocation =
m_song->get_snap_list()->next_snap_pos(m_clip->get_track_end_location());
+ qint64 startdiff = (trackStartLocation -
m_clip->get_track_start_location()).universal_frame();
+ qint64 enddiff = (trackEndLocation -
m_clip->get_track_end_location()).universal_frame();
+ qint64 diff = (abs(startdiff) < abs(enddiff)) ? startdiff : enddiff;
+ trackStartLocation = m_clip->get_track_start_location() + diff;
+ m_posDiff = trackStartLocation - m_originalTrackStartLocation;
+ m_clip->set_track_start_location(trackStartLocation);
}
void MoveClip::prev_snap_pos(bool autorepeat)
{
Q_UNUSED(autorepeat);
d->bypassjog = true;
- long trackStartFrame =
m_song->get_snap_list()->prev_snap_pos(m_clip->get_track_start_frame());
- nframes_t trackEndFrame =
m_song->get_snap_list()->prev_snap_pos(m_clip->get_track_end_frame());
- int startdiff = trackStartFrame - m_clip->get_track_start_frame();
- int enddiff = trackEndFrame - m_clip->get_track_end_frame();
- int diff = (abs(startdiff) < abs(enddiff)) ? startdiff : enddiff;
- trackStartFrame = m_clip->get_track_start_frame() + diff;
- m_posDiff = trackStartFrame - m_originalTrackFirstFrame;
- m_clip->set_track_start_frame(trackStartFrame);
+ TimeRef trackStartLocation =
m_song->get_snap_list()->prev_snap_pos(m_clip->get_track_start_location());
+ TimeRef trackEndLocation =
m_song->get_snap_list()->prev_snap_pos(m_clip->get_track_end_location());
+ qint64 startdiff = (trackStartLocation -
m_clip->get_track_start_location()).universal_frame();
+ qint64 enddiff = (trackEndLocation -
m_clip->get_track_end_location()).universal_frame();
+ qint64 diff = (abs(startdiff) < abs(enddiff)) ? startdiff : enddiff;
+ trackStartLocation = m_clip->get_track_start_location() + diff;
+ m_posDiff = trackStartLocation - m_originalTrackStartLocation;
+ m_clip->set_track_start_location(trackStartLocation);
}
void MoveClip::move_to_start(bool autorepeat)
{
Q_UNUSED(autorepeat)
- m_clip->set_track_start_frame(0);
+ TimeRef location(0);
+ m_clip->set_track_start_location(location);
}
void MoveClip::move_to_end(bool autorepeat)
@@ -415,37 +416,37 @@
Track *track = m_clip->get_track();
Command::process_command(track->remove_clip(m_clip, false));
- m_clip->set_track_start_frame(m_clip->get_song()->get_last_frame());
+
m_clip->set_track_start_location(m_clip->get_song()->get_last_location());
Command::process_command(track->add_clip(m_clip, false));
}
-void MoveClip::calculate_snap_diff(nframes_t& leftframe, nframes_t rightframe)
+void MoveClip::calculate_snap_diff(TimeRef& leftlocation, TimeRef
rightlocation)
{
// "nframe_t" domain, but must be signed ints because they can become
negative
- int snapStartDiff = 0;
- int snapEndDiff = 0;
- int snapDiff = 0;
+ qint64 snapStartDiff = 0;
+ qint64 snapEndDiff = 0;
+ qint64 snapDiff = 0;
SnapList* slist = m_song->get_snap_list();
// check if there is anything to snap
bool start_snapped = false;
bool end_snapped = false;
- if (slist->is_snap_value(leftframe) && m_actionType !=
"anchored_right_edge_move") {
+ if (slist->is_snap_value(leftlocation) && m_actionType !=
"anchored_right_edge_move") {
start_snapped = true;
}
- if (slist->is_snap_value(rightframe) && m_actionType !=
"anchored_left_edge_move") {
+ if (slist->is_snap_value(rightlocation) && m_actionType !=
"anchored_left_edge_move") {
end_snapped = true;
}
if (start_snapped) {
- snapStartDiff = slist->get_snap_diff(leftframe);
+ snapStartDiff = slist->get_snap_diff(leftlocation);
snapDiff = snapStartDiff; // in case both ends snapped, change
this value later, else leave it
}
if (end_snapped) {
- snapEndDiff = slist->get_snap_diff(rightframe);
+ snapEndDiff = slist->get_snap_diff(rightlocation);
snapDiff = snapEndDiff; // in case both ends snapped, change
this value later, else leave it
}
@@ -459,7 +460,7 @@
snapDiff = snapEndDiff;
}
- leftframe -= snapDiff;
+ leftlocation -= snapDiff;
}
// eof
Index: MoveClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- MoveClip.h 4 Jun 2007 15:51:03 -0000 1.20
+++ MoveClip.h 10 Sep 2007 18:42:13 -0000 1.21
@@ -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: MoveClip.h,v 1.20 2007/06/04 15:51:03 r_sijrier Exp $
+ $Id: MoveClip.h,v 1.21 2007/09/10 18:42:13 r_sijrier Exp $
*/
#ifndef MOVECLIPACTION_H
@@ -56,9 +56,9 @@
private :
Song* m_song;
AudioClip* m_clip;
- nframes_t m_originalTrackFirstFrame;
- nframes_t m_posDiff;
- nframes_t m_oldOppositeEdge;
+ TimeRef m_originalTrackStartLocation;
+ TimeRef m_posDiff;
+ TimeRef m_oldOppositeEdge;
Track* m_originTrack;
Track* m_targetTrack;
QString m_actionType;
@@ -66,14 +66,14 @@
struct Data {
int origXPos;
int hScrollbarValue;
- int xoffset;
+ TimeRef xoffset;
AudioClip* newclip;
SongView* sv;
AudioClipView* view;
TrackView* origTrackView;
QPoint origPos;
- nframes_t origTrackStartFrame;
- nframes_t origTrackEndFrame;
+ TimeRef origTrackStartLocation;
+ TimeRef origTrackEndLocation;
bool resync;
bool bypassjog;
QPoint jogBypassPos;
@@ -83,7 +83,7 @@
Data* d;
void init_data(bool isCopy=false);
- void calculate_snap_diff(nframes_t& leftframe, nframes_t rightframe);
+ void calculate_snap_diff(TimeRef& leftlocation, TimeRef rightlocation);
public slots:
Index: PlayHeadMove.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/PlayHeadMove.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- PlayHeadMove.cpp 21 Jun 2007 14:31:10 -0000 1.13
+++ PlayHeadMove.cpp 10 Sep 2007 18:42:13 -0000 1.14
@@ -52,7 +52,7 @@
if (m_song->is_transport_rolling()) {
m_cursor->hide();
}
- m_song->set_transport_pos( (nframes_t) (x * m_sv->scalefactor));
+ m_song->set_transport_pos(x * m_sv->timeref_scalefactor);
}
m_sv->start_shuttle(false);
return -1;
@@ -61,7 +61,7 @@
int PlayHeadMove::begin_hold()
{
m_cursor->set_active(false);
- m_origXPos = m_newXPos = m_song->get_transport_frame() /
m_sv->scalefactor;
+ m_origXPos = m_newXPos = m_song->get_transport_location() /
m_sv->timeref_scalefactor;
m_sv->start_shuttle(true, true);
return 1;
}
@@ -97,13 +97,13 @@
if (x != m_newXPos) {
m_cursor->setPos(x, 0);
- nframes_t newpos = (nframes_t) (x * m_sv->scalefactor);
+ TimeRef newpos = x * m_sv->timeref_scalefactor;
if (m_resync && m_song->is_transport_rolling()) {
m_song->set_transport_pos(newpos);
}
m_sv->update_shuttle_factor();
-
cpointer().get_viewport()->set_holdcursor_text(frame_to_text(newpos,
m_song->get_rate(), m_sv->scalefactor));
+
cpointer().get_viewport()->set_holdcursor_text(timeref_to_text(newpos,
m_sv->timeref_scalefactor));
}
// Hmm, the alignment of the holdcursor isn't in the center, so we have
to
Index: SplitClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/SplitClip.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- SplitClip.cpp 19 May 2007 19:30:11 -0000 1.31
+++ SplitClip.cpp 10 Sep 2007 18:42:13 -0000 1.32
@@ -49,11 +49,11 @@
int SplitClip::prepare_actions()
{
- if (! m_splitPoint) {
- m_splitPoint = cpointer().scene_x() * m_sv->scalefactor;
+ if (m_splitPoint == 0) {
+ m_splitPoint = TimeRef(cpointer().scene_x() *
m_sv->timeref_scalefactor);
}
- if (m_splitPoint <= m_clip->get_track_start_frame() || m_splitPoint >=
m_clip->get_track_start_frame() + m_clip->get_length()) {
+ if (m_splitPoint <= m_clip->get_track_start_location() || m_splitPoint
>= m_clip->get_track_start_location() + m_clip->get_length()) {
return -1;
}
@@ -61,7 +61,7 @@
rightClip = resources_manager()->get_clip(m_clip->get_id());
leftClip->set_song(m_clip->get_song());
- leftClip->set_track_start_frame( m_clip->get_track_start_frame() );
+ leftClip->set_track_start_location(m_clip->get_track_start_location());
leftClip->set_right_edge(m_splitPoint);
if (leftClip->get_fade_out()) {
FadeRange* cmd = (FadeRange*)leftClip->reset_fade_out();
@@ -71,7 +71,7 @@
rightClip->set_song(m_clip->get_song());
rightClip->set_left_edge(m_splitPoint);
- rightClip->set_track_start_frame(m_splitPoint);
+ rightClip->set_track_start_location(m_splitPoint);
if (rightClip->get_fade_in()) {
FadeRange* cmd = (FadeRange*)rightClip->reset_fade_in();
cmd->set_historable(false);
@@ -145,14 +145,14 @@
x = 0;
}
- m_splitPoint = x * m_sv->scalefactor;
+ m_splitPoint = x * m_sv->timeref_scalefactor;
if (m_clip->get_song()->is_snap_on()) {
SnapList* slist = m_clip->get_song()->get_snap_list();
m_splitPoint = slist->get_snap_value(m_splitPoint);
}
- QPointF point = m_cv->mapFromScene(m_splitPoint / m_sv->scalefactor,
cpointer().y());
+ QPointF point = m_cv->mapFromScene(m_splitPoint /
m_sv->timeref_scalefactor, cpointer().y());
int xpos = (int) point.x();
if (xpos < 0) {
xpos = 0;
@@ -162,7 +162,7 @@
}
m_splitcursor->setPos(xpos, 0);
m_sv->update_shuttle_factor();
-
cpointer().get_viewport()->set_holdcursor_text(frame_to_text(m_splitPoint,
m_clip->get_song()->get_rate(), m_sv->scalefactor));
+
cpointer().get_viewport()->set_holdcursor_text(timeref_to_text(m_splitPoint,
m_sv->timeref_scalefactor));
cpointer().get_viewport()->set_holdcursor_pos(QPoint(cpointer().scene_x() - 16,
cpointer().scene_y() - 16));
return 1;
Index: SplitClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/SplitClip.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- SplitClip.h 19 May 2007 19:30:11 -0000 1.6
+++ SplitClip.h 10 Sep 2007 18:42:13 -0000 1.7
@@ -55,7 +55,7 @@
AudioClip* m_clip;
AudioClip* leftClip;
AudioClip* rightClip;
- nframes_t m_splitPoint;
+ TimeRef m_splitPoint;
LineView* m_splitcursor;
};
Index: WorkCursorMove.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/WorkCursorMove.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- WorkCursorMove.cpp 21 Jun 2007 14:31:10 -0000 1.7
+++ WorkCursorMove.cpp 10 Sep 2007 18:42:13 -0000 1.8
@@ -56,7 +56,7 @@
}
m_song->get_work_snap()->set_snappable(false);
m_sv->start_shuttle(true, true);
- m_origPos = m_song->get_working_frame();
+ m_origPos = m_song->get_work_location();
return 1;
}
@@ -82,17 +82,17 @@
x = 0;
}
- nframes_t newFrame = x * m_sv->scalefactor;
+ TimeRef newLocation = x * m_sv->timeref_scalefactor;
if (m_song->is_snap_on()) {
SnapList* slist = m_song->get_snap_list();
- newFrame = slist->get_snap_value(newFrame);
+ newLocation = slist->get_snap_value(newLocation);
}
- m_song->set_work_at(newFrame);
+ m_song->set_work_at(newLocation);
m_sv->update_shuttle_factor();
- cpointer().get_viewport()->set_holdcursor_text(frame_to_text(newFrame,
m_song->get_rate(), m_sv->scalefactor));
+
cpointer().get_viewport()->set_holdcursor_text(timeref_to_text(newLocation,
m_sv->timeref_scalefactor));
// Hmm, the alignment of the holdcursor isn't in the center, so we have
to
// substract half the width of it to make it appear centered... :-(
cpointer().get_viewport()->set_holdcursor_pos(QPoint(cpointer().scene_x() - 16,
cpointer().scene_y() - 16));
Index: WorkCursorMove.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/WorkCursorMove.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- WorkCursorMove.h 13 Apr 2007 11:12:30 -0000 1.2
+++ WorkCursorMove.h 10 Sep 2007 18:42:13 -0000 1.3
@@ -46,7 +46,7 @@
Song* m_song;
SongView* m_sv;
PlayHead* m_playCursor;
- nframes_t m_origPos;
+ TimeRef m_origPos;
};
#endif
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/commands AudioClipExternalProcessi...,
Remon Sijrier <=