From: Jean-Baptiste M. <jb...@kd...> - 2015-09-12 23:05:13
|
Git commit ce9c70f33402ec1e25b5e25c5fc1d49a21c920c2 by Jean-Baptiste Mardelle. Committed on 12/09/2015 at 23:04. Pushed by mardelle into branch 'master'. Merge branch 'master' of git://anongit.kde.org/kdenlive M +28 -28 src/renderer.cpp M +22 -2 src/timeline/customtrackview.cpp M +44 -4 src/timeline/timeline.cpp M +3 -1 src/timeline/timeline.h http://commits.kde.org/kdenlive/ce9c70f33402ec1e25b5e25c5fc1d49a21c920c2 diff --cc src/timeline/timeline.h index 00cbfa7,be574e6..2895eec --- a/src/timeline/timeline.h +++ b/src/timeline/timeline.h @@@ -120,9 -120,7 +120,10 @@@ public int getTracks(); void getTransitions(); void refreshTractor(); + void saveZone(const QUrl url, const QPoint &zone); + void duplicateClipOnPlaylist(int tk, qreal startPos, int offset, Mlt::Producer *prod); + void duplicateTransitionOnPlaylist(int in, int out, QString tag, QDomElement xml, int a_track, int b_track, Mlt::Field *field); + Mlt::Transition *getTransition(const QString &name, int trackIndex) const; protected: void keyPressEvent(QKeyEvent * event); |