X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.h;h=8685765e63fd89e4e6adfd2cb61727291d41eb21;hb=cd85961a9520f2f3c909e889dacd8de539468b89;hp=45688b92cf02b858db24564dbabd45973e3f9d8a;hpb=04b9d547a562f35c58ee034ebfe09ec4ea414c48;p=kdenlive diff --git a/src/renderer.h b/src/renderer.h index 45688b92..8685765e 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,13 +31,14 @@ /**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 { @@ -92,7 +92,7 @@ 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(); + const QString sceneList(); void saveSceneList(QString path, QDomElement kdenliveData = QDomElement()); /** Wraps the VEML command of the same name. Tells the renderer to @@ -151,18 +151,21 @@ Q_OBJECT public: 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); bool mltResizeClipEnd(ItemInfo info, GenTime clipDuration); bool mltResizeClipStart(ItemInfo info, GenTime diff); - bool mltMoveClip(int startTrack, int endTrack, GenTime pos, GenTime moveStart); - bool mltMoveClip(int startTrack, int endTrack, int pos, int moveStart); + 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,15 +173,19 @@ 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... */ @@ -195,6 +202,7 @@ 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; @@ -202,6 +210,7 @@ private: // Private attributes & methods Mlt::Producer *m_blackClip; /** Holds the path to on screen display profile */ QString m_osdProfile; + QString m_activeProfile; QTimer *refreshTimer; QTimer *osdTimer; @@ -213,11 +222,12 @@ private: // Private attributes & methods /** 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 +238,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(); @@ -264,7 +273,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);