Fix tracks issues (load & save of tracks with hidden audio or video), also fix

[kdenlive] / src / trackview.cpp

diff --git a/src/trackview.cpp b/src/trackview.cpp
index d4ccbde877d0346d63bf0d9df1b2702f68aca7aa..a2036add0b865a9f645d629aaae57879d2c8a0e2 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -120,10 +120,10 @@ void TrackView::parseDocument(QDomDocument doc) {
     int cursorPos = 0;
     m_documentErrors = QString();
     // kDebug() << "//// DOCUMENT: " << doc.toString();
-    QDomNode props = doc.elementsByTagName("properties").item(0);
+    /*QDomNode props = doc.elementsByTagName("properties").item(0);
     if (!props.isNull()) {
         cursorPos = props.toElement().attribute("timeline_position").toInt();
-    }
+    }*/
 
     // parse project tracks
     QDomNodeList tracks = doc.elementsByTagName("track");
@@ -133,7 +133,6 @@ void TrackView::parseDocument(QDomDocument doc) {
     int trackduration = 0;
     QDomElement e;
     QDomElement p;
-    bool videotrack;
 
     int pos = m_projectTracks - 1;
 
@@ -148,8 +147,15 @@ void TrackView::parseDocument(QDomDocument doc) {
                 p = playlists.item(j).toElement();
                 if (p.attribute("id") == playlist_name) break;
             }
-            videotrack = (e.attribute("hide") != "video");
-            trackduration = slotAddProjectTrack(pos, p, videotrack);
+            if (e.attribute("hide") == "video") {
+                m_doc->switchTrackVideo(i - 1, true);
+            } else if (e.attribute("hide") == "audio") {
+                m_doc->switchTrackAudio(i - 1, true);
+            } else if (e.attribute("hide") == "both") {
+                m_doc->switchTrackVideo(i - 1, true);
+                m_doc->switchTrackAudio(i - 1, true);
+            }
+            trackduration = slotAddProjectTrack(pos, p);
             pos--;
             //kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration;
             if (trackduration > duration) duration = trackduration;
@@ -329,7 +335,7 @@ void TrackView::refresh() {
 }
 
 void TrackView::slotRebuildTrackHeaders() {
-    QList <TrackInfo> list = m_trackview->tracksList();
+    QList <TrackInfo> list = m_doc->tracksList();
     QList<HeaderTrack *> widgets = this->findChildren<HeaderTrack *>();
     for (int i = 0; i < widgets.count(); i++)
         delete widgets.at(i);
@@ -338,30 +344,17 @@ 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)));
-        /*
+
         //TODO: re-enable when add / remove track is implemented
-        connect(header, SIGNAL(deleteTrack(int)), m_trackview, SLOT(slotDeleteTrack(int)));
-        connect(header, SIGNAL(insertTrack(int)), m_trackview, SLOT(slotInsertTrack(int)));*/
+        connect(header, SIGNAL(deleteTrack(int)), this, SIGNAL(deleteTrack(int)));
+        connect(header, SIGNAL(insertTrack(int)), this, SIGNAL(insertTrack(int)));
         m_headersLayout->addWidget(header);
     }
     view->headers_container->adjustSize();
 }
 
-int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool videotrack) {
-    TrackInfo info;
-
-    if (videotrack) {
-        info.type = VIDEOTRACK;
-        info.isMute = false;
-        info.isBlind = false;
-    } else {
-        info.type = AUDIOTRACK;
-        info.isMute = false;
-        info.isBlind = false;
-    }
-
-    m_trackview->addTrack(info);
 
+int TrackView::slotAddProjectTrack(int ix, QDomElement xml) {
     int trackTop = KdenliveSettings::trackheight() * ix;
     // parse track
     int position = 0;