Rewrote the handling of timeline in QGraphicsView. Now we use the built in zoom featu...

[kdenlive] / src / kdenlivedoc.h

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index 76f123b7ee7318591f44479e0008014ab77e009a..f19526ba931cab671d74bcf57a57cda8a2c9a394 100644 (file)
--- a/src/kdenlivedoc.h
+++ b/src/kdenlivedoc.h
@@ -22,15 +22,15 @@
 #define KDENLIVEDOC_H
 
 #include <qdom.h>
-#include <qstring.h>
-#include <qmap.h>
+#include <QString>
+#include <QMap>
 #include <QList>
 #include <QObject>
 #include <QUndoGroup>
+#include <QUndoStack>
 #include <QTimer>
 
-#include <KUndoStack>
-#include <kurl.h>
+#include <KUrl>
 
 #include "gentime.h"
 #include "timecode.h"
@@ -45,7 +45,7 @@ class MainWindow;
 class KdenliveDoc: public QObject {
 Q_OBJECT public:
 
-    KdenliveDoc(const KUrl &url, const KUrl &projectFolder, MltVideoProfile profile, QUndoGroup *undoGroup, MainWindow *parent = 0);
+    KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, MainWindow *parent = 0);
     ~KdenliveDoc();
     QDomNodeList producersList();
     double fps() const;
@@ -56,7 +56,7 @@ Q_OBJECT public:
     Timecode timecode() const;
     QDomDocument toXml() const;
     void setRenderer(Render *render);
-    KUndoStack *commandStack();
+    QUndoStack *commandStack();
     QString producerName(int id);
     void setProducerDuration(int id, int duration);
     int getProducerDuration(int id);
@@ -73,7 +73,7 @@ Q_OBJECT public:
     void slotDeleteFolder(const QString folderName, const int id);
     void slotEditFolder(const QString folderName, const QString oldfolderName, int clipId);
     void slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const int groupId = -1);
-    void slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, bool loop, const QString group, const int groupId = -1);
+    void slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, const QString group, const int groupId = -1);
     void deleteClip(const uint clipId);
     int getFramePos(QString duration);
     DocClipBase *getBaseClip(int clipId);
@@ -102,6 +102,7 @@ Q_OBJECT public:
     void syncGuides(QList <Guide *> guides);
     void setZoom(int factor);
     int zoom() const;
+    const double dar();
 
 private:
     KUrl m_url;
@@ -116,7 +117,7 @@ private:
     int m_height;
     Timecode m_timecode;
     Render *m_render;
-    KUndoStack *m_commandStack;
+    QUndoStack *m_commandStack;
     QDomDocument generateSceneList();
     ClipManager *m_clipManager;
     MltVideoProfile m_profile;