X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.h;h=9813d6270c9e9892d24e7f6d072ddba3bbe6c204;hb=485eee3beffea9b2504b84925ec096e82bbe1ea0;hp=70f91633f8e99a17f8086f4f14deb92ed304802d;hpb=a54db1d1e6a90edadbbb58d46870937130c692e7;p=kdenlive diff --git a/src/renderer.h b/src/renderer.h index 70f91633..9813d627 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 @@ -47,6 +48,8 @@ class QTimer; class QPixmap; +class KComboBox; + namespace Mlt { class Consumer; @@ -59,6 +62,7 @@ class Producer; class Filter; class Profile; class Service; +class Event; }; struct requestClipInfo { @@ -97,7 +101,7 @@ Q_OBJECT public: * @param rendererName A unique identifier for this renderer * @param winid The parent widget identifier (required for SDL display). Set to 0 for OpenGL rendering * @param profile The MLT profile used for the renderer (default one will be used if empty). */ - Render(const QString &rendererName, int winid, QString profile = QString(), QWidget *parent = 0); + Render(Kdenlive::MONITORID rendererName, int winid, QString profile = QString(), QWidget *parent = 0); /** @brief Destroy the MLT Renderer. */ virtual ~Render(); @@ -151,14 +155,14 @@ Q_OBJECT public: void loopZone(const GenTime & startTime, const GenTime & stopTime); void saveZone(KUrl url, QString desc, QPoint zone); - - /** @brief Returns the name of the renderer. */ - const QString & rendererName() const; + + /** @brief Save a clip in timeline to an xml playlist. */ + bool saveClip(int track, GenTime position, KUrl url, QString desc = QString()); /** @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; @@ -171,8 +175,6 @@ Q_OBJECT public: /** @brief Returns the aspect ratio of the consumer. */ double consumerRatio() const; - void doRefresh(); - /** @brief Saves current producer frame as an image. */ void exportCurrentFrame(KUrl url, bool notify); @@ -197,6 +199,10 @@ Q_OBJECT public: double dar() const; /** @brief Returns sample aspect ratio. */ double sar() const; + /** @brief If monitor is active, refresh it. */ + void refreshIfActive(); + /** @brief Start the MLT monitor consumer. */ + void startConsumer(); /* * Playlist manipulation. @@ -204,7 +210,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(Mlt::Tractor *tractor, ItemInfo info, QDomElement element, Mlt::Producer *prod); - void mltCutClip(int track, GenTime position); + bool 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); @@ -213,7 +219,7 @@ Q_OBJECT public: bool mltResizeClipEnd(ItemInfo info, GenTime clipDuration); bool mltResizeClipStart(ItemInfo info, GenTime diff); - bool mltResizeClipCrop(ItemInfo info, GenTime diff); + bool mltResizeClipCrop(ItemInfo info, GenTime newCropStart); bool mltMoveClip(int startTrack, int endTrack, GenTime pos, GenTime moveStart, Mlt::Producer *prod, bool overwrite = false, bool insert = false); bool mltMoveClip(int startTrack, int endTrack, int pos, int moveStart, Mlt::Producer *prod, bool overwrite = false, bool insert = false); bool mltRemoveClip(int track, GenTime position); @@ -224,8 +230,21 @@ Q_OBJECT public: /** @brief Adds an effect to a clip in MLT's playlist. */ bool mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh = true); + bool addFilterToService(Mlt::Service service, EffectsParameterList params, int duration); bool mltAddEffect(Mlt::Service service, EffectsParameterList params, int duration, bool doRefresh); bool mltAddTrackEffect(int track, EffectsParameterList params); + + /** @brief Enable / disable clip effects. + * @param track The track where the clip is + * @param position The start position of the clip + * @param effectIndexes The list of effect indexes to enable / disable + * @param disable True if effects should be disabled, false otherwise */ + bool mltEnableEffects(int track, GenTime position, QList effectIndexes, bool disable); + /** @brief Enable / disable track effects. + * @param track The track where the effect is + * @param effectIndexes The list of effect indexes to enable / disable + * @param disable True if effects should be disabled, false otherwise */ + bool mltEnableTrackEffects(int track, QList effectIndexes, bool disable); /** @brief Edits an effect parameters in MLT's playlist. */ bool mltEditEffect(int track, GenTime position, EffectsParameterList params); @@ -252,7 +271,7 @@ Q_OBJECT public: void mltMoveTransparency(int startTime, int endTime, int startTrack, int endTrack, int id); void mltDeleteTransparency(int pos, int track, int id); void mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id); - void mltInsertTrack(int ix, bool videoTrack); + QList mltInsertTrack(int ix, bool videoTrack); void mltDeleteTrack(int ix); 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); @@ -275,8 +294,6 @@ Q_OBJECT public: void showFrame(Mlt::Frame&); void showAudio(Mlt::Frame&); - /** @brief This property is used to decide if the renderer should send audio data for monitoring. */ - bool analyseAudio; QList checkTrackSequence(int); void sendFrameUpdate(); @@ -284,7 +301,7 @@ Q_OBJECT public: /** @brief Returns a pointer to the main producer. */ Mlt::Producer *getProducer(); /** @brief Returns the number of clips to process (When requesting clip info). */ - int processingItems() const; + int processingItems(); /** @brief Force processing of clip with selected id. */ void forceProcessing(const QString &id); /** @brief Are we currently processing clip with selected id. */ @@ -301,6 +318,13 @@ Q_OBJECT public: Mlt::Tractor *lockService(); /** @brief Unlock the MLT service */ void unlockService(Mlt::Tractor *tractor); + const QString activeClipId(); + /** @brief Fill a combobox with the found blackmagic devices */ + static bool getBlackMagicDeviceList(KComboBox *devicelist); + static bool getBlackMagicOutputDeviceList(KComboBox *devicelist); + /** @brief Frame rendering is handeled by Kdenlive, don't show video through SDL display */ + void disablePreview(bool disable); + int requestedSeekPosition; private: @@ -308,10 +332,12 @@ private: * * Useful to identify the renderers by what they do - e.g. background * rendering, workspace monitor, etc. */ - QString m_name; + Kdenlive::MONITORID m_name; Mlt::Consumer * m_mltConsumer; Mlt::Producer * m_mltProducer; Mlt::Profile *m_mltProfile; + Mlt::Event *m_showFrameEvent; + Mlt::Event *m_pauseEvent; double m_fps; bool m_externalConsumer; @@ -331,6 +357,7 @@ private: QString m_activeProfile; QTimer *m_osdTimer; + QTimer m_refreshTimer; QMutex m_mutex; QMutex m_infoMutex; @@ -368,9 +395,12 @@ private slots: /** @brief Refreshes the monitor display. */ void refresh(); void slotOsdTimeout(); - int connectPlaylist(); /** @brief Process the clip info requests (in a separate thread). */ void processFileProperties(); + /** @brief A clip with multiple video streams was found, ask what to do. */ + void slotMultiStreamProducerFound(const QString path, QList audio_list, QList video_list, stringMap data); + + void slotCheckSeeking(); signals: @@ -403,12 +433,19 @@ signals: */ void removeInvalidProxy(const QString &id, bool durationError); void refreshDocumentProducers(bool displayRatioChanged, bool fpsChanged); + /** @brief A proxy clip is missing, ask for creation. */ + void requestProxy(QString); + /** @brief A multiple stream clip was found. */ + void multiStreamFound(const QString &,QList,QList,stringMap data); + /** @brief A frame's image has to be shown. * * Used in Mac OS X. */ void showImageSignal(QImage); void showAudioSignal(const QByteArray &); + void addClip(const KUrl &, stringMap); + void checkSeeking(); public slots: @@ -428,6 +465,8 @@ public slots: void slotSwitchFullscreen(); void slotSetVolume(int volume); void seekToFrame(int pos); + /** @brief Starts a timer to query for a refresh. */ + void doRefresh(); }; #endif