X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipmanager.h;h=f9ac1722b27b2b56e0be1e91e1c852e9bb25b3dd;hb=ecda842bf2b632f75198d6cf0fac1fcb5ef862ad;hp=4ba673eb15900fb8b157671decacece2aaaa3cac;hpb=08a49ce40071207043020d0d8f3c804703ee7af8;p=kdenlive diff --git a/src/clipmanager.h b/src/clipmanager.h index 4ba673eb..f9ac1722 100644 --- a/src/clipmanager.h +++ b/src/clipmanager.h @@ -35,6 +35,12 @@ #include #include #include +#include + +#if KDE_IS_VERSION(4,5,0) +#include +#endif + #include "gentime.h" #include "definitions.h" @@ -76,7 +82,10 @@ Q_OBJECT public: void slotAddTextTemplateClip(QString titleName, const KUrl path, const QString group, const QString &groupId); void slotAddXmlClipFile(const QString name, const QDomElement xml, const QString group, const QString &groupId); void slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId); - void slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, const QString group, const QString &groupId); + void slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, + const bool loop, const bool crop,const bool fade, + const QString &luma_duration, const QString &luma_file, const int softness, + const QString &animation, const QString group, const QString &groupId); DocClipBase *getClipById(QString clipId); const QList getClipByResource(QString resource); void slotDeleteClips(QStringList ids); @@ -92,7 +101,7 @@ Q_OBJECT public: void askForAudioThumb(const QString &id); QString projectFolder() const; void clearUnusedProducers(); - void resetProducersList(const QList prods); + void resetProducersList(const QList prods, bool displayRatioChanged, bool fpsChanged); void addFolder(const QString&, const QString&); void deleteFolder(const QString&); void clear(); @@ -101,8 +110,9 @@ Q_OBJECT public: QDomElement groupsXml() const; int clipsCount() const; -public slots: - void updatePreviewSettings(); +#if KDE_IS_VERSION(4,5,0) + KImageCache* pixmapCache; +#endif private slots: /** A clip was externally modified, monitor for more changes and prepare for reload */ @@ -135,7 +145,7 @@ signals: void modifiedClip(const QString &); void missingClip(const QString &); void availableClip(const QString &); - void checkAllClips(); + void checkAllClips(bool displayRatioChanged, bool fpsChanged); }; #endif