X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.h;h=92948354ca1c31760e0a9c3c24ff21bb596e58a3;hb=593c46dd843608c9b800b0ee9f2ad0dc0c69f5a7;hp=74011cb25802e6b1948c6024bf84274950abdc6b;hpb=623c7ac1fac4f52a39f102649d062cc900e470d6;p=kdenlive diff --git a/src/renderer.h b/src/renderer.h index 74011cb2..92948354 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -52,7 +52,9 @@ namespace Mlt class Consumer; class Playlist; class Tractor; +class Transition; class Frame; +class Field; class Producer; class Filter; class Profile; @@ -81,7 +83,7 @@ Q_OBJECT public: APP_NOEXIST }; - Render(const QString & rendererName, int winid, int extid, QWidget *parent = 0); + Render(const QString & rendererName, int winid, int extid, QString profile = QString(), QWidget *parent = 0); ~Render(); /** Seeks the renderer clip to the given time. */ @@ -127,7 +129,7 @@ Q_OBJECT public: void stop(const GenTime & startTime); void setVolume(double volume); - QPixmap extractFrame(int frame_position, int width = -1, int height = -1); + QImage extractFrame(int frame_position, int width = -1, int height = -1); /** Wraps the VEML command of the same name. Tells the renderer to 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 @@ -161,7 +163,7 @@ Q_OBJECT public: /** Turn on or off on screen display */ void refreshDisplay(); - int resetProfile(); + int resetProfile(const QString profileName); double fps() const; int renderWidth() const; int renderHeight() const; @@ -169,8 +171,8 @@ Q_OBJECT public: double dar() const; /** Playlist manipulation */ - int mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod); - void mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod); + int mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod, bool overwrite = false, bool push = false); + bool 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); @@ -178,18 +180,25 @@ Q_OBJECT public: 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 mltMoveClip(int startTrack, int endTrack, GenTime pos, GenTime moveStart, Mlt::Producer *prod, bool overwrite = false, bool insert = false); + bool mltMoveClip(int startTrack, int endTrack, int pos, int moveStart, Mlt::Producer *prod, bool overwrite = false, bool insert = false); bool mltRemoveClip(int track, GenTime position); + /** Delete an effect to a clip in MLT's playlist */ bool mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh = true); + /** Add an effect to a clip in MLT's playlist */ bool mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh = true); + /** Edit an effect parameters in MLT */ bool mltEditEffect(int track, GenTime position, EffectsParameterList params); + /** This only updates the "kdenlive_ix" (index) value of an effect */ + void mltUpdateEffectPosition(int track, GenTime position, int oldPos, int newPos); + /** This changes the order of effects in MLT, inverting effects from oldPos and newPos, also updating the kdenlive_ix value */ void mltMoveEffect(int track, GenTime position, int oldPos, int newPos); + /** This changes the state of a track, enabling / disabling audio and video */ void mltChangeTrackState(int track, bool mute, bool blind); 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 mltUpdateTransition(QString oldTag, QString tag, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml, bool force = false); 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); @@ -197,21 +206,25 @@ Q_OBJECT public: 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); + bool mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod); + void mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_track, int b_track); + Mlt::Producer *invalidProducer(const QString &id); /** 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, int strobe, Mlt::Producer *prod); + int mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, double speed, double oldspeed, int strobe, Mlt::Producer *prod); const QList producersList(); void updatePreviewSettings(); void setDropFrames(bool show); + QString updateSceneListFps(double current_fps, double new_fps, QString scene); #ifdef Q_WS_MAC void showFrame(Mlt::Frame&); #endif + QList checkTrackSequence(int); 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... */ @@ -249,7 +262,7 @@ private: // Private attributes & methods void mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest); QMap mltGetTransitionParamsFromXml(QDomElement xml); QMap m_slowmotionProducers; - void buildConsumer(); + void buildConsumer(const QString profileName); void resetZoneMode(); void fillSlowMotionProducers(); @@ -284,7 +297,6 @@ signals: // Signals void rendererStopped(int); void removeInvalidClip(const QString &, bool replaceProducer); void refreshDocumentProducers(); - void blockMonitors(); /** Used on OS X - emitted when a frame's image is to be shown. */ void showImageSignal(QImage); @@ -300,12 +312,13 @@ 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, bool replaceProducer = true); + void getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer = true); void exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime); static char *decodedString(QString str); void mltSavePlaylist(); void slotSplitView(bool doit); + void slotSwitchFullscreen(); }; #endif