X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.h;h=402def2ba6e7df69407c90c3309f8b6ce5b50ad7;hb=8ab3471f081af31eb9338216797268df9b0b37c1;hp=1298b44153b9718b8525bafacd33c49f35e9419a;hpb=56f69242fee94baa6a0ed504b9cc51e0b5eb04ae;p=kdenlive diff --git a/src/renderer.h b/src/renderer.h index 1298b441..402def2b 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -15,14 +15,13 @@ * * ***************************************************************************/ -#ifndef KRENDER_H -#define KRENDER_H +#ifndef RENDERER_H +#define RENDERER_H #include #include #include #include -#include #include @@ -32,16 +31,18 @@ /**Render encapsulates the client side of the interface to a renderer. From Kdenlive's point of view, you treat the Render object as the renderer, and simply use it as if it was local. Calls are asyncrhonous - -you send a call out, and then recieve the return value through the +you send a call out, and then receive the return value through the relevant signal that get's emitted once the call completes. *@author Jason Wood */ class Render; -//class EffectParamDesc; + +class QTimer; class QPixmap; -namespace Mlt { +namespace Mlt +{ class Consumer; class Playlist; class Tractor; @@ -54,7 +55,8 @@ class Multitrack; -class Render: public QObject { +class Render: public QObject +{ Q_OBJECT public: enum FailStates { OK = 0, @@ -92,8 +94,8 @@ Q_OBJECT public: void setSceneList(QDomDocument list, int position = 0); void setSceneList(QString playlist, int position = 0); void setProducer(Mlt::Producer *producer, int position); - QString sceneList(); - void saveSceneList(QString path, QDomElement kdenliveData = QDomElement()); + const QString sceneList(); + bool saveSceneList(QString path, QDomElement kdenliveData = QDomElement()); /** Wraps the VEML command of the same name. Tells the renderer to play the current scene at the speed specified, relative to normal @@ -141,28 +143,32 @@ Q_OBJECT public: /** Turn on or off on screen display */ void refreshDisplay(); int resetProfile(); - const double fps() const; - const int renderWidth() const; - const int renderHeight() const; + double fps() const; + int renderWidth() const; + int renderHeight() const; /** get display aspect ratio */ - const double dar() const; + double dar() const; /** Playlist manipulation */ void mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod); void mltUpdateClip(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); + int mltTrackDuration(int track); bool mltResizeClipEnd(ItemInfo info, GenTime clipDuration); bool mltResizeClipStart(ItemInfo info, GenTime diff); + bool mltResizeClipCrop(ItemInfo info, GenTime diff); bool mltMoveClip(int startTrack, int endTrack, GenTime pos, GenTime moveStart, Mlt::Producer *prod); bool mltMoveClip(int startTrack, int endTrack, int pos, int moveStart, Mlt::Producer *prod); bool mltRemoveClip(int track, GenTime position); - bool mltRemoveEffect(int track, GenTime position, QString index, bool doRefresh = true); - bool mltAddEffect(int track, GenTime position, QHash args, bool doRefresh = true); - bool mltEditEffect(int track, GenTime position, QHash args); + bool mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh = true); + bool mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh = true); + bool mltEditEffect(int track, GenTime position, EffectsParameterList params); void mltMoveEffect(int track, GenTime position, int oldPos, int newPos); void mltChangeTrackState(int track, bool mute, bool blind); - void mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut); - void mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool refresh = true); + bool mltMoveTransition(QString type, int startTrack, int newTrack, int newTransitionTrack, GenTime oldIn, GenTime oldOut, GenTime newIn, GenTime newOut); + bool mltAddTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool refresh = true); void mltDeleteTransition(QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool refresh = true); void mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml); void mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml); @@ -170,23 +176,25 @@ 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); + void mltDeleteTrack(int ix); + void mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod); /** Change speed of a clip in playlist. To do this, we create a new "framebuffer" producer. This new producer must have its "resource" param set to: video.mpg?0.6 where video.mpg is the path to the clip and 0.6 is the speed in percents. The newly created producer will have it's "id" parameter set to: "slowmotion:parentid:speed", where parentid is the id of the original clip in the ClipManager list and speed is the current speed */ - int mltChangeClipSpeed(ItemInfo info, double speed, Mlt::Producer *prod); + int mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt::Producer *prod); QList producersList(); + void updatePreviewSettings(); private: // Private attributes & methods /** The name of this renderer - useful to identify the renderes by what they do - e.g. background rendering, workspace monitor, etc... */ QString m_name; Mlt::Consumer * m_mltConsumer; Mlt::Producer * m_mltProducer; - Mlt::Producer *m_mltTextProducer; - Mlt::Filter *m_osdInfo; Mlt::Profile *m_mltProfile; double m_framePosition; double m_fps; @@ -195,29 +203,28 @@ private: // Private attributes & methods bool m_isZoneMode; bool m_isLoopMode; GenTime m_loopStart; + int m_originalOut; /** true when monitor is in split view (several tracks at the same time) */ bool m_isSplitView; Mlt::Producer *m_blackClip; - /** Holds the path to on screen display profile */ - QString m_osdProfile; + QString m_activeProfile; - QTimer *refreshTimer; - QTimer *osdTimer; - KUrl m_exportedFile; + QTimer *m_refreshTimer; + QTimer *m_osdTimer; /** A human-readable description of this renderer. */ int m_winid; - int m_externalwinid; /** Sets the description of this renderer to desc. */ void closeMlt(); - void mltCheckLength(bool reload = true); + void mltCheckLength(); QMap mltGetTransitionParamsFromXml(QDomElement xml); QMap m_slowmotionProducers; void buildConsumer(); void resetZoneMode(); + void fillSlowMotionProducers(); private slots: // Private slots /** refresh monitor display */ @@ -228,11 +235,10 @@ private slots: // Private slots signals: // Signals /** emitted when the renderer recieves a reply to a getFileProperties request. */ - void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &); + void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool); /** emitted when the renderer recieves a reply to a getImage request. */ - void replyGetImage(const QString & , int, const QPixmap &, int, int); - void replyGetImage(const QString &, const QPixmap &, int, int); + void replyGetImage(const QString &, const QPixmap &); /** Emitted when the renderer stops, either playing or rendering. */ void stopped(); @@ -249,7 +255,8 @@ signals: // Signals void durationChanged(int); void rendererPosition(int); void rendererStopped(int); - void removeInvalidClip(const QString &); + void removeInvalidClip(const QString &, bool replaceProducer); + void refreshDocumentProducers(); public slots: // Public slots /** Start Consumer */ @@ -264,7 +271,7 @@ public slots: // Public slots /** Wraps the VEML command of the same name. Requests the file properties for the specified url from the renderer. Upon return, the result will be emitted via replyGetFileProperties(). */ - void getFileProperties(const QDomElement &xml, const QString &clipId); + void getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer = true); void exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime); static char *decodedString(QString str);