X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.h;h=fd83a14e9f799e38ea9ec308f45c27b8f1c715e2;hb=b18228e4399a1622154362e7c25a8c7a750360d7;hp=9e6c92d73705ab8ceaf5008a97b9d1bc0d6d5284;hpb=7fff167fb95bb6b13b138b8d3f7b68da8a030473;p=kdenlive diff --git a/src/renderer.h b/src/renderer.h index 9e6c92d7..fd83a14e 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -22,7 +22,6 @@ #include #include #include -#include #include @@ -101,6 +100,7 @@ Q_OBJECT public: backwards. Does not specify start/stop times for playback.*/ void play(double speed); void switchPlay(); + void pause(); /** stop playing */ void stop(const GenTime & startTime); void setVolume(double volume); @@ -110,12 +110,11 @@ Q_OBJECT public: play the current scene at the speed specified, relative to normal playback. e.g. 1.0 is normal speed, 0.0 is paused, -1.0 means play backwards. Specifes the start/stop times for playback.*/ - void play(double speed, const GenTime & startTime); - void play(double speed, const GenTime & startTime, - const GenTime & stopTime); + void play(const GenTime & startTime); + void playZone(const GenTime & startTime, const GenTime & stopTime); + void loopZone(const GenTime & startTime, const GenTime & stopTime); - /** Returns the description of this renderer */ - QString description(); + void saveZone(KUrl url, QString desc, QPoint zone); /** Returns the name of the renderer. */ const QString & rendererName() const; @@ -151,18 +150,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,13 +172,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... */ @@ -188,34 +196,37 @@ private: // Private attributes & methods Mlt::Profile *m_mltProfile; double m_framePosition; double m_fps; - uint m_monitorId; - bool m_generateScenelist; + + /** true if we are playing a zone (ie the in and out properties have been temporarily changed) */ + 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; - int exportDuration, firstExportFrame, lastExportFrame; /** A human-readable description of this renderer. */ - QString m_description; int m_winid; int m_externalwinid; - /** The actually seek command, private so people can't avoid the buffering of multiple seek commands. */ - void sendSeekCommand(GenTime time); /** Sets the description of this renderer to desc. */ - void setDescription(const QString & description); 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 */ @@ -229,8 +240,7 @@ signals: // Signals void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &); /** 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();