* Fix possible crash when creating new document

[kdenlive] / src / kdenlivedoc.h

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index 188fcb4e128f425a6378ff306aa56ce6ba5fa0c3..24aaea11210d8d44f35f3c69f19f514d8df8ed35 100644 (file)
--- a/src/kdenlivedoc.h
+++ b/src/kdenlivedoc.h
@@ -48,7 +48,7 @@ class TrackInfo;
 class KdenliveDoc: public QObject {
 Q_OBJECT public:
 
-    KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, MainWindow *parent = 0);
+    KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, Render *render, MainWindow *parent = 0);
     ~KdenliveDoc();
     QDomNodeList producersList();
     double fps() const;
@@ -56,10 +56,9 @@ Q_OBJECT public:
     int height() const;
     KUrl url() const;
     KAutoSaveFile *m_autosave;
-    void backupMltPlaylist();
     Timecode timecode() const;
-    QDomDocument toXml() const;
-    void setRenderer(Render *render);
+    QDomDocument toXml();
+    //void setRenderer(Render *render);
     QUndoStack *commandStack();
     QString producerName(const QString &id);
     void setProducerDuration(const QString &id, int duration);
@@ -69,14 +68,9 @@ Q_OBJECT public:
     QDomElement guidesXml() const;
     ClipManager *clipManager();
     void addClip(QDomElement elem, QString clipId, bool createClipItem = true);
-    void addClipInfo(QDomElement elem, QString clipId);
-    void addFolder(const QString foldername, const QString &clipId, bool edit);
-    void deleteFolder(const QString foldername, const QString &clipId);
+    void addClipInfo(QDomElement elem, QDomElement orig, QString clipId);
     void slotAddClipFile(const KUrl url, const QString group, const QString &groupId = QString());
     void slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId = QString());
-    void slotAddFolder(const QString folderName);
-    void slotDeleteFolder(const QString folderName, const QString &id);
-    void slotEditFolder(const QString folderName, const QString oldfolderName, const QString &clipId);
     void slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId = QString());
     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 QString &groupId = QString());
     void deleteClip(const QString &clipId);
@@ -84,7 +78,6 @@ Q_OBJECT public:
     DocClipBase *getBaseClip(const QString &clipId);
     void updateClip(const QString &id);
     void deleteProjectClip(QList <QString> ids);
-    void deleteProjectFolder(QMap <QString, QString> map);
     /** Inform application of the audio thumbnails generation progress */
     void setThumbsProgress(const QString &message, int progress);
     QString profilePath() const;
@@ -117,6 +110,11 @@ Q_OBJECT public:
     void switchTrackAudio(int ix, bool hide);
     void cachePixmap(const QString &fileId, const QPixmap &pix) const;
     void setProjectFolder(KUrl url);
+    QString getLadspaFile() const;
+    void setZone(int start, int end);
+    QPoint zone() const;
+    void setSceneList();
+    void updatePreviewSettings();
 
 private:
     KUrl m_url;
@@ -134,7 +132,6 @@ private:
     QDomDocument generateSceneList();
     ClipManager *m_clipManager;
     MltVideoProfile m_profile;
-    QString m_scenelist;
     QTimer *m_autoSaveTimer;
     QString m_searchFolder;
     /** tells whether current doc has been changed since last save event */
@@ -143,6 +140,9 @@ private:
     KUrl m_projectFolder;
     double m_documentLoadingStep;
     double m_documentLoadingProgress;
+    bool m_abortLoading;
+    int m_zoneStart;
+    int m_zoneEnd;
 
     QList <TrackInfo> m_tracksList;
 
@@ -163,8 +163,8 @@ private slots:
     void slotAutoSave();
 
 signals:
+    void resetProjectList();
     void addProjectClip(DocClipBase *, bool getInfo = true);
-    void addProjectFolder(const QString, const QString &, bool, bool edit = false);
     void signalDeleteProjectClip(const QString &);
     void updateClipDisplay(const QString&);
     void deleteTimelineClip(const QString&);