X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Frenderer.h;h=cc1b3ec73530c464d04da6f7458935c864287a56;hb=73635fd77a43f745e41c6ab325d70c3fe6603dd3;hp=c301d72849dc6e504434687b474be4d949323ee5;hpb=f77d9908db04d391ac381469d9005bc928872e1d;p=kdenlive diff --git a/src/renderer.h b/src/renderer.h index c301d728..cc1b3ec7 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KRENDER_H -#define KRENDER_H +#ifndef RENDERER_H +#define RENDERER_H #include #include @@ -31,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 { @@ -91,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 @@ -140,11 +141,11 @@ 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); @@ -152,18 +153,20 @@ Q_OBJECT public: 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 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); @@ -183,6 +186,7 @@ Q_OBJECT public: 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... */ @@ -199,6 +203,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; @@ -223,6 +228,7 @@ private: // Private attributes & methods QMap m_slowmotionProducers; void buildConsumer(); void resetZoneMode(); + void fillSlowMotionProducers(); private slots: // Private slots /** refresh monitor display */ @@ -233,11 +239,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(); @@ -269,7 +274,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);