X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdocclipbase.h;h=7701f0743d12b1c9251e156968a2818a8c62ff94;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hp=fd84c4670ea18cc055b78cbb61a35987cb9e087b;hpb=ce2a5cc26ac1f035b2f4687c16b329d80c8ea7bb;p=kdenlive diff --git a/src/docclipbase.h b/src/docclipbase.h index fd84c467..7701f074 100644 --- a/src/docclipbase.h +++ b/src/docclipbase.h @@ -22,7 +22,7 @@ *@author Jason Wood */ -#include +#include #include #include #include @@ -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 @@ -92,12 +89,12 @@ 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; + const ClipType & clipType() const; /** set clip type (audio, text, image,...) */ - void setClipType(CLIPTYPE type); + void setClipType(ClipType type); /** remove tmp file if the clip has one (for example text clips) */ void removeTmpFile() const; @@ -123,7 +120,7 @@ Q_OBJECT public: /** 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); @@ -165,10 +162,6 @@ Q_OBJECT public: /** Returns the thumbnail producer used by this clip */ KThumb *thumbProducer(); - /** Cache for every audio Frame with 10 Bytes */ - /** format is frame -> channel ->bytes */ - QMap > m_audioFrameCache; - /** Free cache data */ void slotClearAudioCache(); QString getClipHash() const; @@ -179,7 +172,7 @@ Q_OBJECT public: 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; @@ -188,11 +181,11 @@ 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; @@ -204,17 +197,29 @@ Q_OBJECT public: 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; QList m_toDeleteProducers; - Mlt::Producer *m_videoOnlyProducer; - CLIPTYPE m_clipType; + 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; @@ -235,7 +240,9 @@ 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; @@ -253,6 +260,8 @@ private: // Private attributes 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: @@ -262,20 +271,16 @@ public slots: 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); - /** 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); + void setProperties(QMap properties); + void setMetadata(const QMap &properties, const QString &tool = QString()); + void slotExtractImage(const QList &frames); signals: void gotAudioData();