X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.h;h=2bc2f950a962f411956744f1b12c894f325207ad;hb=908927829e52521336659b61364e9cfd06595b86;hp=b064f4ba1fa1c9fda271d13ca04fbd33a0715802;hpb=ab51067165fe1025162f3a09b07285b9caa44014;p=kdenlive diff --git a/src/projectlist.h b/src/projectlist.h index b064f4ba..2bc2f950 100644 --- a/src/projectlist.h +++ b/src/projectlist.h @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include #include @@ -46,12 +48,20 @@ #include "kdenlivesettings.h" #include "folderprojectitem.h" #include "subprojectitem.h" +#include namespace Mlt { class Producer; }; +struct PROXYINFO { + QString dest; + QString src; + CLIPTYPE type; + int exif; +}; + class ProjectItem; class ProjectListView; class Render; @@ -62,6 +72,19 @@ const int NameRole = Qt::UserRole; const int DurationRole = NameRole + 1; const int UsageRole = NameRole + 2; +class InvalidDialog: public KDialog +{ + Q_OBJECT +public: + InvalidDialog(const QString &caption, const QString &message, bool infoOnly, QWidget *parent = 0); + virtual ~InvalidDialog(); + void addClip(const QString &id, const QString &path); + QStringList getIds() const; +private: + QListWidget *m_clipList; +}; + + class ItemDelegate: public QStyledItemDelegate { public: @@ -105,12 +128,19 @@ public: painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText, &bounding); int proxy = index.data(Qt::UserRole + 5).toInt(); - if (proxy > 0) { + if (proxy != 0) { QRectF txtBounding; QString proxyText; QBrush brush; QColor color; - if (proxy == PROXYDONE) { + if (proxy > 0) { + proxyText = QString::number(proxy) + "% "; + proxyText.append(i18n("Generating proxy ...")); + brush = option.palette.highlight(); + color = option.palette.color(QPalette::HighlightedText); + + } + else if (proxy == PROXYDONE) { proxyText = i18n("Proxy"); brush = option.palette.mid(); color = option.palette.color(QPalette::WindowText); @@ -206,12 +236,15 @@ public: bool generateImageProxy() const; /** @brief Returns a list of the expanded folder ids. */ QStringList expandedFolders() const; + /** @brief Deselect all clips in project tree. */ + void clearSelection(); public slots: void setDocument(KdenliveDoc *doc); void updateAllClips(bool displayRatioChanged, bool fpsChanged); - void slotReplyGetImage(const QString &clipId, const QPixmap &pix); - void slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata, bool replace, bool selectClip); + void slotReplyGetImage(const QString &clipId, const QImage &img); + void slotReplyGetImage(const QString &clipId, const QString &name, int width, int height); + void slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const stringMap &properties, const stringMap &metadata, bool replace); void slotAddClip(DocClipBase *clip, bool getProperties); void slotDeleteClip(const QString &clipId); void slotUpdateClip(const QString &id); @@ -261,12 +294,13 @@ private: ItemDelegate *m_listViewDelegate; /** @brief False if we have not yet finished opening the document. */ bool m_refreshed; + /** @brief False if we have not yet finished checking all project tree thumbs. */ + bool m_allClipsProcessed; QToolButton *m_addButton; QToolButton *m_deleteButton; QToolButton *m_editButton; - QMap m_infoQueue; + //QMap m_infoQueue; QMap m_producerQueue; - void requestClipInfo(const QDomElement xml, const QString id); QList m_thumbnailQueue; QAction *m_proxyAction; QStringList m_processingClips; @@ -274,6 +308,11 @@ private: QStringList m_abortProxy; /** @brief Holds a list of proxy urls that are currently being created. */ QStringList m_processingProxy; + QMutex m_mutex; + bool m_abortAllProxies; + QList m_proxyList; + QFutureSynchronizer m_proxyThreads; + InvalidDialog *m_invalidClipDialog; void requestClipThumbnail(const QString id); @@ -296,10 +335,18 @@ private: /** @brief Set the Proxy status on a clip. * @param item The clip item to set status * @param status The proxy status (see definitions.h) */ - void setProxyStatus(const QString proxyPath, PROXYSTATUS status); - void setProxyStatus(ProjectItem *item, PROXYSTATUS status); - + void setProxyStatus(const QString proxyPath, PROXYSTATUS status, int progress = 0); + void setProxyStatus(ProjectItem *item, PROXYSTATUS status, int progress = 0); + /** @brief Process ffmpeg output to find out process progress. */ + void processLogInfo(const QString &path, int *duration, const QString &log); void monitorItemEditing(bool enable); + /** @brief Set thumbnail for a project's clip. */ + void setThumbnail(const QString &clipId, const QPixmap &pix); + /** @brief Get cached thumbnail for a project's clip or create it if no cache. */ + void getCachedThumbnail(ProjectItem *item); + void getCachedThumbnail(SubProjectItem *item); + /** @brief The clip is about to be reloaded, cancel thumbnail requests. */ + void resetThumbsProducer(DocClipBase *clip); private slots: void slotClipSelected(); @@ -318,7 +365,6 @@ private slots: /** @brief This is triggered when a clip description has been modified. */ void slotItemEdited(QTreeWidgetItem *item, int column); void slotUpdateClipProperties(ProjectItem *item, QMap properties); - void slotProcessNextClipInQueue(); void slotProcessNextThumbnail(); void slotCheckForEmptyQueue(); void slotPauseMonitor(); @@ -340,11 +386,10 @@ private slots: /** @brief Stop creation of this clip's proxy. */ void slotAbortProxy(const QString id, const QString path); /** @brief Start creation of proxy clip. */ - void slotGenerateProxy(const QString destPath, const QString sourcePath, int clipType, int exif); + void slotGenerateProxy(); signals: void clipSelected(DocClipBase *, QPoint zone = QPoint()); - void getFileProperties(const QDomElement, const QString &, int pixHeight, bool, bool); void receivedClipDuration(const QString &); void showClipProperties(DocClipBase *); void showClipProperties(QList , QMap commonproperties); @@ -352,7 +397,7 @@ signals: void loadingIsOver(); void displayMessage(const QString, int progress); void clipNameChanged(const QString, const QString); - void clipNeedsReload(const QString&, bool); + void clipNeedsReload(const QString&); /** @brief A property affecting display was changed, so we need to update monitors and thumbnails * @param id: The clip's id string * @param resetThumbs Should we recreate the timeline thumbnails. */ @@ -363,6 +408,8 @@ signals: /** @brief Request a profile change for current document. */ void updateProfile(const QString &); void processNextThumbnail(); + /** @brief Activate the clip monitor. */ + void raiseClipMonitor(); }; #endif