X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipmanager.h;h=c7741b8f8f0b875f7df866209e3fa115b1c28b2c;hb=953722f2f4cf7279d4b2afc3a8299c0f5a8e2454;hp=7f1622e33c48f3fba9e3aa948a285a3130fce51a;hpb=51a5213eaf67eb4d674c340f80e2fb8ac0bab8b2;p=kdenlive diff --git a/src/clipmanager.h b/src/clipmanager.h index 7f1622e3..c7741b8f 100644 --- a/src/clipmanager.h +++ b/src/clipmanager.h @@ -98,8 +98,6 @@ Q_OBJECT public: int getFreeClipId(); int getFreeFolderId(); int lastClipId() const; - void startAudioThumbsGeneration(); - void endAudioThumbsGeneration(const QString &requestedId); void askForAudioThumb(const QString &id); QString projectFolder() const; void clearUnusedProducers(); @@ -129,6 +127,7 @@ private slots: /** Check the list of externally modified clips, and process them if they were not modified in the last 1500 milliseconds */ void slotProcessModifiedClips(); void slotGetThumbs(); + void slotGetAudioThumbs(); private: // Private attributes /** the list of clips in the document */ @@ -141,7 +140,6 @@ private: // Private attributes KdenliveDoc *m_doc; int m_clipIdCounter; int m_folderIdCounter; - QString m_generatingAudioId; KDirWatch m_fileWatcher; /** Timer used to reload clips when they have been externally modified */ QTimer m_modifiedTimer; @@ -151,10 +149,17 @@ private: // Private attributes QMap m_requestedThumbs; QMutex m_thumbsMutex; QFuture m_thumbsThread; + /** @brief The id of currently processed clip for thumbs creation. */ + QString m_processingThumbId; /** @brief If true, abort processing of clip thumbs before removing a clip. */ bool m_abortThumb; /** @brief We are about to delete the clip producer, stop processing thumbs. */ bool m_closing; + QFuture m_audioThumbsThread; + /** @brief If true, abort processing of audio thumbs. */ + bool m_abortAudioThumb; + /** @brief The id of currently processed clip for audio thumbs creation. */ + QString m_processingAudioThumbId; signals: void reloadClip(const QString &);