X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=9c45abbdba7641361d6eb64a80667deb0a62c2ba;hb=eb9f7923ad07e099949a76d57bd6fc2c2719ee86;hp=89c43e0d38ea52f061d2d477d7c9fce605f39bf7;hpb=1811080abb410d9cc78ce9e20ee409926c4379d4;p=kdenlive

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 89c43e0d..9c45abbd 100644
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -28,7 +28,13 @@
 #include "headertrack.h"
 #include "trackview.h"
 #include "clipitem.h"
+#include "transition.h"
 #include "kdenlivesettings.h"
+#include "clipmanager.h"
+#include "customruler.h"
+#include "kdenlivedoc.h"
+#include "mainwindow.h"
+#include "customtrackview.h"
 
 TrackView::TrackView(KdenliveDoc *doc, QWidget *parent)
         : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0), m_currentZoom(4) {
@@ -115,28 +121,88 @@ void TrackView::setDuration(int dur) {
 
 void TrackView::parseDocument(QDomDocument doc) {
     int cursorPos = 0;
-    kDebug() << "//// DOCUMENT: " << doc.toString();
+    //kDebug() << "//// DOCUMENT: " << doc.toString();
     QDomNode props = doc.elementsByTagName("properties").item(0);
     if (!props.isNull()) {
         cursorPos = props.toElement().attribute("timeline_position").toInt();
     }
-    QDomNodeList tracks = doc.elementsByTagName("playlist");
+
+    // parse project tracks
+    QDomNodeList tracks = doc.elementsByTagName("track");
+    QDomNodeList playlists = doc.elementsByTagName("playlist");
     int duration = 300;
     m_projectTracks = tracks.count();
     int trackduration = 0;
-    kDebug() << "//////////// TIMELINE FOUND: " << m_projectTracks << " tracks";
+    QDomElement e;
+    QDomElement p;
+    bool videotrack;
+    
+    int pos = m_projectTracks - 1;
+
     for (int i = 0; i < m_projectTracks; i++) {
-        if (tracks.item(i).toElement().attribute("id") != "playlistmain") {
-            if (tracks.item(i).toElement().attribute("hide", QString::null) == "video") {
-                // this is an audio track
-                trackduration = slotAddAudioTrack(i, tracks.item(i).toElement());
-            } else if (!tracks.item(i).toElement().attribute("id", QString::null).isEmpty())
-                trackduration = slotAddVideoTrack(i, tracks.item(i).toElement());
+        e = tracks.item(i).toElement();
+        QString playlist_name = e.attribute("producer");
+        if (playlist_name != "black_track" && playlist_name != "playlistmain") {
+            // find playlist related to this track
+            p = QDomElement();
+            for (int j = 0; j < m_projectTracks; j++) {
+                p = playlists.item(j).toElement();
+                if (p.attribute("id") == playlist_name) break;
+            }
+            videotrack = (e.attribute("hide") != "video");
+            trackduration = slotAddProjectTrack(pos, p, videotrack);
+            pos--;
             kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration;
             if (trackduration > duration) duration = trackduration;
+        } else {
+			// background black track
+			int black_clips = e.childNodes().count();
+			for (int i = 0; i < black_clips; i++)
+				m_doc->loadingProgressed();
+			qApp->processEvents();
+			pos--;
+		}
+    }
+
+    // parse transitions
+    QDomNodeList transitions = doc.elementsByTagName("transition");
+    int projectTransitions = transitions.count();
+    kDebug() << "//////////// TIMELINE FOUND: " << projectTransitions << " transitions";
+    for (int i = 0; i < projectTransitions; i++) {
+        e = transitions.item(i).toElement();
+        QDomNodeList transitionparams = e.childNodes();
+        bool transitionAdd = true;
+        int a_track = 0;
+        int b_track = 0;
+        QString mlt_service;
+        for (int k = 0; k < transitionparams.count(); k++) {
+            p = transitionparams.item(k).toElement();
+            if (!p.isNull()) {
+                // do not add audio mixing transitions
+                if (p.attribute("name") == "internal_added" && p.text() == "237") {
+                    transitionAdd = false;
+                    kDebug() << "//  TRANSITRION " << i << " IS NOT VALID (INTERN ADDED)";
+                    break;
+                } else if (p.attribute("name") == "a_track") a_track = p.text().toInt();
+                else if (p.attribute("name") == "b_track") b_track = m_projectTracks - 1 - p.text().toInt();
+                else if (p.attribute("name") == "mlt_service") mlt_service = p.text();
+            }
+        }
+        if (transitionAdd) {
+            // Transition should be added to the scene
+            ItemInfo transitionInfo;
+            transitionInfo.startPos = GenTime(e.attribute("in").toInt(), m_doc->fps());
+            transitionInfo.endPos = GenTime(e.attribute("out").toInt(), m_doc->fps());
+            transitionInfo.track = b_track;
+            kDebug() << "///////////////   +++++++++++  ADDING TRANSITION ON TRACK: " << b_track << ", TOTAL TRKA: " << m_projectTracks;
+            Transition *tr = new Transition(transitionInfo, a_track, m_scale, m_doc->fps(), QDomElement());
+            m_scene->addItem(tr);
         }
     }
+
+
     m_trackview->setDuration(duration);
+    kDebug() << "///////////  TOTAL PROJECT DURATION: " << duration;
     slotRebuildTrackHeaders();
     //m_trackview->setCursorPos(cursorPos);
     //m_scrollBox->setGeometry(0, 0, 300 * zoomFactor(), m_scrollArea->height());
@@ -163,7 +229,7 @@ void TrackView::slotChangeZoom(int factor) {
 }
 
 int TrackView::fitZoom() const {
-    int zoom = (duration() + 20 / m_scale) * FRAME_SIZE / m_trackview->width();
+    int zoom = (int)((duration() + 20 / m_scale) * FRAME_SIZE / m_trackview->width());
     int i;
     for (i = 0; i < 13; i++)
         if (m_ruler->comboScale[i] > zoom) break;
@@ -175,7 +241,7 @@ const double TrackView::zoomFactor() const {
 }
 
 const int TrackView::mapLocalToValue(int x) const {
-    return (int) x * zoomFactor();
+    return (int)(x * zoomFactor());
 }
 
 KdenliveDoc *TrackView::document() {
@@ -201,23 +267,19 @@ void TrackView::slotRebuildTrackHeaders() {
     view->headers_container->adjustSize();
 }
 
-int TrackView::slotAddAudioTrack(int ix, QDomElement xml) {
-    kDebug() << "*************  ADD AUDIO TRACK " << ix;
+int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool videotrack) {
     TrackInfo info;
-    info.type = AUDIOTRACK;
-    info.isMute = false;
-    info.isBlind = false;
-    m_trackview->addTrack(info);
-    //documentTracks.insert(ix, track);
-    return 0;
-    //track->show();
-}
 
-int TrackView::slotAddVideoTrack(int ix, QDomElement xml) {
-    TrackInfo info;
-    info.type = VIDEOTRACK;
-    info.isMute = false;
-    info.isBlind = false;
+    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 trackTop = KdenliveSettings::trackheight() * ix;
@@ -226,17 +288,72 @@ int TrackView::slotAddVideoTrack(int ix, QDomElement xml) {
     for (QDomNode n = xml.firstChild(); !n.isNull(); n = n.nextSibling()) {
         QDomElement elem = n.toElement();
         if (elem.tagName() == "blank") {
-            position += elem.attribute("length", 0).toInt();
+            position += elem.attribute("length").toInt();
         } else if (elem.tagName() == "entry") {
-            int in = elem.attribute("in", 0).toInt();
-            int id = elem.attribute("producer", 0).toInt();
+			m_doc->loadingProgressed();
+			qApp->processEvents();
+            // Found a clip
+            int in = elem.attribute("in").toInt();
+            int id = elem.attribute("producer").toInt();
             DocClipBase *clip = m_doc->clipManager()->getClipById(id);
-            int out = elem.attribute("out", 0).toInt() - in;
-            //kDebug()<<"++++++++++++++\n\n / / /ADDING CLIP: "<<clip.cropTime<<", out: "<<clip.duration<<", Producer: "<<clip.producer<<"\n\n++++++++++++++++++++";
-            ClipItem *item = new ClipItem(clip, ix, GenTime(position, m_doc->fps()), QRectF(position * m_scale, trackTop + 1, out * m_scale, KdenliveSettings::trackheight() - 1), GenTime(out, m_doc->fps()), m_doc->fps());
-            m_scene->addItem(item);
-            position += out;
-
+            if (clip != NULL) {
+                int out = elem.attribute("out").toInt();
+
+                ItemInfo clipinfo;
+                clipinfo.startPos = GenTime(position, m_doc->fps());
+                clipinfo.endPos = clipinfo.startPos + GenTime(out, m_doc->fps());
+                clipinfo.track = ix;
+                kDebug() << "// INSERTING CLIP: " << in << "x" << out << ", track: " << ix << ", ID: " << id << ", SCALE: " << m_scale << ", FPS: " << m_doc->fps();
+                ClipItem *item = new ClipItem(clip, clipinfo, m_scale, m_doc->fps());
+                m_scene->addItem(item);
+                position += out;
+
+                // parse clip effects
+                for (QDomNode n2 = elem.firstChild(); !n2.isNull(); n2 = n2.nextSibling()) {
+                    QDomElement effect = n2.toElement();
+                    if (effect.tagName() == "filter") {
+                        // add effect to clip
+                        QString effecttag;
+                        QString effectindex;
+                        // Get effect tag & index
+                        for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
+                            // parse effect parameters
+                            QDomElement effectparam = n3.toElement();
+                            if (effectparam.attribute("name") == "tag") {
+                                effecttag = effectparam.text();
+                            }
+                            if (effectparam.attribute("name") == "kdenlive_ix") {
+                                effectindex = effectparam.text();
+                            }
+                        }
+
+                        // get effect standard tags
+                        QDomElement clipeffect = MainWindow::videoEffects.getEffectByTag(effecttag);
+                        clipeffect.setAttribute("kdenlive_ix", effectindex);
+                        QDomNodeList clipeffectparams = clipeffect.childNodes();
+
+                        // adjust effect parameters
+                        for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
+                            // parse effect parameters
+                            QDomElement effectparam = n3.toElement();
+                            QString paramname = effectparam.attribute("name");
+                            QString paramvalue = effectparam.text();
+
+                            // try to find this parameter in the effect xml
+                            QDomElement e;
+                            for (int k = 0; k < clipeffectparams.count(); k++) {
+                                e = clipeffectparams.item(k).toElement();
+                                if (!e.isNull() && e.tagName() == "parameter" && e.attribute("name") == paramname) {
+                                    e.setAttribute("value", paramvalue);
+                                    break;
+                                }
+                            }
+                        }
+                        item->addEffect(clipeffect, false);
+                    }
+                }
+
+            } else kWarning() << "CANNOT INSERT CLIP " << id;
             //m_clipList.append(clip);
         }
     }
@@ -244,7 +361,7 @@ int TrackView::slotAddVideoTrack(int ix, QDomElement xml) {
 
 
     //documentTracks.insert(ix, track);
-    kDebug() << "*************  ADD VIDEO TRACK " << ix << ", DURATION: " << position;
+    kDebug() << "*************  ADD DOC TRACK " << ix << ", DURATION: " << position;
     return position;
     //track->show();
 }