Try to fix audio mixing bug ( http://www.kdenlive.org:80/mantis/view.php?id=228 )

[kdenlive] / src / clipmanager.h

diff --git a/src/clipmanager.h b/src/clipmanager.h
index 164d49a6e5f6c08b83c0de28216d98efae5ec7de..cfa0565a749261b5556b8625e8d603945ca4b80a 100644 (file)
--- a/src/clipmanager.h
+++ b/src/clipmanager.h
@@ -47,25 +47,32 @@ Q_OBJECT public:
     virtual ~ ClipManager();
     void addClip(DocClipBase *clip);
     DocClipBase *getClipAt(int pos);
-    void deleteClip(uint clipId);
-    void slotAddClipFile(const KUrl url, const QString group, const int groupId);
-    void slotAddTextClipFile(const QString path, const QString group, const int groupId);
-    void slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const int groupId);
-    void slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, bool loop, const QString group, const int groupId);
-    DocClipBase *getClipById(int clipId);
-    void slotDeleteClip(uint clipId);
+    void deleteClip(const QString &clipId);
+    void slotAddClipFile(const KUrl url, const QString group, const QString &groupId);
+    void slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId);
+    void slotAddTextClipFile(const QString titleName, const QString imagePath, const QString xml, const QString group, const QString &groupId);
+    void slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId);
+    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);
+    DocClipBase *getClipById(QString clipId);
+    void slotDeleteClip(const QString & clipId);
     void setThumbsProgress(const QString &message, int progress);
     void checkAudioThumbs();
     QList <DocClipBase*> documentClipList();
     int getFreeClipId();
+    int lastClipId() const;
+    void startAudioThumbsGeneration();
+    void endAudioThumbsGeneration(const QString &requestedId);
+    void askForAudioThumb(const QString &id);
 
 private:   // Private attributes
     /** the list of clips in the document */
     QList <DocClipBase*> m_clipList;
+    QList <QString> m_audioThumbsQueue;
     /** the document undo stack*/
     KdenliveDoc *m_doc;
     int m_clipIdCounter;
     bool m_audioThumbsEnabled;
+    QString m_generatingAudioId;
 
 };