X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=c74204daabbfb2cb824379bd8a76c3f71b096fcf;hb=9f76a9103088feb8ae3feef0343ddfdcf0685fe6;hp=00cf0ac2d04b45d2cee9a33641f9858849f33ab1;hpb=8ca9152f140c87b8dedf14c994e9c82ba98b75ff;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 00cf0ac2..c74204da 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -17,19 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include #include "customtrackview.h" #include "customtrackscene.h" @@ -52,8 +39,6 @@ #include "razorclipcommand.h" #include "kdenlivesettings.h" #include "transition.h" -#include "clipitem.h" -#include "customtrackview.h" #include "clipmanager.h" #include "renderer.h" #include "markerdialog.h" @@ -69,6 +54,24 @@ #include "ui_addtrack_ui.h" #include "initeffects.h" #include "locktrackcommand.h" +#include "groupclipscommand.h" +#include "splitaudiocommand.h" +#include "changecliptypecommand.h" + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + //TODO: // disable animation if user asked it in KDE's global settings @@ -78,10 +81,36 @@ // const bool animate = KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects; // const int duration = animate ? 1500 : 1; -CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) - : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList ()), m_scrollOffset(0), m_changeSpeedAction(NULL), m_pasteEffectsAction(NULL) { +CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) : + QGraphicsView(projectscene, parent), + m_tracksHeight(KdenliveSettings::trackheight()), + m_projectDuration(0), + m_cursorPos(0), + m_document(doc), + m_scene(projectscene), + m_cursorLine(NULL), + m_operationMode(NONE), + m_moveOpMode(NONE), + m_dragItem(NULL), + m_dragGuide(NULL), + m_visualTip(NULL), + m_animation(NULL), + m_clickPoint(), + m_autoScroll(KdenliveSettings::autoscroll()), + m_changeSpeedAction(NULL), + m_pasteEffectsAction(NULL), + m_ungroupAction(NULL), + m_scrollOffset(0), + m_clipDrag(false), + m_findIndex(0), + m_tool(SELECTTOOL), + m_copiedItems(), + m_menuPosition(), + m_blockRefresh(false), + m_selectionGroup(NULL) +{ if (doc) m_commandStack = doc->commandStack(); - else m_commandStack == NULL; + else m_commandStack = NULL; setMouseTracking(true); setAcceptDrops(true); m_animationTimer = new QTimeLine(800); @@ -105,27 +134,33 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen KIcon spacerIcon("kdenlive-spacer-tool"); m_spacerCursor = QCursor(spacerIcon.pixmap(22, 22)); verticalScrollBar()->setTracking(true); - connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides())); + // Line below was supposed to scroll guides label with scrollbar, not implemented yet + //connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides())); connect(&m_scrollTimer, SIGNAL(timeout()), this, SLOT(slotCheckMouseScrolling())); m_scrollTimer.setInterval(100); m_scrollTimer.setSingleShot(true); } -CustomTrackView::~CustomTrackView() { +CustomTrackView::~CustomTrackView() +{ qDeleteAll(m_guides); } -void CustomTrackView::setDocumentModified() { +void CustomTrackView::setDocumentModified() +{ m_document->setModified(true); } -void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) { +void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup) +{ m_timelineContextMenu = timeline; m_timelineContextClipMenu = clip; + m_clipTypeGroup = clipTypeGroup; QList list = m_timelineContextClipMenu->actions(); for (int i = 0; i < list.count(); i++) { if (list.at(i)->data().toString() == "change_speed") m_changeSpeedAction = list.at(i); else if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i); + else if (list.at(i)->data().toString() == "ungroup_clip") m_ungroupAction = list.at(i); } m_timelineContextTransitionMenu = transition; @@ -138,7 +173,8 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi } } -void CustomTrackView::checkAutoScroll() { +void CustomTrackView::checkAutoScroll() +{ m_autoScroll = KdenliveSettings::autoscroll(); } @@ -146,7 +182,8 @@ void CustomTrackView::checkAutoScroll() { return m_scene->m_tracksList; }*/ -void CustomTrackView::checkTrackHeight() { +void CustomTrackView::checkTrackHeight() +{ if (m_tracksHeight == KdenliveSettings::trackheight()) return; m_tracksHeight = KdenliveSettings::trackheight(); emit trackHeightChanged(); @@ -181,12 +218,6 @@ void CustomTrackView::checkTrackHeight() { update(); } -// virtual -void CustomTrackView::resizeEvent(QResizeEvent * event) { - QGraphicsView::resizeEvent(event); -} - -// virtual /** Zoom or move viewport on mousewheel * * If mousewheel+Ctrl, zooms in/out on the timeline. @@ -195,7 +226,8 @@ void CustomTrackView::resizeEvent(QResizeEvent * event) { * opposite on up/forward. * * See also http://www.kdenlive.org/mantis/view.php?id=265 */ -void CustomTrackView::wheelEvent(QWheelEvent * e) { +void CustomTrackView::wheelEvent(QWheelEvent * e) +{ if (e->modifiers() == Qt::ControlModifier) { if (e->delta() > 0) emit zoomIn(); else emit zoomOut(); @@ -205,7 +237,8 @@ void CustomTrackView::wheelEvent(QWheelEvent * e) { } } -int CustomTrackView::getPreviousVideoTrack(int track) { +int CustomTrackView::getPreviousVideoTrack(int track) +{ track = m_document->tracksCount() - track - 1; track --; for (int i = track; i > -1; i--) { @@ -215,7 +248,8 @@ int CustomTrackView::getPreviousVideoTrack(int track) { } -void CustomTrackView::slotCheckMouseScrolling() { +void CustomTrackView::slotCheckMouseScrolling() +{ if (m_scrollOffset == 0) { m_scrollTimer.stop(); return; @@ -224,7 +258,8 @@ void CustomTrackView::slotCheckMouseScrolling() { m_scrollTimer.start(); } -void CustomTrackView::slotCheckPositionScrolling() { +void CustomTrackView::slotCheckPositionScrolling() +{ // If mouse is at a border of the view, scroll if (m_moveOpMode != SEEK) return; int pos = cursorPos(); @@ -243,12 +278,14 @@ void CustomTrackView::slotCheckPositionScrolling() { // virtual -void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { +void CustomTrackView::mouseMoveEvent(QMouseEvent * event) +{ int pos = event->x(); int mappedXPos = (int)(mapToScene(event->pos()).x() + 0.5); emit mousePosition(mappedXPos); + if (event->buttons() & Qt::MidButton) return; - if ((event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL) || event->modifiers() == Qt::ShiftModifier) { + if (m_operationMode == RUBBERSELECTION || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL)) { QGraphicsView::mouseMoveEvent(event); m_moveOpMode = NONE; return; @@ -289,15 +326,15 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { m_dragItem->updateKeyFramePos(keyFramePos, pos); } - if (m_animation) delete m_animation; + delete m_animation; m_animation = NULL; - if (m_visualTip) delete m_visualTip; + delete m_visualTip; m_visualTip = NULL; return; } else if (m_operationMode == MOVEGUIDE) { - if (m_animation) delete m_animation; + delete m_animation; m_animation = NULL; - if (m_visualTip) delete m_visualTip; + delete m_visualTip; m_visualTip = NULL; QGraphicsView::mouseMoveEvent(event); return; @@ -348,7 +385,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { return; } else { if (m_visualTip) { - if (m_animation) delete m_animation; + delete m_animation; m_animation = NULL; m_animationTimer->stop(); delete m_visualTip; @@ -509,7 +546,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { slotCheckPositionScrolling(); } else m_moveOpMode = NONE; if (m_visualTip) { - if (m_animation) delete m_animation; + delete m_animation; m_animationTimer->stop(); m_animation = NULL; delete m_visualTip; @@ -522,7 +559,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { } // virtual -void CustomTrackView::mousePressEvent(QMouseEvent * event) { +void CustomTrackView::mousePressEvent(QMouseEvent * event) +{ kDebug() << "mousePressEvent STARTED"; m_menuPosition = QPoint(); m_blockRefresh = true; @@ -554,8 +592,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { return; } - if (event->modifiers() == Qt::ShiftModifier && collisionList.count() == 0) { + if (event->modifiers() & Qt::ShiftModifier && collisionList.count() == 0) { setDragMode(QGraphicsView::RubberBandDrag); + if (!(event->modifiers() & Qt::ControlModifier)) { + resetSelectionGroup(); + scene()->clearSelection(); + } QGraphicsView::mousePressEvent(event); m_blockRefresh = false; m_operationMode = RUBBERSELECTION; @@ -577,16 +619,21 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { return; } - // Find first clip or transition under mouse - int i = 0; + // Find first clip, transition or group under mouse + int ct = 0; m_dragItem = NULL; - while (i < collisionList.count()) { - if (collisionList.at(i)->type() == AVWIDGET || collisionList.at(i)->type() == TRANSITIONWIDGET) { - m_dragItem = static_cast (collisionList.at(i)); + AbstractGroupItem *dragGroup = NULL; + while (ct < collisionList.count()) { + if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) { + m_dragItem = static_cast (collisionList.at(ct)); m_dragItemInfo = m_dragItem->info(); + if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) { + //kDebug()<<"// KLIK FOUND GRP: "<sceneBoundingRect(); + dragGroup = static_cast (m_dragItem->parentItem()); + } break; } - i++; + ct++; } if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { @@ -598,14 +645,15 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { // context menu requested if (event->button() == Qt::RightButton) { if (m_dragItem) { - if (!m_dragItem->isSelected()) { + if (dragGroup) dragGroup->setSelected(true); + else if (!m_dragItem->isSelected()) { resetSelectionGroup(false); m_scene->clearSelection(); m_dragItem->setSelected(true); } } m_operationMode = NONE; - displayContextMenu(event->globalPos(), m_dragItem); + displayContextMenu(event->globalPos(), m_dragItem, dragGroup); m_menuPosition = m_clickEvent; m_dragItem = NULL; event->accept(); @@ -619,6 +667,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { m_scene->clearSelection(); event->accept(); emit clipItemSelected(NULL); + updateClipTypeActions(NULL); if (m_tool == SPACERTOOL) { QList selection; if (event->modifiers() == Qt::ControlModifier) { @@ -637,7 +686,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { m_scene->clearSelection(); for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { + if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { selection.at(i)->setSelected(true); } } @@ -649,15 +698,20 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { } // Razor tool - if (m_tool == RAZORTOOL) { + if (m_tool == RAZORTOOL && m_dragItem) { if (m_dragItem->type() == TRANSITIONWIDGET) { emit displayMessage(i18n("Cannot cut a transition"), ErrorMessage); event->accept(); m_dragItem = NULL; return; + } else if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + emit displayMessage(i18n("Cannot cut a clip in a group"), ErrorMessage); + event->accept(); + m_dragItem = NULL; + return; } AbstractClipItem *clip = static_cast (m_dragItem); - RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()), true); + RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps())); m_document->renderer()->pause(); m_commandStack->push(command); m_document->setModified(true); @@ -666,33 +720,16 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { return; } - - if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem); - else emit clipItemSelected(NULL); - - if (event->modifiers() != Qt::ControlModifier && (m_dragItem->group() || m_dragItem->isSelected())) { - // If clicked item is selected, allow move - event->accept(); - if (m_selectionGroup) m_selectionGroup->setSelected(true); - if (m_operationMode == NONE) QGraphicsView::mousePressEvent(event); - } else { - resetSelectionGroup(); - if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection(); - m_dragItem->setSelected(!m_dragItem->isSelected()); - groupSelectedItems(); - ClipItem *clip = static_cast (m_dragItem); - m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO); - m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); - } - - if (m_selectionGroup == NULL) updateSnapPoints(m_dragItem); + if (dragGroup == NULL) updateSnapPoints(m_dragItem); else { QList offsetList; - QList children = m_selectionGroup->childItems(); + QList children = dragGroup->childItems(); for (int i = 0; i < children.count(); i++) { - AbstractClipItem *item = static_cast (children.at(i)); - offsetList.append(item->startPos()); - offsetList.append(item->endPos()); + if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *item = static_cast (children.at(i)); + offsetList.append(item->startPos()); + offsetList.append(item->endPos()); + } } if (!offsetList.isEmpty()) { qSort(offsetList); @@ -708,6 +745,33 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { } } + if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem); + else emit clipItemSelected(NULL); + + if (event->modifiers() != Qt::ControlModifier && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected()))) { + // If clicked item is selected, allow move + if (dragGroup) dragGroup->setSelected(true); + //event->accept(); + if (m_operationMode == NONE) QGraphicsView::mousePressEvent(event); + } else { + resetSelectionGroup(); + if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection(); + dragGroup = NULL; + if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) { + //kDebug()<<"// KLIK FOUND GRP: "<sceneBoundingRect(); + dragGroup = static_cast (m_dragItem->parentItem()); + } + bool selected = !m_dragItem->isSelected(); + if (dragGroup) dragGroup->setSelected(selected); + else m_dragItem->setSelected(selected); + + groupSelectedItems(); + ClipItem *clip = static_cast (m_dragItem); + updateClipTypeActions(dragGroup == NULL ? clip : NULL); + m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + } + m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y())); m_operationMode = m_dragItem->operationMode(mapToScene(event->pos())); @@ -717,7 +781,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { return; } else if (m_operationMode == MOVE) { setCursor(Qt::ClosedHandCursor); - } else if (m_operationMode == TRANSITIONSTART) { + } else if (m_operationMode == TRANSITIONSTART && event->modifiers() != Qt::ControlModifier) { ItemInfo info; info.startPos = m_dragItem->startPos(); info.track = m_dragItem->track(); @@ -743,7 +807,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { } if (transitionAccepted) slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack); else emit displayMessage(i18n("Cannot add transition"), ErrorMessage); - } else if (m_operationMode == TRANSITIONEND) { + } else if (m_operationMode == TRANSITIONEND && event->modifiers() != Qt::ControlModifier) { ItemInfo info; info.endPos = GenTime(m_dragItem->endPos().frames(m_document->fps()), m_document->fps()); info.track = m_dragItem->track(); @@ -783,15 +847,22 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { //QGraphicsView::mousePressEvent(event); } -void CustomTrackView::resetSelectionGroup(bool selectItems) { +void CustomTrackView::resetSelectionGroup(bool selectItems) +{ if (m_selectionGroup) { // delete selection group bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); + QList children = m_selectionGroup->childItems(); scene()->destroyItemGroup(m_selectionGroup); for (int i = 0; i < children.count(); i++) { - if (!static_cast (children.at(i))->isItemLocked()) { + if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) { + if (!static_cast (children.at(i))->isItemLocked()) { + children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + children.at(i)->setSelected(selectItems); + } + } else if (children.at(i)->type() == GROUPWIDGET) { children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); children.at(i)->setSelected(selectItems); } @@ -801,47 +872,79 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) { } } -void CustomTrackView::groupSelectedItems(bool force) { +void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) +{ if (m_selectionGroup) { kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP"; return; } QList selection = m_scene->selectedItems(); - QGraphicsItemGroup *group = m_scene->createItemGroup(selection); - scene()->addItem(group); - QPointF top = group->sceneBoundingRect().topLeft(); - m_scene->destroyItemGroup(group); + if (selection.isEmpty()) return; + QPointF top = selection.at(0)->sceneBoundingRect().topLeft(); + // Find top left position of selection + for (int i = 1; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) { + QPointF currenttop = selection.at(i)->sceneBoundingRect().topLeft(); + if (currenttop.x() < top.x()) top.setX(currenttop.x()); + if (currenttop.y() < top.y()) top.setY(currenttop.y()); + } + } + if (force || selection.count() > 1) { bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - m_selectionGroup = new AbstractGroupItem(m_document->fps()); - m_selectionGroup->translate(-top.x(), -top.y() + 1); - m_selectionGroup->setPos(top.x(), top.y() - 1); - scene()->addItem(m_selectionGroup); - for (int i = 0; i < selection.count(); i++) { - if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { - m_selectionGroup->addToGroup(selection.at(i)); - selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + if (createNewGroup) { + AbstractGroupItem *newGroup = m_document->clipManager()->createGroup(); + newGroup->translate(-top.x(), -top.y() + 1); + newGroup->setPos(top.x(), top.y() - 1); + scene()->addItem(newGroup); + + // CHeck if we are trying to include a group in a group + QList groups; + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast(selection.at(i)))) { + groups.append(static_cast(selection.at(i))); + } else if (selection.at(i)->parentItem() && !groups.contains(static_cast(selection.at(i)->parentItem()))) groups.append(static_cast(selection.at(i)->parentItem())); + } + if (!groups.isEmpty()) { + // ungroup previous groups + while (!groups.isEmpty()) { + AbstractGroupItem *grp = groups.takeFirst(); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } + selection = m_scene->selectedItems(); } - } - KdenliveSettings::setSnaptopoints(snap); - if (m_selectionGroup) { - /*bool snap = KdenliveSettings::snaptopoints(); - KdenliveSettings::setSnaptopoints(false); - QPointF top = m_selectionGroup->sceneBoundingRect().topLeft(); - // kDebug()<<"SEL GRP TOP: "<translate(-top.x(), -top.y()); - m_selectionGroup->setPos(top);*/ - m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); - m_selectionGroupInfo.track = m_selectionGroup->track(); - //KdenliveSettings::setSnaptopoints(snap); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { + newGroup->addToGroup(selection.at(i)); + selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + } + } + KdenliveSettings::setSnaptopoints(snap); + } else { + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + m_selectionGroup->translate(-top.x(), -top.y() + 1); + m_selectionGroup->setPos(top.x(), top.y() - 1); + scene()->addItem(m_selectionGroup); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->parentItem() == NULL && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { + m_selectionGroup->addToGroup(selection.at(i)); + selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable); + } + } + KdenliveSettings::setSnaptopoints(snap); + if (m_selectionGroup) { + m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); + m_selectionGroupInfo.track = m_selectionGroup->track(); + } } } else resetSelectionGroup(); } -void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { +void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) +{ kDebug() << "++++++++++++ DBL CLK"; if (m_dragItem && m_dragItem->hasKeyFrames()) { if (m_moveOpMode == KEYFRAME) { @@ -930,7 +1033,8 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) { } -void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int index, const QString keyframes) { +void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int index, const QString keyframes) +{ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track); if (clip) { clip->setKeyframes(index, keyframes); @@ -939,26 +1043,40 @@ void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int } -void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) { +void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, AbstractGroupItem *group) +{ if (clip == NULL) m_timelineContextMenu->popup(pos); - else if (clip->type() == AVWIDGET) { - ClipItem *item = static_cast (clip); - m_changeSpeedAction->setEnabled(item->clipType() == AV || item->clipType() == VIDEO); + else if (group != NULL) { + m_changeSpeedAction->setEnabled(false); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + m_ungroupAction->setEnabled(true); + updateClipTypeActions(NULL); m_timelineContextClipMenu->popup(pos); - } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos); + } else { + m_ungroupAction->setEnabled(false); + if (clip->type() == AVWIDGET) { + ClipItem *item = static_cast (clip); + updateClipTypeActions(item); + m_changeSpeedAction->setEnabled(item->clipType() == AV || item->clipType() == VIDEO); + m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); + m_timelineContextClipMenu->popup(pos); + } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos); + } } -void CustomTrackView::activateMonitor() { +void CustomTrackView::activateMonitor() +{ emit activateDocumentMonitor(); } -void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { +void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) +{ if (event->mimeData()->hasFormat("kdenlive/clip")) { + m_clipDrag = true; resetSelectionGroup(); - QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(";"); + QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(';'); m_selectionGroup = new AbstractGroupItem(m_document->fps()); - QPoint pos = QPoint(); + QPoint pos; DocClipBase *clip = m_document->getBaseClip(list.at(0)); if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0); ItemInfo info; @@ -977,13 +1095,14 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { scene()->addItem(m_selectionGroup); event->acceptProposedAction(); } else if (event->mimeData()->hasFormat("kdenlive/producerslist")) { - QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(";"); + m_clipDrag = true; + QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(';'); m_scene->clearSelection(); resetSelectionGroup(false); m_selectionGroup = new AbstractGroupItem(m_document->fps()); - QPoint pos = QPoint(); - GenTime start = GenTime(); + QPoint pos; + GenTime start; QList offsetList; for (int i = 0; i < ids.size(); ++i) { DocClipBase *clip = m_document->getBaseClip(ids.at(i)); @@ -1003,11 +1122,16 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) { updateSnapPoints(NULL, offsetList); scene()->addItem(m_selectionGroup); event->acceptProposedAction(); - } else QGraphicsView::dragEnterEvent(event); + } else { + // the drag is not a clip (may be effect, ...) + m_clipDrag = false; + QGraphicsView::dragEnterEvent(event); + } } -bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos) const { +bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos) const +{ QPolygonF path; QList children = group->childItems(); for (int i = 0; i < children.count(); i++) { @@ -1037,7 +1161,8 @@ bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos } -void CustomTrackView::slotRefreshEffects(ClipItem *clip) { +void CustomTrackView::slotRefreshEffects(ClipItem *clip) +{ int track = m_document->tracksCount() - clip->track(); GenTime pos = clip->startPos(); if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false, false)) { @@ -1052,7 +1177,8 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip) { m_document->renderer()->doRefresh(); } -void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { +void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) +{ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { if (!m_document->renderer()->mltAddEffect(track, pos, clip->addEffect(effect))) @@ -1061,7 +1187,8 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) { } else emit displayMessage(i18n("Cannot find clip to add effect"), ErrorMessage); } -void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { +void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) +{ QString index = effect.attribute("kdenlive_ix"); if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true) && effect.attribute("disabled") != "1") { kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled"); @@ -1075,8 +1202,52 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) { } } -void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) { +void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group) +{ + QList itemList = group->childItems(); + QUndoCommand *effectCommand = new QUndoCommand(); + QString effectName; + QDomNode namenode = effect.elementsByTagName("name").item(0); + if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); + else effectName = i18n("effect"); + effectCommand->setText(i18n("Add %1", effectName)); + int count = 0; + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *item = (ClipItem *)itemList.at(i); + if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") { + emit displayMessage(i18n("Effect already present in clip"), ErrorMessage); + continue; + } + if (item->isItemLocked()) { + continue; + } + item->initEffect(effect); + if (effect.attribute("tag") == "ladspa") { + QString ladpsaFile = m_document->getLadspaFile(); + initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); + effect.setAttribute("src", ladpsaFile); + } + new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand); + count++; + } + } + if (count > 0) { + m_commandStack->push(effectCommand); + m_document->setModified(true); + } else delete effectCommand; +} + +void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) +{ QList itemList; + QUndoCommand *effectCommand = new QUndoCommand(); + QString effectName; + QDomNode namenode = effect.elementsByTagName("name").item(0); + if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data()); + else effectName = i18n("effect"); + effectCommand->setText(i18n("Add %1", effectName)); + int count = 0; if (track == -1) itemList = scene()->selectedItems(); if (itemList.isEmpty()) { ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, track); @@ -1091,26 +1262,34 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) emit displayMessage(i18n("Effect already present in clip"), ErrorMessage); continue; } + if (item->isItemLocked()) { + continue; + } item->initEffect(effect); if (effect.attribute("tag") == "ladspa") { QString ladpsaFile = m_document->getLadspaFile(); initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect)); effect.setAttribute("src", ladpsaFile); } - AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true); - m_commandStack->push(command); + new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand); + count++; } } - m_document->setModified(true); + if (count > 0) { + m_commandStack->push(effectCommand); + m_document->setModified(true); + } else delete effectCommand; } -void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) { +void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) +{ AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, false); m_commandStack->push(command); m_document->setModified(true); } -void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser) { +void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser) +{ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { EffectsParameterList effectParams = clip->getEffectArgs(effect); @@ -1126,7 +1305,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i } if (effectParams.paramValue("disabled") == "1") { if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"), false)) { - kDebug() << "////// DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex(); + kDebug() << "////// DISABLING EFFECT: " << ix << ", CURRENTLA: " << clip->selectedEffectIndex(); } else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage); } else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams)) emit displayMessage(i18n("Problem editing effect"), ErrorMessage); @@ -1152,7 +1331,8 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i m_document->setModified(true); } -void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) { +void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) +{ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track); if (clip) { m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos); @@ -1165,7 +1345,8 @@ void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos) m_document->setModified(true); } -void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable) { +void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable) +{ QDomElement effect = clip->effectAt(effectPos); QDomElement oldEffect = effect.cloneNode().toElement(); effect.setAttribute("disabled", disable); @@ -1174,18 +1355,21 @@ void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool m_document->setModified(true); } -void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos) { - MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos, true); +void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos) +{ + MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos); m_commandStack->push(command); m_document->setModified(true); } -void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) { +void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) +{ EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldeffect, effect, ix, true); m_commandStack->push(command); } -void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { +void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) +{ if (cut) { // cut clip ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); @@ -1217,6 +1401,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { if (dup->checkKeyFrames()) slotRefreshEffects(dup); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); + m_document->setModified(true); kDebug() << "///////// CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25); kDebug() << "// CUTTING CLIP dONE"; } else { @@ -1251,6 +1436,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); + m_document->setModified(true); } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); @@ -1258,11 +1444,13 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut) { QTimer::singleShot(3000, this, SLOT(slotEnableRefresh())); } -void CustomTrackView::slotEnableRefresh() { +void CustomTrackView::slotEnableRefresh() +{ m_blockRefresh = false; } -void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { +void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) +{ QList itemList = scene()->selectedItems(); if (itemList.count() == 1) { if (itemList.at(0)->type() == AVWIDGET) { @@ -1349,7 +1537,8 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition) { } } -void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition) { +void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionInfo, int endTrack, QDomElement transition) +{ if (transitionInfo.startPos >= transitionInfo.endPos) { emit displayMessage(i18n("Invalid transition"), ErrorMessage); return; @@ -1359,7 +1548,8 @@ void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, m_document->setModified(true); } -void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) { +void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) +{ Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params, true); //kDebug() << "---- ADDING transition " << params.attribute("value"); if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML())) { @@ -1371,7 +1561,8 @@ void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomE } } -void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) { +void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/) +{ Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track); if (!item) { emit displayMessage(i18n("Select clip to delete"), ErrorMessage); @@ -1384,14 +1575,16 @@ void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QD m_document->setModified(true); } -void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) { +void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old) +{ kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack"); EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), false); m_commandStack->push(command); m_document->setModified(true); } -void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) { +void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget) +{ Transition *item = getTransitionItemAt(pos, track); if (!item) { kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track; @@ -1404,22 +1597,22 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr m_document->setModified(true); } -void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) { +void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) +{ event->setDropAction(Qt::IgnoreAction); const QPointF pos = mapToScene(event->pos()); - if (m_selectionGroup) { + if (m_selectionGroup && m_clipDrag) { m_selectionGroup->setPos(pos.x(), pos.y()); event->setDropAction(Qt::MoveAction); - if (event->mimeData()->hasFormat("kdenlive/producerslist") || event->mimeData()->hasFormat("kdenlive/clip")) { - event->acceptProposedAction(); - } + event->acceptProposedAction(); } else { QGraphicsView::dragMoveEvent(event); } } -void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { - if (m_selectionGroup) { +void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) +{ + if (m_selectionGroup && m_clipDrag) { QList items = m_selectionGroup->childItems(); qDeleteAll(items); scene()->destroyItemGroup(m_selectionGroup); @@ -1427,8 +1620,9 @@ void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { } else QGraphicsView::dragLeaveEvent(event); } -void CustomTrackView::dropEvent(QDropEvent * event) { - if (m_selectionGroup) { +void CustomTrackView::dropEvent(QDropEvent * event) +{ + if (m_selectionGroup && m_clipDrag) { QList items = m_selectionGroup->childItems(); resetSelectionGroup(); m_scene->clearSelection(); @@ -1436,6 +1630,11 @@ void CustomTrackView::dropEvent(QDropEvent * event) { for (int i = 0; i < items.count(); i++) { ClipItem *item = static_cast (items.at(i)); if (!hasVideoClip && (item->clipType() == AV || item->clipType() == VIDEO)) hasVideoClip = true; + if (items.count() == 1) { + updateClipTypeActions(item); + } else { + updateClipTypeActions(NULL); + } AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false); m_commandStack->push(command); item->baseClip()->addReference(); @@ -1461,16 +1660,17 @@ void CustomTrackView::dropEvent(QDropEvent * event) { m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track())); item->setSelected(true); } + m_document->setModified(true); m_changeSpeedAction->setEnabled(hasVideoClip); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); groupSelectedItems(true); - m_document->setModified(true); } else QGraphicsView::dropEvent(event); setFocus(); } -QStringList CustomTrackView::mimeTypes() const { +QStringList CustomTrackView::mimeTypes() const +{ QStringList qstrList; // list of accepted mime types for drop qstrList.append("text/plain"); @@ -1479,22 +1679,29 @@ QStringList CustomTrackView::mimeTypes() const { return qstrList; } -Qt::DropActions CustomTrackView::supportedDropActions() const { +Qt::DropActions CustomTrackView::supportedDropActions() const +{ // returns what actions are supported when dropping return Qt::MoveAction; } -void CustomTrackView::setDuration(int duration) { - if (duration > sceneRect().width()) - setSceneRect(0, 0, (duration + 100), sceneRect().height()); +void CustomTrackView::setDuration(int duration) +{ + int diff = qAbs(duration - sceneRect().width()); + if (diff * matrix().m11() > -50) { + if (matrix().m11() < 0.4) setSceneRect(0, 0, (duration + 100 / matrix().m11()), sceneRect().height()); + else setSceneRect(0, 0, (duration + 300), sceneRect().height()); + } m_projectDuration = duration; } -int CustomTrackView::duration() const { +int CustomTrackView::duration() const +{ return m_projectDuration; } -void CustomTrackView::addTrack(TrackInfo type, int ix) { +void CustomTrackView::addTrack(TrackInfo type, int ix) +{ if (ix == -1) m_document->insertTrack(ix, type); else { m_document->insertTrack(m_document->tracksCount() - ix, type); @@ -1526,7 +1733,11 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) { ClipItem *clip = static_cast (item); // We add a move clip command so that we get the correct producer for new track number if (clip->clipType() == AV || clip->clipType() == AUDIO) { - m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), clip->baseClip()->producer(clipinfo.track)); + Mlt::Producer *prod; + if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track); + else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); + else prod = clip->baseClip()->producer(clipinfo.track); + m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod); kDebug() << "// UPDATING CLIP TO TRACK PROD: " << clipinfo.track; } } else if (item->type() == TRANSITIONWIDGET) { @@ -1553,7 +1764,8 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) { //setFixedHeight(50 * m_tracksCount); } -void CustomTrackView::removeTrack(int ix) { +void CustomTrackView::removeTrack(int ix) +{ // Delete track in MLT playlist m_document->renderer()->mltDeleteTrack(m_document->tracksCount() - ix); m_document->deleteTrack(m_document->tracksCount() - ix - 1); @@ -1586,8 +1798,13 @@ void CustomTrackView::removeTrack(int ix) { ItemInfo clipinfo = clip->info(); kDebug() << "// CLIP TRK IS: " << clipinfo.track; // We add a move clip command so that we get the correct producer for new track number - if (clip->clipType() == AV || clip->clipType() == AUDIO) - m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), clip->baseClip()->producer(clipinfo.track)); + if (clip->clipType() == AV || clip->clipType() == AUDIO) { + Mlt::Producer *prod; + if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(clipinfo.track); + else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); + else prod = clip->baseClip()->producer(clipinfo.track); + m_document->renderer()->mltUpdateClipProducer((int)(m_document->tracksCount() - clipinfo.track), clipinfo.startPos.frames(m_document->fps()), prod); + } } else if (children.at(i)->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (children.at(i)); tr->updateItem(); @@ -1612,7 +1829,8 @@ void CustomTrackView::removeTrack(int ix) { viewport()->update(); } -void CustomTrackView::changeTrack(int ix, TrackInfo type) { +void CustomTrackView::changeTrack(int ix, TrackInfo type) +{ int tracknumber = m_document->tracksCount() - ix; m_document->setTrackType(tracknumber - 1, type); m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); @@ -1621,7 +1839,8 @@ void CustomTrackView::changeTrack(int ix, TrackInfo type) { } -void CustomTrackView::slotSwitchTrackAudio(int ix) { +void CustomTrackView::slotSwitchTrackAudio(int ix) +{ /*for (int i = 0; i < m_document->tracksCount(); i++) kDebug() << "TRK " << i << " STATE: " << m_document->trackInfoAt(i).isMute << m_document->trackInfoAt(i).isBlind;*/ int tracknumber = m_document->tracksCount() - ix; @@ -1631,14 +1850,16 @@ void CustomTrackView::slotSwitchTrackAudio(int ix) { m_document->setModified(true); } -void CustomTrackView::slotSwitchTrackLock(int ix) { +void CustomTrackView::slotSwitchTrackLock(int ix) +{ int tracknumber = m_document->tracksCount() - ix - 1; - LockTrackCommand *command = new LockTrackCommand(this, ix, !m_document->trackInfoAt(tracknumber).isLocked, true); + LockTrackCommand *command = new LockTrackCommand(this, ix, !m_document->trackInfoAt(tracknumber).isLocked); m_commandStack->push(command); } -void CustomTrackView::lockTrack(int ix, bool lock) { +void CustomTrackView::lockTrack(int ix, bool lock) +{ int tracknumber = m_document->tracksCount() - ix - 1; m_document->switchTrackLock(tracknumber, lock); emit doTrackLock(ix, lock); @@ -1657,14 +1878,16 @@ void CustomTrackView::lockTrack(int ix, bool lock) { m_document->setModified(true); } -void CustomTrackView::slotSwitchTrackVideo(int ix) { +void CustomTrackView::slotSwitchTrackVideo(int ix) +{ int tracknumber = m_document->tracksCount() - ix; m_document->switchTrackVideo(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isBlind); m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind); m_document->setModified(true); } -void CustomTrackView::slotRemoveSpace() { +void CustomTrackView::slotRemoveSpace() +{ GenTime pos; int track = 0; if (m_menuPosition.isNull()) { @@ -1691,8 +1914,8 @@ void CustomTrackView::slotRemoveSpace() { QRectF r(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 1); QList items = m_scene->items(r); - QList clipsToMove = QList (); - QList transitionsToMove = QList (); + QList clipsToMove; + QList transitionsToMove; for (int i = 0; i < items.count(); i++) { if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { @@ -1710,7 +1933,8 @@ void CustomTrackView::slotRemoveSpace() { m_commandStack->push(command); } -void CustomTrackView::slotInsertSpace() { +void CustomTrackView::slotInsertSpace() +{ GenTime pos; int track = 0; if (m_menuPosition.isNull()) { @@ -1736,8 +1960,8 @@ void CustomTrackView::slotInsertSpace() { QRectF r(pos.frames(m_document->fps()), minh, sceneRect().width() - pos.frames(m_document->fps()), maxh); QList items = m_scene->items(r); - QList clipsToMove = QList (); - QList transitionsToMove = QList (); + QList clipsToMove; + QList transitionsToMove; for (int i = 0; i < items.count(); i++) { if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) { @@ -1755,7 +1979,8 @@ void CustomTrackView::slotInsertSpace() { m_commandStack->push(command); } -void CustomTrackView::insertSpace(QList clipsToMove, QList transToMove, int track, const GenTime duration, const GenTime offset) { +void CustomTrackView::insertSpace(QList clipsToMove, QList transToMove, int track, const GenTime duration, const GenTime offset) +{ int diff = duration.frames(m_document->fps()); resetSelectionGroup(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); @@ -1763,9 +1988,6 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t ClipItem *clip; Transition *transition; - kDebug() << "/// STARTING SPACE INSERT"; - - // Create lists with start pos for each track QMap trackClipStartList; QMap trackTransitionStartList; @@ -1776,34 +1998,51 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t } if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); i++) { - kDebug() << "/// FETCHING CLIP: " << i; clip = getClipItemAtStart(clipsToMove.at(i).startPos + offset, clipsToMove.at(i).track); if (clip) { - m_selectionGroup->addToGroup(clip); + if (clip->parentItem()) { + m_selectionGroup->addToGroup(clip->parentItem()); + clip->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable); + } else { + m_selectionGroup->addToGroup(clip); + clip->setFlags(QGraphicsItem::ItemIsSelectable); + } if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track)) trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps()); - clip->setFlags(QGraphicsItem::ItemIsSelectable); } else emit displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames(clipsToMove.at(i).startPos.frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage); } if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); i++) { - kDebug() << "/// FETCHING TRANS: " << i; transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track); if (transition) { + if (transition->parentItem()) m_selectionGroup->addToGroup(transition->parentItem()); m_selectionGroup->addToGroup(transition); if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track)) trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps()); transition->setFlags(QGraphicsItem::ItemIsSelectable); } else emit displayMessage(i18n("Cannot move transition at position %1, track %2", m_document->timecode().getTimecodeFromFrames(transToMove.at(i).startPos.frames(m_document->fps())), transToMove.at(i).track), ErrorMessage); } - kDebug() << "/// STARTING SPACE DONE"; m_selectionGroup->translate(diff, 0); + + // update items coordinates + QList itemList = scene()->selectedItems(); + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { + static_cast < AbstractClipItem *>(itemList.at(i))->updateItem(); + } else if (itemList.at(i)->type() == GROUPWIDGET) { + QList children = itemList.at(i)->childItems(); + for (int j = 0; j < children.count(); j++) { + static_cast < AbstractClipItem *>(children.at(j))->updateItem(); + } + } + } resetSelectionGroup(false); - kDebug() << "/// STARTING SPACE DONE2"; if (track != -1) track = m_document->tracksCount() - track; m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, duration, offset); } -void CustomTrackView::deleteClip(const QString &clipId) { +void CustomTrackView::deleteClip(const QString &clipId) +{ + resetSelectionGroup(); QList itemList = items(); QUndoCommand *deleteCommand = new QUndoCommand(); deleteCommand->setText(i18n("Delete timeline clips")); @@ -1813,16 +2052,20 @@ void CustomTrackView::deleteClip(const QString &clipId) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { count++; + if (item->parentItem()) { + // Clip is in a group, destroy the group + new GroupClipsCommand(this, QList() << item->info(), QList(), false, deleteCommand); + } new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteCommand); - //delete item; } } } - if (count > 0) m_commandStack->push(deleteCommand); - else delete deleteCommand; + if (count == 0) delete deleteCommand; + else m_commandStack->push(deleteCommand); } -void CustomTrackView::setCursorPos(int pos, bool seek) { +void CustomTrackView::setCursorPos(int pos, bool seek) +{ emit cursorMoved((int)(m_cursorPos), (int)(pos)); m_cursorPos = pos; m_cursorLine->setPos(pos, 0); @@ -1830,15 +2073,18 @@ void CustomTrackView::setCursorPos(int pos, bool seek) { else if (m_autoScroll) checkScrolling(); } -void CustomTrackView::updateCursorPos() { +void CustomTrackView::updateCursorPos() +{ m_cursorLine->setPos(m_cursorPos, 0); } -int CustomTrackView::cursorPos() { +int CustomTrackView::cursorPos() +{ return (int)(m_cursorPos); } -void CustomTrackView::moveCursorPos(int delta) { +void CustomTrackView::moveCursorPos(int delta) +{ if (m_cursorPos + delta < 0) delta = 0 - m_cursorPos; emit cursorMoved((int)(m_cursorPos), (int)((m_cursorPos + delta))); m_cursorPos += delta; @@ -1846,20 +2092,23 @@ void CustomTrackView::moveCursorPos(int delta) { m_document->renderer()->seek(GenTime(m_cursorPos, m_document->fps())); } -void CustomTrackView::initCursorPos(int pos) { +void CustomTrackView::initCursorPos(int pos) +{ emit cursorMoved((int)(m_cursorPos), (int)(pos)); m_cursorPos = pos; m_cursorLine->setPos(pos, 0); checkScrolling(); } -void CustomTrackView::checkScrolling() { +void CustomTrackView::checkScrolling() +{ int vert = verticalScrollBar()->value(); int hor = cursorPos(); ensureVisible(hor, vert + 10, 2, 2, 50, 0); } -void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { +void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) +{ if (m_moveOpMode == SEEK) m_moveOpMode = NONE; QGraphicsView::mouseReleaseEvent(event); if (m_scrollTimer.isActive()) m_scrollTimer.stop(); @@ -1878,19 +2127,17 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_dragItem = NULL; return; } else if (m_operationMode == SPACER) { - int endClick = (int)(mapToScene(event->pos()).x() + 0.5); - int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5); - int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); - if (m_selectionGroup->sceneBoundingRect().height() > m_tracksHeight) { + int track; + if (event->modifiers() != Qt::ControlModifier) { // We are moving all tracks track = -1; - } + } else track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight); GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos; if (timeOffset != GenTime()) { QList items = m_selectionGroup->childItems(); - QList clipsToMove = QList (); - QList transitionsToMove = QList (); + QList clipsToMove; + QList transitionsToMove; // Create lists with start pos for each track QMap trackClipStartList; @@ -1901,16 +2148,26 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { trackTransitionStartList[i] = -1; } + int max = items.count(); + for (int i = 0; i < max; i++) { + if (items.at(i)->type() == GROUPWIDGET) + items += static_cast (items.at(i))->childItems(); + } + for (int i = 0; i < items.count(); i++) { - AbstractClipItem *item = static_cast (items.at(i)); - ItemInfo info = item->info(); - if (item->type() == AVWIDGET) { + if (items.at(i)->type() == AVWIDGET) { + AbstractClipItem *item = static_cast (items.at(i)); + ItemInfo info = item->info(); clipsToMove.append(info); + item->updateItem(); if (trackClipStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - info.track)) trackClipStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps()); - } else if (item->type() == TRANSITIONWIDGET) { + } else if (items.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *item = static_cast (items.at(i)); + ItemInfo info = item->info(); transitionsToMove.append(info); - if (trackClipStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - info.track)) + item->updateItem(); + if (trackTransitionStartList.value(m_document->tracksCount() - info.track) == -1 || info.startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - info.track)) trackTransitionStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps()); } } @@ -1918,6 +2175,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false); m_commandStack->push(command); if (track != -1) track = m_document->tracksCount() - track; + kDebug() << "SPACER TRACK:" << track; m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime()); } resetSelectionGroup(false); @@ -1939,11 +2197,15 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { if (m_operationMode == MOVE) { setCursor(Qt::OpenHandCursor); - if (m_selectionGroup == NULL) { + if (m_dragItem->parentItem() == 0) { // we are moving one clip, easy if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { ClipItem *item = static_cast (m_dragItem); - bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), item->baseClip()->producer(info.track)); + Mlt::Producer *prod; + if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(m_dragItemInfo.track); + else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer(); + else prod = item->baseClip()->producer(m_dragItemInfo.track); + bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), prod); if (success) { int tracknumber = m_document->tracksCount() - item->track() - 1; bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; @@ -2020,10 +2282,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_commandStack->push(moveCommand); } else { // undo last move and emit error message - MoveClipCommand *command = new MoveClipCommand(this, info, m_dragItemInfo, true); - m_commandStack->push(command); + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + item->setPos((int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItemInfo.track * m_tracksHeight + 1)); + KdenliveSettings::setSnaptopoints(snap); emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(m_dragItemInfo.startPos.frames(m_document->fps()))), ErrorMessage); } + m_document->setModified(true); } if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { Transition *transition = static_cast (m_dragItem); @@ -2040,19 +2305,28 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } else { // Moving several clips. We need to delete them and readd them to new position, // or they might overlap each other during the move + QGraphicsItemGroup *group = static_cast (m_dragItem->parentItem()); + QList items = group->childItems(); - QList items = m_selectionGroup->childItems(); - - QList clipsToMove = QList (); - QList transitionsToMove = QList (); + QList clipsToMove; + QList transitionsToMove; - GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos; - const int trackOffset = m_selectionGroup->track() - m_selectionGroupInfo.track; + GenTime timeOffset = GenTime(m_dragItem->scenePos().x(), m_document->fps()) - m_dragItemInfo.startPos; + const int trackOffset = (int)(m_dragItem->scenePos().y() / m_tracksHeight) - m_dragItemInfo.track; + //kDebug() << "// MOVED SEVERAL CLIPS" << timeOffset.frames(25); if (timeOffset != GenTime() || trackOffset != 0) { - QUndoCommand *moveClips = new QUndoCommand(); - moveClips->setText(i18n("Move group")); // remove items in MLT playlist + + // Expand groups + int max = items.count(); + for (int i = 0; i < max; i++) { + if (items.at(i)->type() == GROUPWIDGET) { + items += items.at(i)->childItems(); + } + } + for (int i = 0; i < items.count(); i++) { + if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (items.at(i)); ItemInfo info = item->info(); if (item->type() == AVWIDGET) { @@ -2071,20 +2345,25 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { for (int i = 0; i < items.count(); i++) { // re-add items in correct place + if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (items.at(i)); item->updateItem(); ItemInfo info = item->info(); int tracknumber = m_document->tracksCount() - info.track - 1; bool isLocked = m_document->trackInfoAt(tracknumber).isLocked; if (isLocked) { - m_selectionGroup->removeFromGroup(item); + group->removeFromGroup(item); item->setItemLocked(true); } if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); info.track = m_document->tracksCount() - info.track; - m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track)); + Mlt::Producer *prod; + if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track); + else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); + else prod = clip->baseClip()->producer(info.track); + m_document->renderer()->mltInsertClip(info, clip->xml(), prod); for (int i = 0; i < clip->effectsCount(); i++) { m_document->renderer()->mltAddEffect(info.track, info.startPos, clip->getEffectArgs(clip->effectAt(i)), false); } @@ -2099,15 +2378,19 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } } - new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveClips); - m_commandStack->push(moveClips); + MoveGroupCommand *move = new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false); + m_commandStack->push(move); - QPointF top = m_selectionGroup->sceneBoundingRect().topLeft(); + //QPointF top = group->sceneBoundingRect().topLeft(); //QPointF oldpos = m_selectionGroup->scenePos(); //kDebug()<<"SELECTION GRP POS: "<scenePos()<<", TOP: "<setPos(top); - m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); - m_selectionGroupInfo.track = m_selectionGroup->track(); + //group->setPos(top); + //TODO: get rid of the 3 lines below + if (m_selectionGroup) { + m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); + m_selectionGroupInfo.track = m_selectionGroup->track(); + } + m_document->setModified(true); } } @@ -2160,7 +2443,17 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } } - + if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + // Item was resized, rebuild group; + AbstractGroupItem *group = static_cast (m_dragItem->parentItem()); + QList children = group->childItems(); + m_document->clipManager()->removeGroup(group); + scene()->destroyItemGroup(group); + for (int i = 0; i < children.count(); i++) { + children.at(i)->setSelected(true); + } + groupSelectedItems(false, true); + } //m_document->renderer()->doRefresh(); } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { // resize end @@ -2211,6 +2504,17 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { m_commandStack->push(command); } } + if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { + // Item was resized, rebuild group; + AbstractGroupItem *group = static_cast (m_dragItem->parentItem()); + QList children = group->childItems(); + m_document->clipManager()->removeGroup(group); + scene()->destroyItemGroup(group); + for (int i = 0; i < children.count(); i++) { + children.at(i)->setSelected(true); + } + groupSelectedItems(false, true); + } //m_document->renderer()->doRefresh(); } else if (m_operationMode == FADEIN) { // resize fade in effect @@ -2305,11 +2609,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) ? static_cast (m_dragItem) : NULL); - m_document->setModified(true); + if (m_operationMode != NONE && m_operationMode != MOVE) m_document->setModified(true); m_operationMode = NONE; } -void CustomTrackView::deleteClip(ItemInfo info) { +void CustomTrackView::deleteClip(ItemInfo info) +{ ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); if (!item || m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, info.startPos) == false) { @@ -2332,23 +2637,53 @@ void CustomTrackView::deleteClip(ItemInfo info) { scene()->removeItem(item); if (m_dragItem == item) m_dragItem = NULL; delete item; + m_document->setModified(true); m_document->renderer()->doRefresh(); } -void CustomTrackView::deleteSelectedClips() { +void CustomTrackView::deleteSelectedClips() +{ + resetSelectionGroup(); QList itemList = scene()->selectedItems(); if (itemList.count() == 0) { emit displayMessage(i18n("Select clip to delete"), ErrorMessage); return; } + scene()->clearSelection(); QUndoCommand *deleteSelected = new QUndoCommand(); deleteSelected->setText(i18n("Delete selected items")); bool resetGroup = false; + + // expand & destroy groups + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == GROUPWIDGET) { + QList children = itemList.at(i)->childItems(); + itemList += children; + QList clipInfos; + QList transitionInfos; + GenTime currentPos = GenTime(m_cursorPos, m_document->fps()); + for (int j = 0; j < children.count(); j++) { + if (children.at(j)->type() == AVWIDGET) { + AbstractClipItem *clip = static_cast (children.at(j)); + if (!clip->isItemLocked()) clipInfos.append(clip->info()); + } else if (children.at(j)->type() == TRANSITIONWIDGET) { + AbstractClipItem *clip = static_cast (children.at(j)); + if (!clip->isItemLocked()) transitionInfos.append(clip->info()); + } + } + if (clipInfos.count() > 0) { + new GroupClipsCommand(this, clipInfos, transitionInfos, false, deleteSelected); + } + } + } + + for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); if (item->parentItem()) resetGroup = true; new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected); + emit clipItemSelected(NULL); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { Transition *item = static_cast (itemList.at(i)); if (item->parentItem()) resetGroup = true; @@ -2357,13 +2692,15 @@ void CustomTrackView::deleteSelectedClips() { info.endPos = item->endPos(); info.track = item->track(); new AddTransitionCommand(this, info, item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); + emit transitionItemSelected(NULL); } } + m_commandStack->push(deleteSelected); - if (resetGroup) resetSelectionGroup(); } -void CustomTrackView::changeClipSpeed() { +void CustomTrackView::changeClipSpeed() +{ QList itemList = scene()->selectedItems(); if (itemList.count() == 0) { emit displayMessage(i18n("Select clip to change speed"), ErrorMessage); @@ -2383,7 +2720,7 @@ void CustomTrackView::changeClipSpeed() { double speed = (double) percent / 100.0; if (item->speed() != speed && (item->clipType() == VIDEO || item->clipType() == AV)) { count++; - new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), true, changeSelected); + new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected); } } } @@ -2391,7 +2728,8 @@ void CustomTrackView::changeClipSpeed() { else delete changeSelected; } -void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) { +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); if (!item) { @@ -2401,29 +2739,111 @@ void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const } info.track = m_document->tracksCount() - item->track(); int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, baseclip->producer()); - kDebug() << "//CH CLIP SPEED: " << speed << "x" << oldspeed << ", END POS: " << endPos; - item->setSpeed(speed); - 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); + if (endPos >= 0) { + item->setSpeed(speed); + 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); + } else emit displayMessage(i18n("Invalid clip"), ErrorMessage); } -void CustomTrackView::cutSelectedClips() { +void CustomTrackView::cutSelectedClips() +{ QList itemList = scene()->selectedItems(); GenTime currentPos = GenTime(m_cursorPos, m_document->fps()); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); - if (currentPos > item->startPos() && currentPos < item->endPos()) { - RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos, true); + if (item->parentItem() && item->parentItem() != m_selectionGroup) { + emit displayMessage(i18n("Cannot cut a clip in a group"), ErrorMessage); + } else if (currentPos > item->startPos() && currentPos < item->endPos()) { + RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos); m_commandStack->push(command); } } } } -void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects) { +void CustomTrackView::groupClips(bool group) +{ + QList itemList = scene()->selectedItems(); + QList clipInfos; + QList transitionInfos; + GenTime currentPos = GenTime(m_cursorPos, m_document->fps()); + + // Expand groups + int max = itemList.count(); + for (int i = 0; i < max; i++) { + if (itemList.at(i)->type() == GROUPWIDGET) { + itemList += itemList.at(i)->childItems(); + } + } + + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + AbstractClipItem *clip = static_cast (itemList.at(i)); + if (!clip->isItemLocked()) clipInfos.append(clip->info()); + } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + AbstractClipItem *clip = static_cast (itemList.at(i)); + if (!clip->isItemLocked()) transitionInfos.append(clip->info()); + } + } + if (clipInfos.count() > 0) { + GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group); + m_commandStack->push(command); + } +} + +void CustomTrackView::doGroupClips(QList clipInfos, QList transitionInfos, bool group) +{ + resetSelectionGroup(); + m_scene->clearSelection(); + if (!group) { + for (int i = 0; i < clipInfos.count(); i++) { + ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); + if (clip == NULL) continue; + if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast (clip->parentItem()); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } + clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + } + for (int i = 0; i < transitionInfos.count(); i++) { + Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); + if (tr == NULL) continue; + if (tr->parentItem() && tr->parentItem()->type() == GROUPWIDGET) { + AbstractGroupItem *grp = static_cast (tr->parentItem()); + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } + tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); + } + m_document->setModified(true); + return; + } + + QList groups; + for (int i = 0; i < clipInfos.count(); i++) { + ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); + if (clip) { + clip->setSelected(true); + } + } + for (int i = 0; i < transitionInfos.count(); i++) { + Transition *clip = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track); + if (clip) { + clip->setSelected(true); + } + } + + groupSelectedItems(false, true); + m_document->setModified(true); +} + +void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects) +{ DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId); if (baseclip == NULL) { emit displayMessage(i18n("No clip copied"), ErrorMessage); @@ -2431,6 +2851,8 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i } ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble()); item->setEffectList(effects); + if (xml.hasAttribute("audio_only")) item->setAudioOnly(true); + else if (xml.hasAttribute("video_only")) item->setVideoOnly(true); scene()->addItem(item); int tracknumber = m_document->tracksCount() - info.track - 1; @@ -2452,21 +2874,27 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i baseclip->addReference(); m_document->updateClip(baseclip->getId()); info.track = m_document->tracksCount() - info.track; - m_document->renderer()->mltInsertClip(info, xml, baseclip->producer(info.track)); + Mlt::Producer *prod; + if (item->isAudioOnly()) prod = baseclip->audioProducer(info.track); + else if (item->isVideoOnly()) prod = baseclip->videoProducer(); + else prod = baseclip->producer(info.track); + m_document->renderer()->mltInsertClip(info, xml, prod); for (int i = 0; i < item->effectsCount(); i++) { m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false); } + m_document->setModified(true); m_document->renderer()->doRefresh(); } -void CustomTrackView::slotUpdateClip(const QString &clipId) { +void CustomTrackView::slotUpdateClip(const QString &clipId) +{ QList list = scene()->items(); ClipItem *clip = NULL; for (int i = 0; i < list.size(); ++i) { if (list.at(i)->type() == AVWIDGET) { clip = static_cast (list.at(i)); if (clip->clipProducer() == clipId) { - clip->refreshClip(); + clip->refreshClip(true); ItemInfo info = clip->info(); info.track = m_document->tracksCount() - clip->track(); m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer()); @@ -2475,7 +2903,8 @@ void CustomTrackView::slotUpdateClip(const QString &clipId) { } } -ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) { +ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) +{ int framepos = (int)(pos.frames(m_document->fps())); QList list = scene()->items(QPointF(framepos - 1, track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; @@ -2489,7 +2918,8 @@ ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track) { return clip; } -ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) { +ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) +{ QList list = scene()->items(QPointF(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; for (int i = 0; i < list.size(); i++) { @@ -2502,8 +2932,9 @@ ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track) { return clip; } -ClipItem *CustomTrackView::getClipItemAt(int pos, int track) { - QList list = scene()->items(QPointF(pos , track * m_tracksHeight + m_tracksHeight / 2)); +ClipItem *CustomTrackView::getClipItemAt(int pos, int track) +{ + QList list = scene()->items(QPointF(pos, track * m_tracksHeight + m_tracksHeight / 2)); ClipItem *clip = NULL; for (int i = 0; i < list.size(); i++) { if (list.at(i)->type() == AVWIDGET) { @@ -2514,13 +2945,15 @@ ClipItem *CustomTrackView::getClipItemAt(int pos, int track) { return clip; } -ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) { +ClipItem *CustomTrackView::getClipItemAt(GenTime pos, int track) +{ int framepos = (int)(pos.frames(m_document->fps())); return getClipItemAt(framepos, track); } -Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) { - QList list = scene()->items(QPointF(pos.frames(m_document->fps()), (track + 1) * m_tracksHeight)); +Transition *CustomTrackView::getTransitionItemAt(int pos, int track) +{ + QList list = scene()->items(QPointF(pos, (track + 1) * m_tracksHeight)); Transition *clip = NULL; for (int i = 0; i < list.size(); i++) { if (list.at(i)->type() == TRANSITIONWIDGET) { @@ -2531,7 +2964,13 @@ Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) { return clip; } -Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) { +Transition *CustomTrackView::getTransitionItemAt(GenTime pos, int track) +{ + return getTransitionItemAt(pos.frames(m_document->fps()), track); +} + +Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) +{ int framepos = (int)(pos.frames(m_document->fps())); QList list = scene()->items(QPointF(framepos - 1, (track + 1) * m_tracksHeight)); Transition *clip = NULL; @@ -2545,7 +2984,8 @@ Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track) { return clip; } -Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track) { +Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track) +{ QList list = scene()->items(QPointF(pos.frames(m_document->fps()), (track + 1) * m_tracksHeight)); Transition *clip = NULL; for (int i = 0; i < list.size(); ++i) { @@ -2558,7 +2998,8 @@ Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track) { return clip; } -void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { +void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) +{ if (m_selectionGroup) resetSelectionGroup(false); ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track); if (!item) { @@ -2566,7 +3007,12 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { kDebug() << "----------------  ERROR, CANNOT find clip to move at.. "; return; } - bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - start.track), (int)(m_document->tracksCount() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), item->baseClip()->producer(end.track)); + Mlt::Producer *prod; + if (item->isAudioOnly()) prod = item->baseClip()->audioProducer(end.track); + else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer(); + else prod = item->baseClip()->producer(end.track); + + bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - start.track), (int)(m_document->tracksCount() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), prod); if (success) { bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); @@ -2590,6 +3036,7 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { } } KdenliveSettings::setSnaptopoints(snap); + m_document->setModified(true); } else { // undo last move and emit error message emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage); @@ -2597,22 +3044,32 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) { kDebug() << " // MOVED CLIP TO: " << end.startPos.frames(25) << ", ITEM START: " << item->startPos().frames(25); } -void CustomTrackView::moveGroup(QList startClip, QList startTransition, const GenTime offset, const int trackOffset, bool reverseMove) { +void CustomTrackView::moveGroup(QList startClip, QList startTransition, const GenTime offset, const int trackOffset, bool reverseMove) +{ // Group Items - kDebug() << "// GROUP MOVE; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset; + kDebug() << "//GRP MOVE, REVERS:" << reverseMove; + kDebug() << "// GROUP MOV; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset; resetSelectionGroup(); m_scene->clearSelection(); + QList itemList = items(); + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) + kDebug() << "ITEM " << i << ": " << static_cast (itemList.at(i))->startPos().frames(25) << ",REEL: " << itemList.at(i)->scenePos(); + } + for (int i = 0; i < startClip.count(); i++) { if (reverseMove) { startClip[i].startPos = startClip.at(i).startPos - offset; startClip[i].track = startClip.at(i).track - trackOffset; } + //kDebug()<<"//LKING FR CLIP AT:"<setItemLocked(false); - clip->setSelected(true); + if (clip->parentItem()) clip->parentItem()->setSelected(true); + else clip->setSelected(true); m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos); - } + } else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25); } for (int i = 0; i < startTransition.count(); i++) { if (reverseMove) { @@ -2622,28 +3079,33 @@ void CustomTrackView::moveGroup(QList startClip, QList sta Transition *tr = getTransitionItemAt(startTransition.at(i).startPos, startTransition.at(i).track); if (tr) { tr->setItemLocked(false); - tr->setSelected(true); + if (tr->parentItem()) tr->parentItem()->setSelected(true); + else tr->setSelected(true); m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML()); - } + } else kDebug() << "//MISSING TRANSITION AT: " << startTransition.at(i).startPos.frames(25); } - groupSelectedItems(); + groupSelectedItems(true); if (m_selectionGroup) { - QPointF pos = m_selectionGroup->pos(); - qreal posx = pos.x() + offset.frames(m_document->fps()); - qreal posy = pos.y() + trackOffset * (qreal) m_tracksHeight; bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - m_selectionGroup->setPos(posx, posy); + m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset * (qreal) m_tracksHeight); - QPointF top = m_selectionGroup->sceneBoundingRect().topLeft(); - m_selectionGroup->setPos(top); - m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); - m_selectionGroupInfo.track = m_selectionGroup->track(); + kDebug() << "%% GRP NEW POS: " << m_selectionGroup->scenePos().x(); QList children = m_selectionGroup->childItems(); + // Expand groups + int max = children.count(); + for (int i = 0; i < max; i++) { + if (children.at(i)->type() == GROUPWIDGET) { + children += children.at(i)->childItems(); + } + } + kDebug() << "// GRP MOVE; FOUND CHILDREN:" << children.count(); + for (int i = 0; i < children.count(); i++) { // re-add items in correct place + if (children.at(i)->type() != AVWIDGET && children.at(i)->type() != TRANSITIONWIDGET) continue; AbstractClipItem *item = static_cast (children.at(i)); item->updateItem(); ItemInfo info = item->info(); @@ -2655,8 +3117,13 @@ void CustomTrackView::moveGroup(QList startClip, QList sta if (item->type() == AVWIDGET) { ClipItem *clip = static_cast (item); info.track = m_document->tracksCount() - info.track; - m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track)); - } else { + Mlt::Producer *prod; + if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track); + else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer(); + else prod = clip->baseClip()->producer(info.track); + m_document->renderer()->mltInsertClip(info, clip->xml(), prod); + kDebug() << "// inserting new clp: " << info.startPos.frames(25); + } else if (item->type() == TRANSITIONWIDGET) { Transition *tr = static_cast (item); int newTrack = tr->transitionEndTrack(); kDebug() << "/// TRANSITION CURR TRK: " << newTrack; @@ -2670,11 +3137,18 @@ void CustomTrackView::moveGroup(QList startClip, QList sta } } KdenliveSettings::setSnaptopoints(snap); - } + } else kDebug() << "///////// WARNING; NO GROUP TO MOVE"; + kDebug() << "///////// DONE+++++++++++++"; + itemList = items(); + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) + kDebug() << "ITEM " << i << ": " << static_cast (itemList.at(i))->startPos().frames(25) << ",REEL: " << itemList.at(i)->scenePos(); + } } -void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) { +void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) +{ Transition *item = getTransitionItemAt(start.startPos, start.track); if (!item) { emit displayMessage(i18n("Cannot move transition at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage); @@ -2704,9 +3178,11 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) { KdenliveSettings::setSnaptopoints(snap); item->updateTransitionEndTrack(getPreviousVideoTrack(end.track)); m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos); + if (m_dragItem && m_dragItem == item) emit transitionItemSelected(item); } -void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { +void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) +{ bool resizeClipStart = true; if (start.startPos == end.startPos) resizeClipStart = false; /*if (resizeClipStart) offset = 1; @@ -2755,7 +3231,8 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) { KdenliveSettings::setSnaptopoints(snap); } -void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) { +void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) +{ if (!updateFadeOut) { int end = item->fadeIn(); if (end != 0) { @@ -2837,11 +3314,13 @@ void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut) { } } -double CustomTrackView::getSnapPointForPos(double pos) { +double CustomTrackView::getSnapPointForPos(double pos) +{ return m_scene->getSnapPointForPos(pos, KdenliveSettings::snaptopoints()); } -void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList offsetList, bool skipSelectedItems) { +void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList offsetList, bool skipSelectedItems) +{ QList snaps; if (selected && offsetList.isEmpty()) offsetList.append(selected->duration()); QList itemList = items(); @@ -2911,21 +3390,24 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList previousSnapPoint(GenTime(m_cursorPos, m_document->fps())); setCursorPos((int) res.frames(m_document->fps())); checkScrolling(); } -void CustomTrackView::slotSeekToNextSnap() { +void CustomTrackView::slotSeekToNextSnap() +{ updateSnapPoints(NULL); GenTime res = m_scene->nextSnapPoint(GenTime(m_cursorPos, m_document->fps())); setCursorPos((int) res.frames(m_document->fps())); checkScrolling(); } -void CustomTrackView::clipStart() { +void CustomTrackView::clipStart() +{ ClipItem *item = getMainActiveClip(); if (item != NULL) { setCursorPos((int) item->startPos().frames(m_document->fps())); @@ -2933,7 +3415,8 @@ void CustomTrackView::clipStart() { } } -void CustomTrackView::clipEnd() { +void CustomTrackView::clipEnd() +{ ClipItem *item = getMainActiveClip(); if (item != NULL) { setCursorPos((int) item->endPos().frames(m_document->fps()) - 1); @@ -2941,18 +3424,21 @@ void CustomTrackView::clipEnd() { } } -void CustomTrackView::slotAddClipMarker(const QString &id, GenTime t, QString c) { +void CustomTrackView::slotAddClipMarker(const QString &id, GenTime t, QString c) +{ QString oldcomment = m_document->clipManager()->getClipById(id)->markerComment(t); - AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t, true); + AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t); m_commandStack->push(command); } -void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position) { - AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position, true); +void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position) +{ + AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position); m_commandStack->push(command); } -void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) { +void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) +{ DocClipBase *base = m_document->clipManager()->getClipById(id); QList markers = base->commentedSnapMarkers(); @@ -2964,12 +3450,13 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) { deleteMarkers->setText("Delete clip markers"); for (int i = 0; i < markers.size(); i++) { - new AddMarkerCommand(this, markers.at(i).comment(), QString(), id, markers.at(i).time(), true, deleteMarkers); + new AddMarkerCommand(this, markers.at(i).comment(), QString(), id, markers.at(i).time(), deleteMarkers); } m_commandStack->push(deleteMarkers); } -void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QString comment) { +void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QString comment) +{ DocClipBase *base = m_document->clipManager()->getClipById(id); if (!comment.isEmpty()) base->addSnapMarker(pos, comment); else base->deleteSnapMarker(pos); @@ -2977,11 +3464,13 @@ void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QSt viewport()->update(); } -bool sortGuidesList(const Guide *g1 , const Guide *g2) { +bool sortGuidesList(const Guide *g1 , const Guide *g2) +{ return (*g1).position() < (*g2).position(); } -void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) { +void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) +{ if (oldPos > GenTime() && pos > GenTime()) { // move guide for (int i = 0; i < m_guides.count(); i++) { @@ -2997,8 +3486,7 @@ void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const Q bool found = false; for (int i = 0; i < m_guides.count(); i++) { if (m_guides.at(i)->position() == oldPos) { - Guide *item = m_guides.takeAt(i); - delete item; + delete m_guides.takeAt(i); found = true; break; } @@ -3009,7 +3497,8 @@ void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const Q m_document->syncGuides(m_guides); } -bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) { +bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) +{ for (int i = 0; i < m_guides.count(); i++) { if (m_guides.at(i)->position() == pos) { emit displayMessage(i18n("A guide already exists at position %1", m_document->timecode().getTimecodeFromFrames(pos.frames(m_document->fps()))), ErrorMessage); @@ -3024,7 +3513,8 @@ bool CustomTrackView::addGuide(const GenTime pos, const QString &comment) { return true; } -void CustomTrackView::slotAddGuide() { +void CustomTrackView::slotAddGuide() +{ CommentedTime marker(GenTime(m_cursorPos, m_document->fps()), i18n("Guide")); MarkerDialog d(NULL, marker, m_document->timecode(), i18n("Add Guide"), this); if (d.exec() != QDialog::Accepted) return; @@ -3034,7 +3524,8 @@ void CustomTrackView::slotAddGuide() { } } -void CustomTrackView::slotEditGuide() { +void CustomTrackView::slotEditGuide() +{ GenTime pos = GenTime(m_cursorPos, m_document->fps()); bool found = false; for (int i = 0; i < m_guides.count(); i++) { @@ -3047,7 +3538,8 @@ void CustomTrackView::slotEditGuide() { if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); } -void CustomTrackView::slotEditGuide(CommentedTime guide) { +void CustomTrackView::slotEditGuide(CommentedTime guide) +{ MarkerDialog d(NULL, guide, m_document->timecode(), i18n("Edit Guide"), this); if (d.exec() == QDialog::Accepted) { EditGuideCommand *command = new EditGuideCommand(this, guide.time(), guide.comment(), d.newMarker().time(), d.newMarker().comment(), true); @@ -3056,7 +3548,8 @@ void CustomTrackView::slotEditGuide(CommentedTime guide) { } -void CustomTrackView::slotDeleteGuide() { +void CustomTrackView::slotDeleteGuide() +{ GenTime pos = GenTime(m_cursorPos, m_document->fps()); bool found = false; for (int i = 0; i < m_guides.count(); i++) { @@ -3070,59 +3563,47 @@ void CustomTrackView::slotDeleteGuide() { if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); } -void CustomTrackView::slotDeleteAllGuides() { +void CustomTrackView::slotDeleteAllGuides() +{ QUndoCommand *deleteAll = new QUndoCommand(); deleteAll->setText("Delete all guides"); for (int i = 0; i < m_guides.count(); i++) { - EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll); + new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll); } m_commandStack->push(deleteAll); } -void CustomTrackView::setTool(PROJECTTOOL tool) { +void CustomTrackView::setTool(PROJECTTOOL tool) +{ m_tool = tool; } -void CustomTrackView::setScale(double scaleFactor) { +void CustomTrackView::setScale(double scaleFactor) +{ QMatrix matrix; matrix = matrix.scale(scaleFactor, 1); m_scene->setScale(scaleFactor); //scale(scaleFactor, 1); m_animationTimer->stop(); - if (m_visualTip) { - delete m_visualTip; - m_visualTip = NULL; - } - if (m_animation) { - delete m_animation; - m_animation = NULL; - } - /*double pos = cursorPos() / m_scale; - m_scale = scaleFactor; - m_scene->setScale(m_scale); - int vert = verticalScrollBar()->value(); - kDebug() << " HHHHHHHH SCALING: " << m_scale; - QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { - AbstractClipItem *clip = (AbstractClipItem *)itemList.at(i); - clip->setRect(0, 0, (qreal) clip->duration().frames(m_document->fps()) * m_scale - .5, clip->rect().height()); - clip->setPos((qreal) clip->startPos().frames(m_document->fps()) * m_scale, clip->pos().y()); - } - } + delete m_visualTip; + m_visualTip = NULL; + delete m_animation; + m_animation = NULL; - for (int i = 0; i < m_guides.count(); i++) { - m_guides.at(i)->updatePosition(m_scale); + //setSceneRect(0, 0, m_projectDuration + 100 * scaleFactor, sceneRect().height()); + setMatrix(matrix); + int diff = sceneRect().width() - m_projectDuration; + if (diff * matrix.m11() < 50) { + if (matrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / matrix.m11()), sceneRect().height()); + else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height()); } - setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height()); - updateCursorPos();*/ - setMatrix(matrix); centerOn(QPointF(cursorPos(), m_tracksHeight)); //verticalScrollBar()->setValue(vert);*/ } -void CustomTrackView::slotRefreshGuides() { +void CustomTrackView::slotRefreshGuides() +{ if (KdenliveSettings::showmarkers()) { kDebug() << "// refresh GUIDES"; for (int i = 0; i < m_guides.count(); i++) { @@ -3131,7 +3612,8 @@ void CustomTrackView::slotRefreshGuides() { } } -void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { +void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) +{ QColor base = palette().button().color(); QRectF r = rect; r.setWidth(r.width() + 1); @@ -3148,7 +3630,8 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) { painter->fillRect(QRectF(r.left(), lowerLimit, r.width(), height() - lowerLimit), QBrush(base)); } -bool CustomTrackView::findString(const QString &text) { +bool CustomTrackView::findString(const QString &text) +{ QString marker; for (int i = 0; i < m_searchPoints.size(); ++i) { marker = m_searchPoints.at(i).comment(); @@ -3164,7 +3647,8 @@ bool CustomTrackView::findString(const QString &text) { return false; } -bool CustomTrackView::findNextString(const QString &text) { +bool CustomTrackView::findNextString(const QString &text) +{ QString marker; for (int i = m_findIndex + 1; i < m_searchPoints.size(); ++i) { marker = m_searchPoints.at(i).comment(); @@ -3181,7 +3665,8 @@ bool CustomTrackView::findNextString(const QString &text) { return false; } -void CustomTrackView::initSearchStrings() { +void CustomTrackView::initSearchStrings() +{ m_searchPoints.clear(); QList itemList = items(); for (int i = 0; i < itemList.count(); i++) { @@ -3205,15 +3690,16 @@ void CustomTrackView::initSearchStrings() { qSort(m_searchPoints); } -void CustomTrackView::clearSearchStrings() { +void CustomTrackView::clearSearchStrings() +{ m_searchPoints.clear(); m_findIndex = 0; } -void CustomTrackView::copyClip() { - while (m_copiedItems.count() > 0) { - delete m_copiedItems.takeFirst(); - } +void CustomTrackView::copyClip() +{ + qDeleteAll(m_copiedItems); + m_copiedItems.clear(); QList itemList = scene()->selectedItems(); if (itemList.count() == 0) { emit displayMessage(i18n("Select a clip before copying"), ErrorMessage); @@ -3230,7 +3716,8 @@ void CustomTrackView::copyClip() { } } -bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const { +bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const +{ QRectF rect((double) info.startPos.frames(m_document->fps()), (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1)); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisions.count(); i++) { @@ -3239,7 +3726,8 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const { return true; } -bool CustomTrackView::canBePasted(QList items, GenTime offset, int trackOffset) const { +bool CustomTrackView::canBePasted(QList items, GenTime offset, int trackOffset) const +{ for (int i = 0; i < items.count(); i++) { ItemInfo info = items.at(i)->info(); info.startPos += offset; @@ -3250,7 +3738,8 @@ bool CustomTrackView::canBePasted(QList items, GenTime offse return true; } -bool CustomTrackView::canBeMoved(QList items, GenTime offset, int trackOffset) const { +bool CustomTrackView::canBeMoved(QList items, GenTime offset, int trackOffset) const +{ QPainterPath movePath; movePath.moveTo(0, 0); @@ -3276,7 +3765,8 @@ bool CustomTrackView::canBeMoved(QList items, GenTime offset return true; } -void CustomTrackView::pasteClip() { +void CustomTrackView::pasteClip() +{ if (m_copiedItems.count() == 0) { emit displayMessage(i18n("No clip copied"), ErrorMessage); return; @@ -3331,7 +3821,8 @@ void CustomTrackView::pasteClip() { m_commandStack->push(pasteClips); } -void CustomTrackView::pasteClipEffects() { +void CustomTrackView::pasteClipEffects() +{ if (m_copiedItems.count() != 1 || m_copiedItems.at(0)->type() != AVWIDGET) { emit displayMessage(i18n("You must copy exactly one clip before pasting effects"), ErrorMessage); return; @@ -3355,7 +3846,8 @@ void CustomTrackView::pasteClipEffects() { } -ClipItem *CustomTrackView::getClipUnderCursor() const { +ClipItem *CustomTrackView::getClipUnderCursor() const +{ QRectF rect((double) m_cursorPos, 0.0, 1.0, (double)(m_tracksHeight * m_document->tracksCount())); QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); for (int i = 0; i < collisions.count(); i++) { @@ -3366,7 +3858,8 @@ ClipItem *CustomTrackView::getClipUnderCursor() const { return NULL; } -ClipItem *CustomTrackView::getMainActiveClip() const { +ClipItem *CustomTrackView::getMainActiveClip() const +{ QList clips = scene()->selectedItems(); if (clips.isEmpty()) { return getClipUnderCursor(); @@ -3382,7 +3875,8 @@ ClipItem *CustomTrackView::getMainActiveClip() const { return NULL; } -ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) const { +ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) const +{ QList clips = scene()->selectedItems(); if (clips.isEmpty()) { return getClipUnderCursor(); @@ -3395,15 +3889,18 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) con } if (clips.count() == 1 && allowOutsideCursor) return static_cast < ClipItem *>(clips.at(0)); for (int i = 0; i < clips.count(); ++i) { - if (clips.at(i)->type() == AVWIDGET) + if (clips.at(i)->type() == AVWIDGET) { item = static_cast < ClipItem *>(clips.at(i)); - if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) return item; + if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) + return item; + } } } return NULL; } -void CustomTrackView::setInPoint() { +void CustomTrackView::setInPoint() +{ ClipItem *clip = getActiveClipUnderCursor(true); if (clip == NULL) { emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); @@ -3427,7 +3924,8 @@ void CustomTrackView::setInPoint() { m_commandStack->push(command); } -void CustomTrackView::setOutPoint() { +void CustomTrackView::setOutPoint() +{ ClipItem *clip = getActiveClipUnderCursor(true); if (clip == NULL) { emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); @@ -3454,7 +3952,8 @@ void CustomTrackView::setOutPoint() { m_commandStack->push(command); } -void CustomTrackView::slotUpdateAllThumbs() { +void CustomTrackView::slotUpdateAllThumbs() +{ QList itemList = items(); //if (itemList.isEmpty()) return; ClipItem *item; @@ -3486,14 +3985,15 @@ void CustomTrackView::slotUpdateAllThumbs() { } } } - item->refreshClip(); + item->refreshClip(false); qApp->processEvents(); } } viewport()->update(); } -void CustomTrackView::saveThumbnails() { +void CustomTrackView::saveThumbnails() +{ QList itemList = items(); ClipItem *item; QString thumbBase = m_document->projectFolder().path() + "/thumbs/"; @@ -3528,7 +4028,8 @@ void CustomTrackView::saveThumbnails() { } -void CustomTrackView::slotInsertTrack(int ix) { +void CustomTrackView::slotInsertTrack(int ix) +{ kDebug() << "// INSERTING TRK: " << ix; QDialog d(parentWidget()); Ui::AddTrack_UI view; @@ -3554,25 +4055,27 @@ void CustomTrackView::slotInsertTrack(int ix) { info.isBlind = true; info.isLocked = false; } - AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true, true); + AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true); m_commandStack->push(addTrack); m_document->setModified(true); } } -void CustomTrackView::slotDeleteTrack(int ix) { +void CustomTrackView::slotDeleteTrack(int ix) +{ bool ok; ix = QInputDialog::getInteger(this, i18n("Remove Track"), i18n("Track"), ix, 0, m_document->tracksCount() - 1, 1, &ok); if (ok) { TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); deleteTimelineTrack(ix, info); m_document->setModified(true); - /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false, true); + /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false); m_commandStack->push(command);*/ } } -void CustomTrackView::slotChangeTrack(int ix) { +void CustomTrackView::slotChangeTrack(int ix) +{ QDialog d(parentWidget()); Ui::AddTrack_UI view; view.setupUi(&d); @@ -3601,7 +4104,8 @@ void CustomTrackView::slotChangeTrack(int ix) { } -void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) { +void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) +{ double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2; QRectF r(0, startY, sceneRect().width(), m_tracksHeight / 2 - 1); QList selection = m_scene->items(r); @@ -3625,17 +4129,19 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) { } } - new AddTrackCommand(this, ix, trackinfo, false, true, deleteTrack); + new AddTrackCommand(this, ix, trackinfo, false, deleteTrack); m_commandStack->push(deleteTrack); } -void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo) { +void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo) +{ TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1); - ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo, true); + ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo); m_commandStack->push(changeTrack); } -void CustomTrackView::autoTransition() { +void CustomTrackView::autoTransition() +{ QList itemList = scene()->selectedItems(); if (itemList.count() != 1 || itemList.at(0)->type() != TRANSITIONWIDGET) { emit displayMessage(i18n("You must select one transition for this action"), ErrorMessage); @@ -3648,7 +4154,8 @@ void CustomTrackView::autoTransition() { } -QStringList CustomTrackView::getLadspaParams(QDomElement effect) const { +QStringList CustomTrackView::getLadspaParams(QDomElement effect) const +{ QStringList result; QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { @@ -3665,7 +4172,8 @@ QStringList CustomTrackView::getLadspaParams(QDomElement effect) const { return result; } -void CustomTrackView::clipNameChanged(const QString id, const QString name) { +void CustomTrackView::clipNameChanged(const QString id, const QString name) +{ QList list = scene()->items(); ClipItem *clip = NULL; for (int i = 0; i < list.size(); ++i) { @@ -3679,7 +4187,8 @@ void CustomTrackView::clipNameChanged(const QString id, const QString name) { viewport()->update(); } -void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) { +void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) +{ minimum = GenTime(); maximum = GenTime(); QList selection; @@ -3694,7 +4203,8 @@ void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &min } } -void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) { +void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTime &minimum, GenTime &maximum) +{ minimum = GenTime(); maximum = GenTime(); QList selection; @@ -3709,4 +4219,243 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim } } + +void CustomTrackView::loadGroups(const QDomNodeList groups) +{ + for (int i = 0; i < groups.count(); i++) { + QDomNodeList children = groups.at(i).childNodes(); + scene()->clearSelection(); + for (int nodeindex = 0; nodeindex < children.count(); nodeindex++) { + QDomNode n = children.item(nodeindex); + QDomElement elem = n.toElement(); + int pos = elem.attribute("position").toInt(); + int track = elem.attribute("track").toInt(); + if (elem.tagName() == "clipitem") { + ClipItem *clip = getClipItemAt(pos, track); //m_document->tracksCount() - transitiontrack); + if (clip) clip->setSelected(true); + } else { + Transition *clip = getTransitionItemAt(pos, track); //m_document->tracksCount() - transitiontrack); + if (clip) clip->setSelected(true); + } + } + groupSelectedItems(false, true); + } +} + +void CustomTrackView::splitAudio() +{ + resetSelectionGroup(); + QList selection = scene()->selectedItems(); + if (selection.isEmpty()) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + QUndoCommand *splitCommand = new QUndoCommand(); + splitCommand->setText(i18n("Split audio")); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->parentItem()) { + emit displayMessage(i18n("Cannot split audio of grouped clips"), ErrorMessage); + } else { + new SplitAudioCommand(this, clip->track(), clip->startPos(), splitCommand); + } + } + } + } + m_commandStack->push(splitCommand); +} + +void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split) +{ + ClipItem *clip = getClipItemAt(pos, track); + if (clip == NULL) { + kDebug() << "// Cannot find clip to split!!!"; + return; + } + if (split) { + int start = pos.frames(m_document->fps()); + int freetrack = m_document->tracksCount() - track - 1; + for (; freetrack > 0; freetrack--) { + kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); + if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK) { + kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack); + if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->duration().frames(m_document->fps())) { + kDebug() << "FOUND SPACE ON TRK: " << freetrack; + break; + } + } + } + kDebug() << "GOT TRK: " << track; + if (freetrack == 0) { + emit displayMessage(i18n("No empty space to put clip audio"), ErrorMessage); + } else { + ItemInfo info; + info.startPos = clip->startPos(); + info.endPos = clip->endPos(); + info.cropStart = clip->cropStart(); + info.track = m_document->tracksCount() - freetrack; + addClip(clip->xml(), clip->clipProducer(), info, clip->effectList()); + scene()->clearSelection(); + clip->setSelected(true); + ClipItem *audioClip = getClipItemAt(start, info.track); + if (audioClip) { + clip->setVideoOnly(true); + m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()); + m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, start, clip->baseClip()->audioProducer(info.track)); + audioClip->setSelected(true); + audioClip->setAudioOnly(true); + groupSelectedItems(false, true); + } + } + } else { + // unsplit clip: remove audio part and change video part to normal clip + if (clip->parentItem() == NULL || clip->parentItem()->type() != GROUPWIDGET) { + kDebug() << "//CANNOT FIND CLP GRP"; + return; + } + AbstractGroupItem *grp = static_cast (clip->parentItem()); + QList children = grp->childItems(); + if (children.count() != 2) { + kDebug() << "//SOMETHING IS WRONG WITH CLP GRP"; + return; + } + for (int i = 0; i < children.count(); i++) { + if (children.at(i) != clip) { + ClipItem *clp = static_cast (children.at(i)); + ItemInfo info = clip->info(); + deleteClip(clp->info()); + clip->setVideoOnly(false); + m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - info.track, info.startPos.frames(m_document->fps()), clip->baseClip()->producer(info.track)); + break; + } + } + m_document->clipManager()->removeGroup(grp); + scene()->destroyItemGroup(grp); + } +} + +void CustomTrackView::setVideoOnly() +{ + resetSelectionGroup(); + QList selection = scene()->selectedItems(); + if (selection.isEmpty()) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + QUndoCommand *videoCommand = new QUndoCommand(); + videoCommand->setText(i18n("Video only")); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->parentItem()) { + emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage); + } else { + new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), true, false, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand); + } + } + } + } + m_commandStack->push(videoCommand); +} + +void CustomTrackView::setAudioOnly() +{ + resetSelectionGroup(); + QList selection = scene()->selectedItems(); + if (selection.isEmpty()) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + QUndoCommand *videoCommand = new QUndoCommand(); + videoCommand->setText(i18n("Audio only")); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->parentItem()) { + emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage); + } else { + new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, true, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand); + } + } + } + } + m_commandStack->push(videoCommand); +} + +void CustomTrackView::setAudioAndVideo() +{ + resetSelectionGroup(); + QList selection = scene()->selectedItems(); + if (selection.isEmpty()) { + emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage); + return; + } + QUndoCommand *videoCommand = new QUndoCommand(); + videoCommand->setText(i18n("Audio and Video")); + for (int i = 0; i < selection.count(); i++) { + if (selection.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (selection.at(i)); + if (clip->clipType() == AV || clip->clipType() == PLAYLIST) { + if (clip->parentItem()) { + emit displayMessage(i18n("Cannot change grouped clips"), ErrorMessage); + } else { + new ChangeClipTypeCommand(this, clip->track(), clip->startPos(), false, false, clip->isVideoOnly(), clip->isAudioOnly(), videoCommand); + } + } + } + } + m_commandStack->push(videoCommand); +} + +void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool videoOnly, bool audioOnly) +{ + ClipItem *clip = getClipItemAt(pos, track); + if (clip == NULL) { + kDebug() << "// Cannot find clip to split!!!"; + return; + } + if (videoOnly) { + int start = pos.frames(m_document->fps()); + clip->setVideoOnly(true); + clip->setAudioOnly(false); + m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->videoProducer()); + } else if (audioOnly) { + int start = pos.frames(m_document->fps()); + clip->setAudioOnly(true); + clip->setVideoOnly(false); + m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->audioProducer(track)); + } else { + int start = pos.frames(m_document->fps()); + clip->setAudioOnly(false); + clip->setVideoOnly(false); + m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track)); + } + clip->update(); +} + +void CustomTrackView::updateClipTypeActions(ClipItem *clip) +{ + if (clip == NULL || (clip->clipType() != AV && clip->clipType() != PLAYLIST)) { + m_clipTypeGroup->setEnabled(false); + } else { + m_clipTypeGroup->setEnabled(true); + QList actions = m_clipTypeGroup->actions(); + QString lookup; + if (clip->isAudioOnly()) lookup = "clip_audio_only"; + else if (clip->isVideoOnly()) lookup = "clip_video_only"; + else lookup = "clip_audio_and_video"; + for (int i = 0; i < actions.count(); i++) { + if (actions.at(i)->data().toString() == lookup) { + actions.at(i)->setChecked(true); + break; + } + } + } +} + + #include "customtrackview.moc"