X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdocclipbase.h;h=f59df01f81a665fb081eff7433064a71754e72dd;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=948b71da092e8e0ea224cf0e643c2a015aa10997;hpb=8f43422a260869d33fefa2f32bfb38f4f5bb5765;p=kdenlive diff --git a/src/docclipbase.h b/src/docclipbase.h index 948b71da..f59df01f 100644 --- a/src/docclipbase.h +++ b/src/docclipbase.h @@ -35,19 +35,15 @@ #include "definitions.h" /* -class DocTrackBase; class DocClipAVFile; -class DocClipTextFile; -class DocClipVirtual; class EffectDescriptionList;*/ -class KdenliveDoc; class KThumb; class ClipManager; namespace Mlt { class Producer; -}; +} struct CutZoneInfo { QPoint zone; @@ -57,7 +53,8 @@ struct CutZoneInfo { class DocClipBase: public QObject { -Q_OBJECT public: +Q_OBJECT +public: /** this enum determines the types of "feed" available within this clip. types must be non-exclusive * - e.g. if you can have audio and video separately, it should be possible to combin the two, as is * done here. If a new clip type is added then it should be possible to combine it with both audio @@ -76,14 +73,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();*/ @@ -92,7 +89,7 @@ Q_OBJECT public: const GenTime & duration() const; const GenTime maxDuration() const; /** returns the duration of this clip */ - void setDuration(GenTime dur); + void setDuration(const GenTime &dur); /** returns clip type (audio, text, image,...) */ const CLIPTYPE & clipType() const; @@ -119,9 +116,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, 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(); + Mlt::Producer *videoProducer(int track); /** Retrieve the producer that shows only audio */ Mlt::Producer *audioProducer(int track); @@ -136,7 +135,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; @@ -160,31 +159,20 @@ 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 deleteProducers(bool clearThumbCreator = true); + void deleteProducers(); /** Set default play zone for clip monitor */ - void setZone(QPoint zone); + void setZone(const QPoint &zone); /** Get default play zone for clip monitor */ QPoint zone() const; @@ -193,35 +181,50 @@ Q_OBJECT public: void setValid(); static QString getHash(const QString &path); - void addCutZone(int in, int out, QString desc = QString()); - bool hasCutZone(QPoint p) const; + void addCutZone(int in, int out, const QString &desc = QString()); + bool hasCutZone(const QPoint &p) const; void removeCutZone(int in, int out); QList cutZones() const; - void updateCutZone(int oldin, int oldout, int in, int out, QString desc = QString()); + void updateCutZone(int oldin, int oldout, int in, int out, const QString &desc = QString()); bool hasVideoCodec(const QString &codec) const; 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(); + void setAnalysisData(const QString &name, const QString &data, int offset = 0); + QMap analysisData() const; + int lastSeekPosition; + /** Cache for every audio Frame with 10 Bytes */ + /** format is frame -> channel ->bytes */ + QMap > audioFrameCache; + /** Returns all current properties for this clip */ + QMap properties() const; + /** Return the current values for a set of properties */ + QMap currentProperties(const QMap &props); + QMap metadata() const; + /** @brief Returns a short info string about the clip to display in tooltip */ + const QString shortInfo() const; private: // Private attributes - /** The number of times this clip is used in the project - the number of references to this clip * that exist. */ uint m_refcount; QList m_baseTrackProducers; + QList m_videoTrackProducers; QList m_audioTrackProducers; - Mlt::Producer *m_videoOnlyProducer; + QList m_toDeleteProducers; 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,43 +240,54 @@ private: // Private attributes /** Holds clip infos like fps, size,... */ QMap m_properties; /** Holds clip metadata like author, copyright,... */ - QMap m_metadata; + QMap m_metadata; + /** Holds clip analysis data that can be used later to create markers or keyframes */ + QMap m_analysisdata; + + /** 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); + /** @brief Offset all keyframes of a geometry. */ + const QString geometryWithOffset(const QString &data, int offset); + 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); GenTime hasSnapMarkers(const GenTime & time); QString deleteSnapMarker(const GenTime & time); - void editSnapMarker(const GenTime & time, QString comment); - void addSnapMarker(const GenTime & time, QString comment); + void editSnapMarker(const GenTime & time, const QString &comment); + void addSnapMarker(const CommentedTime &marker); QList < GenTime > snapMarkers() const; - QString markerComment(GenTime t); + QString markerComment(const GenTime &t) const; + CommentedTime markerAt(const GenTime &t) const; void setClipThumbFrame(const uint &ix); uint getClipThumbFrame() const; - void setProperties(QMap properties); - void setMetadata(QMap properties); - QMap properties() const; - QMap metadata() const; - + void setProperties(QMap properties); + void setMetadata(const QMap &properties, const QString &tool = QString()); + void slotExtractImage(const QList &frames); signals: void gotAudioData(); /** @brief Generate a proxy clip (lower resolution copy) named like the clip's hash. */ - void createProxy(const QString id); + void createProxy(const QString &id); /** @brief Abort creation of the proxy clip (lower resolution copy). */ - void abortProxy(const QString id); + void abortProxy(const QString &id, const QString &proxyPath); }; #endif