X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.h;h=45e140a1502a4de396c6482aad5a31f253a54bb8;hb=020035a721ab682e4171443afaf10b5efa189586;hp=9acd058a2df173d4f19e684f588ec9554f7fb8fd;hpb=c45bc0a73244411dbc8c6fc486f66e88f152462c;p=kdenlive diff --git a/src/renderer.h b/src/renderer.h index 9acd058a..45e140a1 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -32,7 +32,8 @@ #include "gentime.h" #include "definitions.h" #include "abstractmonitor.h" -#include "mlt/framework/mlt_types.h" + +#include #include @@ -59,6 +60,7 @@ class Producer; class Filter; class Profile; class Service; +class Event; }; struct requestClipInfo { @@ -66,6 +68,11 @@ struct requestClipInfo { QString clipId; int imageHeight; bool replaceProducer; + +bool operator==(const requestClipInfo &a) +{ + return clipId == a.clipId; +} }; class MltErrorEvent : public QEvent @@ -101,7 +108,6 @@ Q_OBJECT public: void seek(GenTime time); void seek(int time); void seekToFrameDiff(int diff); - int m_isBlocked; QPixmap getImageThumbnail(KUrl url, int width, int height); @@ -154,14 +160,14 @@ Q_OBJECT public: /** @brief Returns the speed at which the renderer is currently playing. * * It returns 0.0 when the renderer is not playing anything. */ - double playSpeed(); + double playSpeed() const; /** @brief Returns the current seek position of the renderer. */ GenTime seekPosition() const; int seekFramePosition() const; void emitFrameUpdated(Mlt::Frame&); - void emitFrameNumber(double position); + void emitFrameNumber(); void emitConsumerStopped(); /** @brief Returns the aspect ratio of the consumer. */ @@ -172,13 +178,14 @@ Q_OBJECT public: /** @brief Saves current producer frame as an image. */ void exportCurrentFrame(KUrl url, bool notify); - /** @brief Turns on or off on screen display. */ - void refreshDisplay(); /** @brief Change the Mlt PROFILE * @param profileName The MLT profile name * @param dropSceneList If true, the current playlist will be deleted + * @return true if the profile was changed * . */ int resetProfile(const QString& profileName, bool dropSceneList = false); + /** @brief Returns true if the render uses profileName as current profile. */ + bool hasProfile(const QString& profileName) const; double fps() const; /** @brief Returns the width of a frame for this profile. */ @@ -198,7 +205,7 @@ Q_OBJECT public: */ Mlt::Producer *checkSlowMotionProducer(Mlt::Producer *prod, QDomElement element); int mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod, bool overwrite = false, bool push = false); - bool mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod); + bool mltUpdateClip(Mlt::Tractor *tractor, ItemInfo info, QDomElement element, Mlt::Producer *prod); void mltCutClip(int track, GenTime position); void mltInsertSpace(QMap trackClipStartList, QMap trackTransitionStartList, int track, const GenTime &duration, const GenTime &timeOffset); int mltGetSpaceLength(const GenTime &pos, int track, bool fromBlankStart); @@ -249,7 +256,7 @@ Q_OBJECT public: void mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id); void mltInsertTrack(int ix, bool videoTrack); void mltDeleteTrack(int ix); - bool mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod); + bool mltUpdateClipProducer(Mlt::Tractor *tractor, int track, int pos, Mlt::Producer *prod); void mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_track, int b_track); Mlt::Producer *invalidProducer(const QString &id); @@ -282,6 +289,20 @@ Q_OBJECT public: int processingItems() const; /** @brief Force processing of clip with selected id. */ void forceProcessing(const QString &id); + /** @brief Are we currently processing clip with selected id. */ + bool isProcessing(const QString &id); + + /** @brief Requests the file properties for the specified URL (will be put in a queue list) + @param xml The xml parameters for the clip + @param clipId The clip Id string + @param imageHeight The height (in pixels) of the returned thumbnail (height of a treewidgetitem in projectlist) + @param replaceProducer If true, the MLT producer will be recreated */ + void getFileProperties(const QDomElement &xml, const QString &clipId, int imageHeight, bool replaceProducer = true); + + /** @brief Lock the MLT service */ + Mlt::Tractor *lockService(); + /** @brief Unlock the MLT service */ + void unlockService(Mlt::Tractor *tractor); private: @@ -293,7 +314,8 @@ private: Mlt::Consumer * m_mltConsumer; Mlt::Producer * m_mltProducer; Mlt::Profile *m_mltProfile; - double m_framePosition; + Mlt::Event *m_showFrameEvent; + Mlt::Event *m_pauseEvent; double m_fps; bool m_externalConsumer; @@ -313,6 +335,7 @@ private: QString m_activeProfile; QTimer *m_osdTimer; + QTimer m_refreshTimer; QMutex m_mutex; QMutex m_infoMutex; @@ -328,6 +351,8 @@ private: void mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest); QMap mltGetTransitionParamsFromXml(QDomElement xml); QMap m_slowmotionProducers; + /** @brief The id of the clip that is currently being loaded for info query */ + QString m_processingClipId; /** @brief Build the MLT Consumer object with initial settings. * @param profileName The MLT profile to use for the consumer */ @@ -348,13 +373,13 @@ private slots: /** @brief Refreshes the monitor display. */ void refresh(); void slotOsdTimeout(); - int connectPlaylist(); - //void initSceneList(); + /** @brief Process the clip info requests (in a separate thread). */ + void processFileProperties(); signals: /** @brief The renderer received a reply to a getFileProperties request. */ - void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const stringMap &, const stringMap &, bool replaceProducer, bool refreshThumbnail = false); + void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const stringMap &, const stringMap &, bool replaceProducer); /** @brief The renderer received a reply to a getImage request. */ void replyGetImage(const QString &, const QString &, int, int); @@ -382,9 +407,6 @@ signals: */ void removeInvalidProxy(const QString &id, bool durationError); void refreshDocumentProducers(bool displayRatioChanged, bool fpsChanged); - - /** @brief If we will delete the producer, make sure to pause the monitor */ - void blockClipMonitor(const QString &); /** @brief A frame's image has to be shown. * @@ -404,18 +426,6 @@ public slots: /** @brief Checks if the file is readable by MLT. */ bool isValid(KUrl url); - /** @brief Requests the file properties for the specified URL. - @param xml The xml parameters for the clip - @param clipId The clip Id string - @param imageHeight The height (in pixels) of the returned thumbnail (height of a treewidgetitem in projectlist) - @param replaceProducer If true, the MLT producer will be recreated - @param selectClip If true, clip item will be selected in project view - * Upon return, the result will be emitted via replyGetFileProperties(). - * Wraps the VEML command of the same name. */ - void getFileProperties(const QDomElement &xml, const QString &clipId, int imageHeight, bool replaceProducer = true); - - void getFileProperties2(); - void exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime); void mltSavePlaylist(); void slotSplitView(bool doit);