Update file format to version 0.82. It now saves locked track.

[kdenlive] / src / trackview.cpp

diff --git a/src/trackview.cpp b/src/trackview.cpp
index aeaeeab28a28f06ba0b34be3d8ee70b61ac7f907..67cf01cd92c2581440b67401367a0787e62b0250 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -83,6 +83,8 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent)
     connect(m_trackview->horizontalScrollBar(), SIGNAL(valueChanged(int)), m_ruler, SLOT(slotMoveRuler(int)));
     connect(m_trackview, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int)));
     connect(m_trackview, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotTransitionItemSelected(Transition*, bool)));
+    connect(m_trackview, SIGNAL(doTrackLock(int, bool)), this, SLOT(slotChangeTrackLock(int, bool)));
+
     slotChangeZoom(m_doc->zoom());
     slotSetZone(m_doc->zone());
 }
@@ -160,7 +162,7 @@ void TrackView::parseDocument(QDomDocument doc) {
                 m_doc->switchTrackVideo(i - 1, true);
                 m_doc->switchTrackAudio(i - 1, true);
             }
-            trackduration = slotAddProjectTrack(pos, p);
+            trackduration = slotAddProjectTrack(pos, p, m_doc->isTrackLocked(i - 1));
             pos--;
             //kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration;
             if (trackduration > duration) duration = trackduration;
@@ -283,6 +285,9 @@ void TrackView::parseDocument(QDomDocument doc) {
                 Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base, isAutomatic);
                 if (forceTrack) tr->setForcedTrack(true, a_track);
                 m_scene->addItem(tr);
+                if (m_doc->isTrackLocked(b_track - 1)) {
+                    tr->setItemLocked(true);
+                }
             }
         }
     }
@@ -357,6 +362,7 @@ void TrackView::slotRebuildTrackHeaders() {
         HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), this);
         connect(header, SIGNAL(switchTrackVideo(int)), m_trackview, SLOT(slotSwitchTrackVideo(int)));
         connect(header, SIGNAL(switchTrackAudio(int)), m_trackview, SLOT(slotSwitchTrackAudio(int)));
+        connect(header, SIGNAL(switchTrackLock(int)), m_trackview, SLOT(slotSwitchTrackLock(int)));
 
         connect(header, SIGNAL(deleteTrack(int)), this, SIGNAL(deleteTrack(int)));
         connect(header, SIGNAL(insertTrack(int)), this, SIGNAL(insertTrack(int)));
@@ -367,7 +373,7 @@ void TrackView::slotRebuildTrackHeaders() {
 }
 
 
-int TrackView::slotAddProjectTrack(int ix, QDomElement xml) {
+int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) {
     int trackTop = KdenliveSettings::trackheight() * ix;
     // parse track
     int position = 0;
@@ -380,6 +386,11 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) {
             qApp->processEvents();
             // Found a clip
             int in = elem.attribute("in").toInt();
+            int out = elem.attribute("out").toInt();
+            if (in > out || in == out) {
+                m_documentErrors.append(i18n("Invalid clip removed from track %1 at %2\n", ix, position));
+                continue;
+            }
             QString idString = elem.attribute("producer");
             QString id = idString;
             double speed = 1.0;
@@ -389,8 +400,6 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) {
             } else id = id.section('_', 0, 0);
             DocClipBase *clip = m_doc->clipManager()->getClipById(id);
             if (clip != NULL) {
-                int out = elem.attribute("out").toInt();
-
                 ItemInfo clipinfo;
                 clipinfo.startPos = GenTime(position, m_doc->fps());
                 clipinfo.endPos = clipinfo.startPos + GenTime(out - in + 1, m_doc->fps());
@@ -399,6 +408,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) {
                 //kDebug() << "// INSERTING CLIP: " << in << "x" << out << ", track: " << ix << ", ID: " << id << ", SCALE: " << m_scale << ", FPS: " << m_doc->fps();
                 ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), speed, false);
                 m_scene->addItem(item);
+                if (locked) item->setItemLocked(true);
                 clip->addReference();
                 position += (out - in + 1);
 
@@ -657,6 +667,10 @@ const QString & TrackView::editMode() const {
     return m_editMode;
 }
 
+void TrackView::slotChangeTrackLock(int ix, bool lock) {
+    QList<HeaderTrack *> widgets = this->findChildren<HeaderTrack *>();
+    widgets.at(ix)->setLock(lock);
+}
 
 
 #include "trackview.moc"