X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdocclipbase.h;h=fd84c4670ea18cc055b78cbb61a35987cb9e087b;hb=1d7da2457cc52f8686ac0654b7fedb9a5bb21a8b;hp=60e1402baa9fd3d1c6ce3205e09a1625b451be04;hpb=25a95ff4dba48d6a94c5c1d0d653617b1c327b90;p=kdenlive diff --git a/src/docclipbase.h b/src/docclipbase.h index 60e1402b..fd84c467 100644 --- a/src/docclipbase.h +++ b/src/docclipbase.h @@ -26,6 +26,8 @@ #include #include #include +#include +#include #include @@ -74,14 +76,14 @@ Q_OBJECT public: bool isTransparent() const; /** Returns any property of this clip. */ - const QString getProperty(const QString prop) const; + const QString getProperty(const QString &prop) const; void setProperty(const QString &key, const QString &value); void clearProperty(const QString &key); /** Returns the internal unique id of the clip. */ const QString &getId() const; - void setId(const QString &newId); + bool hasAudioThumb() const; //KThumb *thumbCreator; bool audioThumbCreated() const; /*void getClipMainThumb();*/ @@ -115,9 +117,11 @@ Q_OBJECT public: } /** Sets producers for the current clip (one for each track due to a limitation in MLT's track mixing */ - void setProducer(Mlt::Producer *producer, bool reset = false); + void setProducer(Mlt::Producer *producer, bool reset = false, bool readPropertiesFromProducer = false); /** Retrieve a producer for a track */ - Mlt::Producer *producer(int track = -1); + Mlt::Producer *getProducer(int track = -1); + /** Get a copy of the producer, for use in the clip monitor */ + Mlt::Producer *getCloneProducer(); /** Retrieve the producer that shows only video */ Mlt::Producer *videoProducer(); /** Retrieve the producer that shows only audio */ @@ -134,7 +138,7 @@ Q_OBJECT public: QDomDocument sceneToXML(const GenTime & startTime, const GenTime & endTime) const; /** returns a QString containing all of the XML data required to recreate this clip. */ - QDomElement toXML() const; + QDomElement toXML(bool hideTemporaryProperties = false) const; /** Returns true if the xml passed matches the values in this clip */ bool matchesXML(const QDomElement & element) const; @@ -158,29 +162,21 @@ Q_OBJECT public: * it uses it as part of it's own composition. */ bool referencesClip(DocClipBase * clip) const; - /** Sets the thumbnail to be used by this clip */ - void setThumbnail(const QPixmap & pixmap); - /** Returns the thumbnail producer used by this clip */ KThumb *thumbProducer(); - /** Returns the thumbnail used by this clip */ - const QPixmap & thumbnail() const; - /** Cache for every audio Frame with 10 Bytes */ /** format is frame -> channel ->bytes */ QMap > m_audioFrameCache; /** Free cache data */ void slotClearAudioCache(); - void askForAudioThumbs(); QString getClipHash() const; void refreshThumbUrl(); const char *producerProperty(const char *name) const; void setProducerProperty(const char *name, const char *data); void resetProducerProperty(const char *name); - void clearProducers(); - void deleteProducers(bool clearThumbCreator = true); + void deleteProducers(); /** Set default play zone for clip monitor */ void setZone(QPoint zone); @@ -202,6 +198,12 @@ Q_OBJECT public: bool hasAudioCodec(const QString &codec) const; bool checkHash() const; void setPlaceHolder(bool place); + QImage extractImage(int frame, int width, int height); + void clearThumbProducer(); + void reloadThumbProducer(); + void cleanupProducers(); + bool isClean() const; + bool getAudioThumbs(); private: // Private attributes @@ -210,17 +212,14 @@ private: // Private attributes uint m_refcount; QList m_baseTrackProducers; QList m_audioTrackProducers; + QList m_toDeleteProducers; Mlt::Producer *m_videoOnlyProducer; CLIPTYPE m_clipType; /** A list of snap markers; these markers are added to a clips snap-to points, and are displayed as necessary. */ QList < CommentedTime > m_snapMarkers; - - /** A thumbnail for this clip */ - QPixmap m_thumbnail; GenTime m_duration; - QTimer *m_audioTimer; KThumb *m_thumbProd; bool m_audioThumbCreated; @@ -237,16 +236,27 @@ private: // Private attributes QMap m_properties; /** Holds clip metadata like author, copyright,... */ QMap m_metadata; + + /** Try to make sure we don't delete a producer while using it */ + QMutex m_producerMutex; + QMutex m_replaceMutex; + + /** @brief This timer will trigger creation of audio thumbnails. */ + QTimer m_audioTimer; + /** Create connections for audio thumbnails */ - void slotCreateAudioTimer(); void slotRefreshProducer(); void setProducerProperty(const char *name, int data); void setProducerProperty(const char *name, double data); - void getFileHash(const QString url); + void getFileHash(const QString &url); + /** @brief When duplicating a producer, make sure all manually set properties are passed to it. */ + void adjustProducerProperties(Mlt::Producer *prod, const QString &id, bool mute, bool blind); + /** @brief Create another instance of a producer. */ + Mlt::Producer *cloneProducer(Mlt::Producer *source); + public slots: - void updateAudioThumbnail(QMap > data); - bool slotGetAudioThumbs(); + void updateAudioThumbnail(const audioByteArray& data); QList < CommentedTime > commentedSnapMarkers() const; GenTime findNextSnapMarker(const GenTime & currTime); GenTime findPreviousSnapMarker(const GenTime & currTime); @@ -260,12 +270,19 @@ public slots: uint getClipThumbFrame() const; void setProperties(QMap properties); void setMetadata(QMap properties); + /** Returns all current properties for this clip */ QMap properties() const; + /** Return the current values for a set of properties */ + QMap currentProperties(QMap props); QMap metadata() const; - + void slotExtractImage(QList frames); signals: void gotAudioData(); + /** @brief Generate a proxy clip (lower resolution copy) named like the clip's hash. */ + void createProxy(const QString &id); + /** @brief Abort creation of the proxy clip (lower resolution copy). */ + void abortProxy(const QString &id, const QString &proxyPath); }; #endif