From: Jean-Baptiste M. <jb...@kd...> - 2012-02-16 20:20:19
|
Git commit 09a4aa1aa8ddda7946e488e52622d51ff3b7bb0f by Jean-Baptiste Mardelle. Committed on 16/02/2012 at 21:19. Pushed by mardelle into branch 'audioAlign'. Report error when MLT fails to insert a clip in playlist (for example when trying to insert a clip at a negative time) M +2 -2 src/customtrackview.cpp M +7 -0 src/renderer.cpp http://commits.kde.org/kdenlive/09a4aa1aa8ddda7946e488e52622d51ff3b7bb0f diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 1a0a8eb..9baf23b 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -6034,9 +6034,9 @@ void CustomTrackView::alignAudio() GenTime add(shift, m_document->fps()); ItemInfo start = clip->info(); - ItemInfo end = clip->info(); + ItemInfo end = start; end.startPos = m_audioAlignmentReference->info().startPos + add; - end.endPos = m_audioAlignmentReference->info().startPos + add + clip->info().cropDuration; + end.endPos = end.startPos + start.cropDuration; QUndoCommand *moveCommand = new QUndoCommand(); moveCommand->setText(i18n("Auto-align clip")); diff --git a/src/renderer.cpp b/src/renderer.cpp index 9bb3c8a..5592f82 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -3331,6 +3331,13 @@ bool Render::mltMoveClip(int startTrack, int endTrack, int moveStart, int moveEn trackPlaylist.insert_blank(clipIndex, clipProducer->get_playtime() - 1); } int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1); + if (newIndex == -1) { + kDebug()<<"// CANNOT MOVE CLIP TO: "<<moveEnd; + trackPlaylist.insert_at(moveStart, clipProducer, 1); + delete clipProducer; + service.unlock(); + return false; + } trackPlaylist.consolidate_blanks(1); delete clipProducer; /*if (QString(clipProducer.parent().get("transparency")).toInt() == 1) { |