Fix crash on clip insertion redo:

[kdenlive] / src / kdenlivedoc.h

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index 156555e077c37b49d228dba6cf55f785abd9a5d3..8cc4b42d1f9b29bfa18a09de1c74f20fbe8c4032 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;
@@ -58,8 +58,8 @@ Q_OBJECT public:
     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);
@@ -92,7 +92,7 @@ Q_OBJECT public:
     QString description() const;
     void setUrl(KUrl url);
     void setProfilePath(QString path);
-    const QString&getFreeClipId();
+    const QString &getFreeClipId();
     /** does the document need saving */
     bool isModified() const;
     /** Returns project folder, used to store project files (titles, effects,...) */
@@ -109,9 +109,15 @@ Q_OBJECT public:
     TrackInfo trackInfoAt(int ix) const;
     void insertTrack(int ix, TrackInfo type);
     void deleteTrack(int ix);
+    void setTrackType(int ix, TrackInfo type);
     const QList <TrackInfo> tracksList() const;
     QPoint getTracksCount() const;
     QString getTracksInfo() const;
+    void switchTrackVideo(int ix, bool hide);
+    void switchTrackAudio(int ix, bool hide);
+    void cachePixmap(const QString &fileId, const QPixmap &pix) const;
+    void setProjectFolder(KUrl url);
+    QString getLadspaFile() const;
 
 private:
     KUrl m_url;
@@ -141,12 +147,13 @@ private:
 
     QList <TrackInfo> m_tracksList;
 
-    void convertDocument(double version);
+    bool convertDocument(double version);
     QDomDocument createEmptyDocument(const int videotracks, const int audiotracks);
     QString colorToString(const QColor& c);
     void checkProjectClips();
     void setNewClipResource(const QString &id, const QString &path);
     QString searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const;
+    void moveProjectData(KUrl url);
 
 public slots:
     void slotCreateTextClip(QString group, const QString &groupId);
@@ -157,7 +164,7 @@ private slots:
     void slotAutoSave();
 
 signals:
-    void addProjectClip(DocClipBase *);
+    void addProjectClip(DocClipBase *, bool getInfo = true);
     void addProjectFolder(const QString, const QString &, bool, bool edit = false);
     void signalDeleteProjectClip(const QString &);
     void updateClipDisplay(const QString&);