X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.h;h=0da0dad2fa7ce6187e92af403177642fe07716a4;hb=085ec2ecfae4a807e6f32b6b06bc53e0e276a651;hp=4e483d8750bac9fdc5541a0ebaaed90c17c38918;hpb=9dfb0966d6cbc8be9e59d2db2fd8507e61bc1700;p=kdenlive diff --git a/src/renderer.h b/src/renderer.h index 4e483d87..0da0dad2 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; @@ -140,7 +139,7 @@ Q_OBJECT public: /** Turn on or off on screen display */ void refreshDisplay(); - int resetProfile(QString profile); + int resetProfile(); const double fps() const; const int renderWidth() const; const int renderHeight() const; @@ -151,14 +150,16 @@ 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 mltResizeClipEnd(int track, GenTime pos, GenTime in, GenTime out); - void mltResizeClipStart(int track, GenTime pos, GenTime moveEnd, GenTime moveStart, GenTime in, GenTime out); - bool mltMoveClip(int startTrack, int endTrack, GenTime pos, GenTime moveStart); - bool mltMoveClip(int startTrack, int endTrack, int pos, int moveStart); - void mltRemoveClip(int track, GenTime position); + void mltInsertSpace(const GenTime pos, int track, const GenTime duration); + int mltGetSpaceLength(const GenTime pos, int track); + bool mltResizeClipEnd(ItemInfo info, GenTime clipDuration); + bool mltResizeClipStart(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, QMap args, bool doRefresh = true); - bool mltEditEffect(int track, GenTime position, QMap args); + bool mltAddEffect(int track, GenTime position, QHash args, bool doRefresh = true); + bool mltEditEffect(int track, GenTime position, QHash args); 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); @@ -166,7 +167,22 @@ Q_OBJECT public: 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); - + void mltAddClipTransparency(ItemInfo info, int transitiontrack, int id); + 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, double oldspeed, Mlt::Producer *prod); + + QList producersList(); 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... */ @@ -178,8 +194,12 @@ 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; + /** true when monitor is in split view (several tracks at the same time) */ bool m_isSplitView; @@ -190,20 +210,18 @@ private: // Private attributes & methods 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); QMap mltGetTransitionParamsFromXml(QDomElement xml); + QMap m_slowmotionProducers; + void buildConsumer(); + void resetZoneMode(); private slots: // Private slots /** refresh monitor display */ @@ -214,11 +232,11 @@ private slots: // Private slots signals: // Signals /** emitted when the renderer recieves a reply to a getFileProperties request. */ - void replyGetFileProperties(int 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 > &); /** emitted when the renderer recieves a reply to a getImage request. */ - void replyGetImage(int , int, const QPixmap &, int, int); - void replyGetImage(int, const QPixmap &, int, int); + void replyGetImage(const QString & , int, const QPixmap &, int, int); + void replyGetImage(const QString &, const QPixmap &, int, int); /** Emitted when the renderer stops, either playing or rendering. */ void stopped(); @@ -235,7 +253,7 @@ signals: // Signals void durationChanged(int); void rendererPosition(int); void rendererStopped(int); - + void removeInvalidClip(const QString &); public slots: // Public slots /** Start Consumer */ @@ -250,7 +268,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, int clipId); + void getFileProperties(const QDomElement &xml, const QString &clipId); void exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime); static char *decodedString(QString str);