]> git.sesse.net Git - kdenlive/blobdiff - src/trackview.cpp
Various fixes to improve general stability in Qt 4.5.2
[kdenlive] / src / trackview.cpp
index 14fe4eed8663b3c7ff7792ed4b6a0c0208e912a2..1ab892e279422498c09c89b678378ef58176449c 100644 (file)
 #include "mainwindow.h"
 #include "customtrackview.h"
 #include "initeffects.h"
+#include "profilesdialog.h"
 
 #include <KDebug>
 #include <KMessageBox>
 
 #include <QScrollBar>
+#include <QInputDialog>
 
-TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) :
+TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
         QWidget(parent),
         m_scale(1.0),
         m_projectTracks(0),
@@ -60,7 +62,6 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) :
     m_view.ruler_frame->setLayout(layout);
     layout->addWidget(m_ruler);
 
-
     QHBoxLayout *sizeLayout = new QHBoxLayout;
     sizeLayout->setContentsMargins(0, 0, 0, 0);
     sizeLayout->setSpacing(0);
@@ -68,6 +69,7 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) :
 
     QString style1 = "QToolButton {border-style: none;margin: 0px 3px;padding: 0px;} QToolButton:pressed:hover { background-color: rgba(224, 224, 0, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;} QToolButton:hover { background-color: rgba(255, 255, 255, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;}";
 
+
     QToolButton *butSmall = new QToolButton(this);
     butSmall->setIcon(KIcon("kdenlive-zoom-small"));
     butSmall->setToolTip(i18n("Smaller tracks"));
@@ -81,7 +83,6 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) :
     sizeLayout->addWidget(butLarge);
     m_view.size_frame->setStyleSheet(style1);
 
-
     QHBoxLayout *tracksLayout = new QHBoxLayout;
     tracksLayout->setContentsMargins(0, 0, 0, 0);
     tracksLayout->setSpacing(0);
@@ -94,16 +95,16 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) :
     m_headersLayout->setContentsMargins(0, m_trackview->frameWidth(), 0, 0);
     m_headersLayout->setSpacing(0);
     m_view.headers_container->setLayout(m_headersLayout);
-
     connect(m_view.headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int)));
 
     tracksLayout->addWidget(m_trackview);
-
     connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), m_view.headers_area->verticalScrollBar(), SLOT(setValue(int)));
     connect(m_trackview, SIGNAL(trackHeightChanged()), this, SLOT(slotRebuildTrackHeaders()));
 
     parseDocument(m_doc->toXml());
-    m_doc->setSceneList();
+    int error = m_doc->setSceneList();
+    if (error == -1) *ok = false;
+    else *ok = true;
     connect(m_trackview, SIGNAL(cursorMoved(int, int)), m_ruler, SLOT(slotCursorMoved(int, int)));
     connect(m_trackview->horizontalScrollBar(), SIGNAL(valueChanged(int)), m_ruler, SLOT(slotMoveRuler(int)));
     connect(m_trackview, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int)));
@@ -323,7 +324,11 @@ void TrackView::parseDocument(QDomDocument doc)
                                 if (e.attribute("type") == "double") {
                                     QString factor = e.attribute("factor", "1");
                                     if (factor != "1") {
-                                        double val = paramValue.toDouble() * factor.toDouble();
+                                        double fact;
+                                        if (factor.startsWith('%')) {
+                                            fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+                                        } else fact = factor.toDouble();
+                                        double val = paramValue.toDouble() * fact;
                                         paramValue = QString::number(val);
                                     }
                                 }
@@ -438,14 +443,17 @@ void TrackView::refresh()
 
 void TrackView::slotRebuildTrackHeaders()
 {
-    QList <TrackInfo> list = m_doc->tracksList();
+    kDebug() << "--------- - - - -REBUILD TLK HEAD";
+    const QList <TrackInfo> list = m_doc->tracksList();
     QLayoutItem *child;
+    m_view.headers_container->hide();
     while ((child = m_headersLayout->takeAt(0)) != 0) {
         if (child->widget()) delete child->widget();
         delete child;
     }
     int max = list.count();
     int height = KdenliveSettings::trackheight() * m_scene->scale().y();
+
     for (int i = 0; i < max; i++) {
         HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), height, this);
         connect(header, SIGNAL(switchTrackVideo(int)), m_trackview, SLOT(slotSwitchTrackVideo(int)));
@@ -455,8 +463,10 @@ void TrackView::slotRebuildTrackHeaders()
         connect(header, SIGNAL(deleteTrack(int)), this, SIGNAL(deleteTrack(int)));
         connect(header, SIGNAL(insertTrack(int)), this, SIGNAL(insertTrack(int)));
         connect(header, SIGNAL(changeTrack(int)), this, SIGNAL(changeTrack(int)));
+        connect(header, SIGNAL(renameTrack(int)), this, SLOT(slotRenameTrack(int)));
         m_headersLayout->addWidget(header);
     }
+    m_view.headers_container->show();
 }
 
 
@@ -495,9 +505,12 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
             QString idString = elem.attribute("producer");
             QString id = idString;
             double speed = 1.0;
+            int strobe = 1;
             if (idString.startsWith("slowmotion")) {
                 id = idString.section(':', 1, 1);
                 speed = idString.section(':', 2, 2).toDouble();
+                strobe = idString.section(':', 3, 3).toInt();
+                if (strobe == 0) strobe = 1;
             } else id = id.section('_', 0, 0);
             DocClipBase *clip = m_doc->clipManager()->getClipById(id);
             if (clip == NULL) {
@@ -538,13 +551,21 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
                 clipinfo.cropStart = GenTime(in, 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_doc->fps(), speed, false);
+                ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), speed, strobe, false);
                 if (idString.endsWith("_video")) item->setVideoOnly(true);
                 else if (idString.endsWith("_audio")) item->setAudioOnly(true);
                 m_scene->addItem(item);
                 if (locked) item->setItemLocked(true);
                 clip->addReference();
                 position += (out - in + 1);
+                kDebug() << "/////////\n\n\n" << "CLIP SPEED: " << speed << ", " << strobe << "\n\n\n/////////////////////";
+                if (speed != 1.0 || strobe > 1) {
+                    QDomElement speedeffect = MainWindow::videoEffects.getEffectByTag(QString(), "speed").cloneNode().toElement();
+                    EffectsList::setParameter(speedeffect, "speed", QString::number((int)(100 * speed + 0.5)));
+                    EffectsList::setParameter(speedeffect, "strobe", QString::number(strobe));
+                    item->addEffect(speedeffect, false);
+                    item->effectsCounter();
+                }
 
                 // parse clip effects
                 QDomNodeList effects = elem.childNodes();
@@ -595,7 +616,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
                             if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) {
                                 //kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND  * * * * * * * * * * *";
                                 // effect is key-framable, read all effects to retrieve keyframes
-                                double factor = 0;
+                                QString factor;
                                 QString starttag;
                                 QString endtag;
                                 QDomNodeList params = currenteffect.elementsByTagName("parameter");
@@ -604,7 +625,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
                                     if (e.attribute("type") == "keyframe") {
                                         starttag = e.attribute("starttag", "start");
                                         endtag = e.attribute("endtag", "end");
-                                        factor = e.attribute("factor", "1").toDouble();
+                                        factor = e.attribute("factor", "1");
                                         break;
                                     }
                                 }
@@ -613,13 +634,18 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
                                 int effectout = effect.attribute("out").toInt();
                                 double startvalue = 0;
                                 double endvalue = 0;
+                                double fact;
+                                if (factor.isEmpty()) fact = 1;
+                                else if (factor.startsWith('%')) {
+                                    fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+                                } else fact = factor.toDouble();
                                 for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
                                     // parse effect parameters
                                     QDomElement effectparam = n3.toElement();
                                     if (effectparam.attribute("name") == starttag)
-                                        startvalue = effectparam.text().toDouble() * factor;
+                                        startvalue = effectparam.text().toDouble() * fact;
                                     if (effectparam.attribute("name") == endtag)
-                                        endvalue = effectparam.text().toDouble() * factor;
+                                        endvalue = effectparam.text().toDouble() * fact;
                                 }
                                 // add first keyframe
                                 keyframes.append(QString::number(effectin) + ':' + QString::number(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';');
@@ -642,7 +668,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
                                             continueParsing = false;
                                             break;
                                         } else if (subeffectparam.attribute("name") == endtag) {
-                                            endvalue = subeffectparam.text().toDouble() * factor;
+                                            endvalue = subeffectparam.text().toDouble() * fact;
                                             break;
                                         }
                                     }
@@ -683,9 +709,13 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
                                 for (int k = 0; k < clipeffectparams.count(); k++) {
                                     e = clipeffectparams.item(k).toElement();
                                     if (!e.isNull() && e.tagName() == "parameter" && e.attribute("name") == paramname) {
-                                        double factor = e.attribute("factor", "1").toDouble();
-                                        if (factor != 1) {
-                                            e.setAttribute("value", paramvalue.toDouble() * factor);
+                                        if (e.attribute("factor", "1") != "1") {
+                                            QString factor = e.attribute("factor", "1");
+                                            double fact;
+                                            if (factor.startsWith('%')) {
+                                                fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+                                            } else fact = factor.toDouble();
+                                            e.setAttribute("value", paramvalue.toDouble() * fact);
                                         } else e.setAttribute("value", paramvalue);
                                         break;
                                     }
@@ -803,4 +833,24 @@ void TrackView::slotVerticalZoomUp()
     adjustTrackHeaders();
 }
 
+void TrackView::updateProjectFps()
+{
+    m_ruler->updateProjectFps(m_doc->timecode());
+}
+
+void TrackView::slotRenameTrack(int ix)
+{
+    int tracknumber = m_doc->tracksCount() - ix;
+    TrackInfo info = m_doc->trackInfoAt(tracknumber - 1);
+    bool ok;
+    QString newName = QInputDialog::getText(this, i18n("New Track Name"), i18n("Enter new name"), QLineEdit::Normal, info.trackName, &ok);
+    if (ok) {
+        info.trackName = newName;
+        m_doc->setTrackType(tracknumber - 1, info);
+        QTimer::singleShot(300, this, SLOT(slotRebuildTrackHeaders()));
+        m_doc->setModified(true);
+    }
+}
+
+
 #include "trackview.moc"