[PATCH by Ray Lehtiniemi] Do not return references to temporaries.

[kdenlive] / src / trackview.cpp

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 7d59cf3892f3ba374c92b56f086d217abe0e79e4..72cf2823ec818a2f22f0b9796f78697fb7d911e5 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -18,14 +18,9 @@
  ***************************************************************************/
 
 
-#include <QScrollBar>
-
-#include <KDebug>
-#include <KMessageBox>
-
+#include "trackview.h"
 #include "definitions.h"
 #include "headertrack.h"
-#include "trackview.h"
 #include "clipitem.h"
 #include "transition.h"
 #include "kdenlivesettings.h"
@@ -36,6 +31,11 @@
 #include "customtrackview.h"
 #include "initeffects.h"
 
+#include <KDebug>
+#include <KMessageBox>
+
+#include <QScrollBar>
+
 TrackView::TrackView(KdenliveDoc *doc, QWidget *parent)
         : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0) {
 
@@ -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());
 }
@@ -119,7 +121,7 @@ void TrackView::setDuration(int dur) {
 
 void TrackView::parseDocument(QDomDocument doc) {
     int cursorPos = 0;
-    m_documentErrors = QString();
+    m_documentErrors.clear();
     // kDebug() << "//// DOCUMENT: " << doc.toString();
     /*QDomNode props = doc.elementsByTagName("properties").item(0);
     if (!props.isNull()) {
@@ -149,6 +151,9 @@ void TrackView::parseDocument(QDomDocument doc) {
                 p = playlists.item(j).toElement();
                 if (p.attribute("id") == playlist_name) break;
             }
+            if (p.attribute("id") != playlist_name) { // then it didn't work.
+                kDebug() << "NO PLAYLIST FOUND FOR TRACK " + pos;
+            }
             if (e.attribute("hide") == "video") {
                 m_doc->switchTrackVideo(i - 1, true);
             } else if (e.attribute("hide") == "audio") {
@@ -157,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;
@@ -280,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);
+                }
             }
         }
     }
@@ -354,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)));
@@ -364,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;
@@ -377,17 +386,20 @@ 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;
             if (idString.startsWith("slowmotion")) {
-                id = idString.section(":", 1, 1);
-                speed = idString.section(":", 2, 2).toDouble();
+                id = idString.section(':', 1, 1);
+                speed = idString.section(':', 2, 2).toDouble();
             } 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());
@@ -396,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);
 
@@ -475,7 +488,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) {
                                         endvalue = effectparam.text().toDouble() * factor;
                                 }
                                 // add first keyframe
-                                keyframes.append(QString::number(effectin) + ":" + QString::number(startvalue) + ";" + QString::number(effectout) + ":" + QString::number(endvalue) + ";");
+                                keyframes.append(QString::number(effectin) + ':' + QString::number(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';');
                                 QDomNode lastParsedEffect;
                                 ix++;
                                 QDomNode n2 = effects.at(ix);
@@ -500,7 +513,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) {
                                         }
                                     }
                                     if (continueParsing) {
-                                        keyframes.append(QString::number(effectout) + ":" + QString::number(endvalue) + ";");
+                                        keyframes.append(QString::number(effectout) + ':' + QString::number(endvalue) + ';');
                                         ix++;
                                     }
                                 }
@@ -561,7 +574,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) {
             } else {
                 // The clip in playlist was not listed in the kdenlive producers,
                 // something went wrong, repair required.
-                kWarning() << "CANNOT INSERT CLIP " << id;
+                kWarning() << "CANNOT INSERT CLIP " << id;
                 int out = elem.attribute("out").toInt();
 
                 ItemInfo clipinfo;
@@ -598,7 +611,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml) {
 
 
     //documentTracks.insert(ix, track);
-    kDebug() << "*************  ADD DOC TRACK " << ix << ", DURATION: " << position;
+    kDebug() << "*************  ADD DOC TRACK " << ix << ", DURATION: " << position;
     return position;
     //track->show();
 }
@@ -654,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"