X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=5e5fb3d7c66942d9289228bd07491348c557e9e6;hb=c351ea9cc38ea488317206339657fcad481be9d8;hp=f4cb35fca5c1d7fafd6c2a2799bf31f537f5c6f0;hpb=685a1ac409a1ab03e846b264d03a9b2113f5eafc;p=kdenlive

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index f4cb35fc..5e5fb3d7 100644
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -48,7 +48,6 @@
 #include "insertspacecommand.h"
 #include "spacerdialog.h"
 #include "addtrackcommand.h"
-#include "changetrackcommand.h"
 #include "movegroupcommand.h"
 #include "ui_addtrack_ui.h"
 #include "initeffects.h"
@@ -57,6 +56,8 @@
 #include "splitaudiocommand.h"
 #include "changecliptypecommand.h"
 #include "trackdialog.h"
+#include "tracksconfigdialog.h"
+#include "configtrackscommand.h"
 
 #include <KDebug>
 #include <KLocale>
@@ -130,7 +131,9 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen
     setLineWidth(0);
     //setCacheMode(QGraphicsView::CacheBackground);
     //setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
 
+    pixmapCache = new KPixmapCache("kdenlive-thumbs");
     KdenliveSettings::setTrackheight(m_tracksHeight);
     m_animationTimer = new QTimeLine(800);
     m_animationTimer->setFrameRange(0, 5);
@@ -199,6 +202,7 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi
     m_timelineContextMenu = timeline;
     m_timelineContextClipMenu = clip;
     m_clipTypeGroup = clipTypeGroup;
+    connect(m_timelineContextMenu, SIGNAL(aboutToHide()), this, SLOT(slotResetMenuPosition()));
 
     m_markerMenu = new QMenu(i18n("Go to marker..."), this);
     m_markerMenu->setEnabled(false);
@@ -229,6 +233,17 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi
     m_timelineContextMenu->addAction(m_editGuide);
 }
 
+void CustomTrackView::slotDoResetMenuPosition()
+{
+    m_menuPosition = QPoint();
+}
+
+void CustomTrackView::slotResetMenuPosition()
+{
+    // after a short time (so that the action is triggered / or menu is closed, we reset the menu pos
+    QTimer::singleShot(300, this, SLOT(slotDoResetMenuPosition()));
+}
+
 void CustomTrackView::checkAutoScroll()
 {
     m_autoScroll = KdenliveSettings::autoscroll();
@@ -818,9 +833,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
     while (!m_dragGuide && ct < collisionList.count()) {
         if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) {
             collisionClip = static_cast <AbstractClipItem *>(collisionList.at(ct));
-            if (collisionClip == m_dragItem) {
+            if (collisionClip->isItemLocked())
+                break;
+            if (collisionClip == m_dragItem)
                 collisionClip = NULL;
-            } else m_dragItem = collisionClip;
+            else
+                m_dragItem = collisionClip;
             found = true;
             m_dragItemInfo = m_dragItem->info();
             if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) {
@@ -1302,7 +1320,7 @@ void CustomTrackView::editItemDuration()
         item = m_dragItem;
     } else {
         if (m_scene->selectedItems().count() == 1) {
-            item = static_cast <AbstractClipItem *> (m_scene->selectedItems().at(0));
+            item = static_cast <AbstractClipItem *>(m_scene->selectedItems().at(0));
         } else {
             if (m_scene->selectedItems().empty()) {
                 emit displayMessage(i18n("Cannot find clip to edit"), ErrorMessage);
@@ -1367,13 +1385,13 @@ void CustomTrackView::editItemDuration()
     } else emit displayMessage(i18n("Item is locked"), ErrorMessage);
 }
 
-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);
+    /*ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track);
     if (clip) {
         clip->setKeyframes(index, keyframes);
         updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(index), index, false);
-    } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage);
+    } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage);*/
 }
 
 
@@ -1444,6 +1462,11 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out)
 
     AddTimelineClipCommand *command = new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false);
     m_commandStack->push(command);
+
+    selectClip(true, false);
+    // Automatic audio split
+    if (KdenliveSettings::splitaudio())
+        splitAudio();
 }
 
 bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
@@ -1901,6 +1924,15 @@ void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect
     m_commandStack->push(command);
 }
 
+void CustomTrackView::slotUpdateClipRegion(ClipItem *clip, int ix, QString region)
+{
+    QDomElement effect = clip->getEffectAt(ix);
+    QDomElement oldeffect = effect.cloneNode().toElement();
+    effect.setAttribute("region", region);
+    EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldeffect, effect, ix, true);
+    m_commandStack->push(command);
+}
+
 ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute)
 {
     if (cut) {
@@ -2138,7 +2170,12 @@ void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QD
 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);
+    QDomElement xml = tr->toXML();
+    if (old.isNull() || xml.isNull()) {
+        emit displayMessage(i18n("Cannot update transition"), ErrorMessage);
+        return;
+    }
+    EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, xml, false);
     m_commandStack->push(command);
     setDocumentModified();
 }
@@ -2150,7 +2187,9 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr
         kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track;
         return;
     }
-    m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition);
+    bool force = false;
+    if (oldTransition.attribute("transition_atrack") != transition.attribute("transition_atrack") || oldTransition.attribute("transition_btrack") != transition.attribute("transition_btrack")) force = true;
+    m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition, force);
     //kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<<transition.attribute("transition_btrack");
     item->setTransitionParameters(transition);
     if (updateTransitionWidget) {
@@ -2160,6 +2199,7 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr
         if (transitionClip && transitionClip->baseClip()) {
             QString size = transitionClip->baseClip()->getProperty("frame_size");
             double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+            if (factor == 0) factor = 1.0;
             p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
             p.setY(size.section('x', 1, 1).toInt());
         }
@@ -2249,6 +2289,10 @@ void CustomTrackView::dropEvent(QDropEvent * event)
         brokenClips.clear();
         if (addCommand->childCount() > 0) m_commandStack->push(addCommand);
         else delete addCommand;
+
+        // Automatic audio split
+        if (KdenliveSettings::splitaudio())
+            splitAudio();
         setDocumentModified();
 
         /*
@@ -2584,16 +2628,17 @@ void CustomTrackView::removeTrack(int ix)
     //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
 }
 
-void CustomTrackView::changeTrack(int ix, TrackInfo type)
+void CustomTrackView::configTracks(QList < TrackInfo > trackInfos)
 {
-    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);
+    for (int i = 0; i < trackInfos.count(); ++i) {
+        m_document->setTrackType(i, trackInfos.at(i));
+        m_document->renderer()->mltChangeTrackState(i + 1, m_document->trackInfoAt(i).isMute, m_document->trackInfoAt(i).isBlind);
+    }
+
     QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
     viewport()->update();
 }
 
-
 void CustomTrackView::slotSwitchTrackAudio(int ix)
 {
     /*for (int i = 0; i < m_document->tracksCount(); i++)
@@ -2618,6 +2663,7 @@ void CustomTrackView::lockTrack(int ix, bool lock)
     int tracknumber = m_document->tracksCount() - ix - 1;
     m_document->switchTrackLock(tracknumber, lock);
     emit doTrackLock(ix, lock);
+    AbstractClipItem *clip = NULL;
     QList<QGraphicsItem *> selection = m_scene->items(0, ix * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 2);
 
     for (int i = 0; i < selection.count(); i++) {
@@ -2626,7 +2672,10 @@ void CustomTrackView::lockTrack(int ix, bool lock)
             if (selection.at(i)->type() == AVWIDGET) emit clipItemSelected(NULL);
             else emit transitionItemSelected(NULL);
         }
-        static_cast <AbstractClipItem *>(selection.at(i))->setItemLocked(lock);
+        clip = static_cast <AbstractClipItem *>(selection.at(i));
+        clip->setItemLocked(lock);
+        if (clip == m_dragItem)
+            m_dragItem = NULL;
     }
     kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked;
     viewport()->update();
@@ -2674,6 +2723,11 @@ void CustomTrackView::slotRemoveSpace()
         track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight);
     }
 
+    if (m_document->isTrackLocked(m_document->tracksCount() - track - 1)) {
+        emit displayMessage(i18n("Cannot remove space in a locked track"), ErrorMessage);
+        return;
+    }
+
     ClipItem *item = getClipItemAt(pos, track);
     if (item) {
         emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track: %2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage);
@@ -2726,22 +2780,33 @@ void CustomTrackView::slotInsertSpace()
         pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
         track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight) + 1;
     }
-    SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount(), this);
+    SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksList(), this);
     if (d.exec() != QDialog::Accepted) return;
     GenTime spaceDuration = d.selectedDuration();
     track = d.selectedTrack();
 
-    ClipItem *item = getClipItemAt(pos, track);
-    if (item) pos = item->startPos();
+    QList<QGraphicsItem *> items;
+    if (track > 0) {
+        if (m_document->isTrackLocked(m_document->tracksCount() - track - 1)) {
+            emit displayMessage(i18n("Cannot insert space in a locked track"), ErrorMessage);
+            return;
+        }
 
-    // Make sure there is no group in the way
-    QRectF rect(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 2);
-    bool isOk;
-    QList<QGraphicsItem *> items = checkForGroups(rect, &isOk);
-    if (!isOk) {
-        // groups found on track, do not allow the move
-        emit displayMessage(i18n("Cannot insert space in a track with a group"), ErrorMessage);
-        return;
+        ClipItem *item = getClipItemAt(pos, track);
+        if (item) pos = item->startPos();
+
+        // Make sure there is no group in the way
+        QRectF rect(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 2);
+        bool isOk;
+        items = checkForGroups(rect, &isOk);
+        if (!isOk) {
+            // groups found on track, do not allow the move
+            emit displayMessage(i18n("Cannot insert space in a track with a group"), ErrorMessage);
+            return;
+        }
+    } else {
+        QRectF rect(pos.frames(m_document->fps()), 0, sceneRect().width() - pos.frames(m_document->fps()), m_document->tracksCount() * m_tracksHeight);
+        items = scene()->items(rect);
     }
 
     QList<ItemInfo> clipsToMove;
@@ -2751,16 +2816,17 @@ void CustomTrackView::slotInsertSpace()
         if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) {
             AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
             ItemInfo info = item->info();
-            if (item->type() == AVWIDGET) {
+            if (item->type() == AVWIDGET)
                 clipsToMove.append(info);
-            } else if (item->type() == TRANSITIONWIDGET) {
+            else if (item->type() == TRANSITIONWIDGET)
                 transitionsToMove.append(info);
-            }
         }
     }
 
-    InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, spaceDuration, true);
-    m_commandStack->push(command);
+    if (!clipsToMove.isEmpty() || !transitionsToMove.isEmpty()) {
+        InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, spaceDuration, true);
+        m_commandStack->push(command);
+    }
 }
 
 void CustomTrackView::insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> transToMove, int track, const GenTime duration, const GenTime offset)
@@ -2828,7 +2894,8 @@ void CustomTrackView::insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> t
         }
     }
     resetSelectionGroup(false);
-    if (track != -1) track = m_document->tracksCount() - track;
+    if (track != -1)
+        track = m_document->tracksCount() - track;
     m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, duration, offset);
 }
 
@@ -2858,6 +2925,7 @@ void CustomTrackView::deleteClip(const QString &clipId)
 
 void CustomTrackView::setCursorPos(int pos, bool seek)
 {
+    kDebug() << "SEEk TO: " << pos << ", SEEK: " << seek;
     if (pos == m_cursorPos) return;
     emit cursorMoved((int)(m_cursorPos), (int)(pos));
     m_cursorPos = pos;
@@ -3550,6 +3618,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
         if (transitionClip && transitionClip->baseClip()) {
             QString size = transitionClip->baseClip()->getProperty("frame_size");
             double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+            if (factor == 0) factor = 1.0;
             p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
             p.setY(size.section('x', 1, 1).toInt());
         }
@@ -3621,7 +3690,6 @@ void CustomTrackView::deleteSelectedClips()
         if (itemList.at(i)->type() == GROUPWIDGET) {
             groupCount++;
             QList<QGraphicsItem *> children = itemList.at(i)->childItems();
-            itemList += children;
             QList <ItemInfo> clipInfos;
             QList <ItemInfo> transitionInfos;
             GenTime currentPos = GenTime(m_cursorPos, m_document->fps());
@@ -3633,11 +3701,17 @@ void CustomTrackView::deleteSelectedClips()
                     AbstractClipItem *clip = static_cast <AbstractClipItem *>(children.at(j));
                     if (!clip->isItemLocked()) transitionInfos.append(clip->info());
                 }
+                if (itemList.contains(children.at(j))) {
+                    children.removeAt(j);
+                    j--;
+                }
             }
-            if (clipInfos.count() > 0) {
+            itemList += children;
+            if (clipInfos.count() > 0)
                 new GroupClipsCommand(this, clipInfos, transitionInfos, false, deleteSelected);
-            }
-        }
+
+        } else if (itemList.at(i)->parentItem() && itemList.at(i)->parentItem()->type() == GROUPWIDGET)
+            itemList.insert(i + 1, itemList.at(i)->parentItem());
     }
 
     for (int i = 0; i < itemList.count(); i++) {
@@ -4168,6 +4242,7 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end, b
         if (transitionClip && transitionClip->baseClip()) {
             QString size = transitionClip->baseClip()->getProperty("frame_size");
             double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+            if (factor == 0) factor = 1.0;
             p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
             p.setY(size.section('x', 1, 1).toInt());
         }
@@ -4323,6 +4398,19 @@ void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info)
             }
         }
     }
+
+    effectPos = item->hasEffect("affine", "pan_zoom");
+    if (effectPos != -1) {
+        QDomElement oldeffect = item->effectAt(effectPos);
+        int start = item->cropStart().frames(m_document->fps());
+        int max = start + item->cropDuration().frames(m_document->fps());
+        oldeffect.setAttribute("in", start);
+        oldeffect.setAttribute("out", max);
+        if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+            emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+        // if effect is displayed, update the effect edit widget with new clip duration
+        if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+    }
 }
 
 double CustomTrackView::getSnapPointForPos(double pos)
@@ -4486,6 +4574,18 @@ int CustomTrackView::hasGuide(int pos, int offset)
     return -1;
 }
 
+void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const
+{
+    QAction *act;
+    goMenu->clear();
+    double fps = m_document->fps();
+    for (int i = 0; i < m_guides.count(); i++) {
+        act = goMenu->addAction(m_guides.at(i)->label() + "/" + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps));
+        act->setData(m_guides.at(i)->position().frames(m_document->fps()));
+    }
+    goMenu->setEnabled(!m_guides.isEmpty());
+}
+
 void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment)
 {
     if (oldPos > GenTime() && pos > GenTime()) {
@@ -4874,6 +4974,7 @@ bool CustomTrackView::canBeMoved(QList<AbstractClipItem *> items, GenTime offset
     return true;
 }
 
+
 void CustomTrackView::pasteClip()
 {
     if (m_copiedItems.count() == 0) {
@@ -4883,18 +4984,29 @@ void CustomTrackView::pasteClip()
     QPoint position;
     if (m_menuPosition.isNull()) {
         position = mapFromGlobal(QCursor::pos());
-        if (!underMouse() || position.y() > m_tracksHeight * m_document->tracksCount()) {
+        if (!contentsRect().contains(position) || mapToScene(position).y() / m_tracksHeight > m_document->tracksCount()) {
             emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage);
             return;
         }
     } else position = m_menuPosition;
+
     GenTime pos = GenTime((int)(mapToScene(position).x()), m_document->fps());
-    int track = (int)(position.y() / m_tracksHeight);
-    ItemInfo first = m_copiedItems.at(0)->info();
+    int track = (int)(mapToScene(position).y() / m_tracksHeight);
+
+    GenTime leftPos = m_copiedItems.at(0)->startPos();
+    int lowerTrack = m_copiedItems.at(0)->track();
+    int upperTrack = m_copiedItems.at(0)->track();
+    for (int i = 1; i < m_copiedItems.count(); i++) {
+        if (m_copiedItems.at(i)->startPos() < leftPos) leftPos = m_copiedItems.at(i)->startPos();
+        if (m_copiedItems.at(i)->track() < lowerTrack) lowerTrack = m_copiedItems.at(i)->track();
+        if (m_copiedItems.at(i)->track() > upperTrack) upperTrack = m_copiedItems.at(i)->track();
+    }
 
-    GenTime offset = pos - first.startPos;
-    int trackOffset = track - first.track;
+    GenTime offset = pos - leftPos;
+    int trackOffset = track - lowerTrack;
 
+    if (lowerTrack + trackOffset < 0) trackOffset = 0 - lowerTrack;
+    if (upperTrack + trackOffset > m_document->tracksCount() - 1) trackOffset = m_document->tracksCount() - upperTrack - 1;
     if (!canBePasted(m_copiedItems, offset, trackOffset)) {
         emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage);
         return;
@@ -5243,6 +5355,7 @@ void CustomTrackView::slotInsertTrack(int ix)
 
 void CustomTrackView::slotDeleteTrack(int ix)
 {
+    if (m_document->tracksCount() < 2) return;
     TrackDialog d(m_document, parentWidget());
     d.label->setText(i18n("Delete track"));
     d.before_select->setHidden(true);
@@ -5262,44 +5375,24 @@ void CustomTrackView::slotDeleteTrack(int ix)
     }
 }
 
-void CustomTrackView::slotChangeTrack(int ix)
+void CustomTrackView::slotConfigTracks(int ix)
 {
-    TrackDialog d(m_document, parentWidget());
-    d.label->setText(i18n("Change track"));
-    d.before_select->setHidden(true);
-    d.track_nb->setMaximum(m_document->tracksCount() - 1);
-    d.track_nb->setValue(ix);
-    d.slotUpdateName(ix);
-    d.setWindowTitle(i18n("Change Track Type"));
-
-    TrackInfo oldInfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
-    if (oldInfo.type == VIDEOTRACK)
-        d.video_track->setChecked(true);
-    else
-        d.audio_track->setChecked(true);
-
+    TracksConfigDialog d(m_document, ix, parentWidget());
     if (d.exec() == QDialog::Accepted) {
-        TrackInfo info;
-        info.isLocked = false;
-        info.isMute = false;
-        info.trackName = oldInfo.trackName;
-        ix = d.track_nb->value();
-
-        if (d.video_track->isChecked()) {
-            info.type = VIDEOTRACK;
-            info.isBlind = false;
-        } else {
-            info.type = AUDIOTRACK;
-            info.isBlind = true;
+        ConfigTracksCommand *configTracks = new ConfigTracksCommand(this, m_document->tracksList(), d.tracksList());
+        m_commandStack->push(configTracks);
+        QList <int> toDelete = d.deletedTracks();
+        for (int i = 0; i < toDelete.count(); ++i) {
+            TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - toDelete.at(i) + i - 1);
+            deleteTimelineTrack(toDelete.at(i) - i, info);
         }
-        changeTimelineTrack(ix, info);
         setDocumentModified();
     }
 }
 
-
 void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo)
 {
+    if (m_document->tracksCount() < 2) return;
     double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2;
     QRectF r(0, startY, sceneRect().width(), m_tracksHeight / 2 - 1);
     QList<QGraphicsItem *> selection = m_scene->items(r);
@@ -5327,13 +5420,6 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo)
     m_commandStack->push(deleteTrack);
 }
 
-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);
-    m_commandStack->push(changeTrack);
-}
-
 void CustomTrackView::autoTransition()
 {
     QList<QGraphicsItem *> itemList = scene()->selectedItems();
@@ -5414,7 +5500,6 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim
     }
 }
 
-
 void CustomTrackView::loadGroups(const QDomNodeList groups)
 {
     for (int i = 0; i < groups.count(); i++) {
@@ -5442,7 +5527,7 @@ void CustomTrackView::splitAudio()
     resetSelectionGroup();
     QList<QGraphicsItem *> selection = scene()->selectedItems();
     if (selection.isEmpty()) {
-        emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
+        emit displayMessage(i18n("You must select at least one clip for this action"), ErrorMessage);
         return;
     }
     QUndoCommand *splitCommand = new QUndoCommand();
@@ -5459,7 +5544,8 @@ void CustomTrackView::splitAudio()
             }
         }
     }
-    m_commandStack->push(splitCommand);
+    if (splitCommand->childCount() > 0)
+        m_commandStack->push(splitCommand);
 }
 
 void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split)
@@ -5474,7 +5560,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split)
         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) {
+            if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK && !m_document->trackInfoAt(freetrack - 1).isLocked) {
                 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->cropDuration().frames(m_document->fps())) {
                     kDebug() << "FOUND SPACE ON TRK: " << freetrack;
@@ -5793,6 +5879,31 @@ int CustomTrackView::selectedTrack() const
     return m_selectedTrack;
 }
 
+QStringList CustomTrackView::selectedClips() const
+{
+    QStringList clipIds;
+    QList<QGraphicsItem *> selection = m_scene->selectedItems();
+    for (int i = 0; i < selection.count(); i++) {
+        if (selection.at(i)->type() == AVWIDGET) {
+            ClipItem *item = (ClipItem *)selection.at(i);
+            clipIds << item->clipProducer();
+        }
+    }
+    return clipIds;
+}
+
+QList<ClipItem *> CustomTrackView::selectedClipItems() const
+{
+    QList<ClipItem *> clips;
+    QList<QGraphicsItem *> selection = m_scene->selectedItems();
+    for (int i = 0; i < selection.count(); i++) {
+        if (selection.at(i)->type() == AVWIDGET) {
+            clips.append((ClipItem *)selection.at(i));
+        }
+    }
+    return clips;
+}
+
 void CustomTrackView::slotSelectTrack(int ix)
 {
     m_selectedTrack = qMax(0, ix);
@@ -5803,9 +5914,13 @@ void CustomTrackView::slotSelectTrack(int ix)
     viewport()->update();
 }
 
-void CustomTrackView::selectClip(bool add, bool group)
+void CustomTrackView::selectClip(bool add, bool group, int track, int pos)
 {
-    QRectF rect(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, 1, 1);
+    QRectF rect;
+    if (track != -1 && pos != -1)
+        rect = QRectF(pos, track * m_tracksHeight + m_tracksHeight / 2, 1, 1);
+    else
+        rect = QRectF(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, 1, 1);
     QList<QGraphicsItem *> selection = m_scene->items(rect);
     resetSelectionGroup(group);
     if (!group) m_scene->clearSelection();
@@ -5879,6 +5994,7 @@ void CustomTrackView::checkTrackSequence(int track)
 
 void CustomTrackView::insertZoneOverwrite(QStringList data, int in)
 {
+    if (data.isEmpty()) return;
     DocClipBase *clip = m_document->getBaseClip(data.at(0));
     ItemInfo info;
     info.startPos = GenTime(in, m_document->fps());
@@ -5891,6 +6007,11 @@ void CustomTrackView::insertZoneOverwrite(QStringList data, int in)
     adjustTimelineClips(OVERWRITEEDIT, NULL, info, addCommand);
     new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), info, EffectsList(), true, false, true, false, addCommand);
     m_commandStack->push(addCommand);
+
+    selectClip(true, false, m_selectedTrack, in);
+    // Automatic audio split
+    if (KdenliveSettings::splitaudio())
+        splitAudio();
 }
 
 void CustomTrackView::clearSelection()
@@ -5901,3 +6022,12 @@ void CustomTrackView::clearSelection()
     emit clipItemSelected(NULL);
 }
 
+void CustomTrackView::updatePalette()
+{
+    if (m_cursorLine) {
+        QPen pen1 = QPen();
+        pen1.setWidth(1);
+        pen1.setColor(palette().text().color());
+        m_cursorLine->setPen(pen1);
+    }
+}