From: <j-...@us...> - 2008-11-25 14:26:22
|
Revision: 2735 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2735&view=rev Author: j-b-m Date: 2008-11-25 14:26:19 +0000 (Tue, 25 Nov 2008) Log Message: ----------- Fix move of slowmotion clips: http://www.kdenlive.org/mantis/view.php?id=375 Modified Paths: -------------- branches/KDE4/src/customtrackview.cpp branches/KDE4/src/renderer.cpp Modified: branches/KDE4/src/customtrackview.cpp =================================================================== --- branches/KDE4/src/customtrackview.cpp 2008-11-25 13:53:23 UTC (rev 2734) +++ branches/KDE4/src/customtrackview.cpp 2008-11-25 14:26:19 UTC (rev 2735) @@ -1514,7 +1514,7 @@ GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos; const int trackOffset = m_selectionGroup->track() - m_selectionGroupInfo.track; - kDebug() << "&DROPPED GRPOUP:" << timeOffset.frames(25) << "TRK OFF: " << trackOffset; + // kDebug() << "&DROPPED GRPOUP:" << timeOffset.frames(25) << "TRK OFF: " << trackOffset; if (timeOffset != GenTime() || trackOffset != 0) { QUndoCommand *moveClips = new QUndoCommand(); moveClips->setText("Move clips"); @@ -1738,7 +1738,6 @@ } void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) { - DocClipBase *baseclip = m_document->clipManager()->getClipById(id); ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); info.track = m_scene->m_tracksList.count() - item->track(); @@ -1748,6 +1747,7 @@ item->updateRectGeometry(); if (item->cropDuration().frames(m_document->fps()) > endPos) item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed); + m_document->setModified(true); } void CustomTrackView::cutSelectedClips() { Modified: branches/KDE4/src/renderer.cpp =================================================================== --- branches/KDE4/src/renderer.cpp 2008-11-25 13:53:23 UTC (rev 2734) +++ branches/KDE4/src/renderer.cpp 2008-11-25 14:26:19 UTC (rev 2735) @@ -2120,7 +2120,12 @@ Mlt::Producer clipProducer(trackPlaylist.replace_with_blank(clipIndex)); trackPlaylist.consolidate_blanks(0); destTrackPlaylist.consolidate_blanks(1); - Mlt::Producer *clip = prod->cut(clipProducer.get_in(), clipProducer.get_out()); + Mlt::Producer *clip; + // check if we are moving a slowmotion producer + QString serv = clipProducer.parent().get("mlt_service"); + if (serv == "framebuffer") { + clip = &clipProducer; + } else clip = prod->cut(clipProducer.get_in(), clipProducer.get_out()); // move all effects to the correct producer Mlt::Service clipService(clipProducer.get_service()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |