X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.h;h=8236cfdd99a1e479adeabe0301146a99e6dfdf3e;hb=16e28d660e6c5754dbc5eb8a04d607285e749cd8;hp=c21c42fafb2392e8fa727827708683b0d9b7fe04;hpb=59fc347313511ad63560b7c1a32b5c34c9b940f8;p=kdenlive diff --git a/src/projectlist.h b/src/projectlist.h index c21c42fa..8236cfdd 100644 --- a/src/projectlist.h +++ b/src/projectlist.h @@ -22,6 +22,7 @@ #define PROJECTLIST_H #include +#include #include #include #include @@ -30,6 +31,9 @@ #include #include #include +#include +#include +#include #include #include @@ -45,12 +49,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; @@ -61,12 +73,25 @@ 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: ItemDelegate(QAbstractItemView* parent = 0): QStyledItemDelegate(parent) { } - + /*void drawFocus(QPainter *, const QStyleOptionViewItem &, const QRect &) const { }*/ @@ -83,14 +108,8 @@ public: } const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1; QPixmap pixmap = qVariantValue(index.data(Qt::DecorationRole)); - if ((index.flags() & (Qt::ItemIsDragEnabled)) == false) { - KIcon icon("dialog-close"); - QPainter p(&pixmap); - p.drawPixmap(1, 1, icon.pixmap(16, 16)); - p.end(); - } - - painter->drawPixmap(r1.left() + textMargin, r1.top() + (r1.height() - pixmap.height()) / 2, pixmap); + QPoint pixmapPoint(r1.left() + textMargin, r1.top() + (r1.height() - pixmap.height()) / 2); + painter->drawPixmap(pixmapPoint, pixmap); int decoWidth = pixmap.width() + 2 * textMargin; QFont font = painter->font(); @@ -100,7 +119,7 @@ public: r1.adjust(decoWidth, 0, 0, -mid); QRect r2 = option.rect; r2.adjust(decoWidth, mid, 0, 0); - painter->drawText(r1, Qt::AlignLeft | Qt::AlignBottom , index.data().toString()); + painter->drawText(r1, Qt::AlignLeft | Qt::AlignBottom, index.data().toString()); font.setBold(false); painter->setFont(font); QString subText = index.data(DurationRole).toString(); @@ -111,27 +130,41 @@ public: painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText, &bounding); int proxy = index.data(Qt::UserRole + 5).toInt(); - if (proxy > 0) { - QRectF txtBounding; + if (proxy != 0 && proxy != PROXYDONE) { QString proxyText; - QBrush brush; QColor color; - if (proxy == 1) { - proxyText = i18n("Generating proxy..."); - brush = option.palette.highlight(); - color = option.palette.color(QPalette::HighlightedText); + if (proxy > 0) { + // Draw proxy progress bar + color = option.palette.alternateBase().color(); + painter->setPen(Qt::NoPen); + color.setAlpha(180); + painter->setBrush(QBrush(color)); + QRect progress(pixmapPoint.x() + 1, pixmapPoint.y() + pixmap.height() - 5, pixmap.width() - 2, 4); + painter->drawRect(progress); + painter->setBrush(option.palette.text()); + progress.adjust(1, 1, 0, -1); + progress.setWidth((pixmap.width() - 4) * proxy / 100); + painter->drawRect(progress); } else { - proxyText = i18n("Proxy"); - brush = option.palette.mid(); - color = option.palette.color(QPalette::WindowText); + switch (proxy) { + case CREATINGPROXY: + proxyText = i18n("Generating proxy ..."); + break; + case PROXYWAITING: + proxyText = i18n("Waiting proxy ..."); + break; + case PROXYCRASHED: + default: + proxyText = i18n("Proxy crashed"); + } + QRectF txtBounding = painter->boundingRect(r2, Qt::AlignRight | Qt::AlignVCenter, " " + proxyText + " "); + painter->setPen(Qt::NoPen); + painter->setBrush(option.palette.highlight()); + painter->drawRoundedRect(txtBounding, 2, 2); + painter->setPen(option.palette.highlightedText().color()); + painter->drawText(txtBounding, Qt::AlignHCenter | Qt::AlignVCenter , proxyText); } - txtBounding = painter->boundingRect(r2, Qt::AlignRight | Qt::AlignVCenter, " " + proxyText + " "); - painter->setPen(Qt::NoPen); - painter->setBrush(brush); - painter->drawRoundedRect(txtBounding, 2, 2); - painter->setPen(option.palette.highlightedText().color()); - painter->drawText(txtBounding, Qt::AlignHCenter | Qt::AlignVCenter , proxyText); } painter->restore(); @@ -168,10 +201,9 @@ public: void setHeaderInfo(const QByteArray &state); void updateProjectFormat(Timecode t); void setupMenu(QMenu *addMenu, QAction *defaultAction); - void setupGeneratorMenu(QMenu *addMenu, QMenu *transcodeMenu, QMenu *inTimelineMenu); + void setupGeneratorMenu(const QHash& menus); QString currentClipUrl() const; KUrl::List getConditionalUrls(const QString &condition) const; - void reloadClipThumbnails(); QDomDocument generateTemplateXml(QString data, const QString &replaceString); void cleanup(); void trashUnusedClips(); @@ -191,18 +223,35 @@ public: QMap getProxies(); /** @brief Enable / disable proxies. */ void updateProxyConfig(); + /** @brief Get a property from the document. */ + QString getDocumentProperty(const QString &key) const; + + /** @brief Does this project allow proxies. */ + bool useProxy() const; + /** @brief Should we automatically create proxy clips for newly added clips. */ + bool generateProxy() const; + /** @brief Should we automatically create proxy clips for newly added clips. */ + bool generateImageProxy() const; + /** @brief Returns a list of the expanded folder ids. */ + QStringList expandedFolders() const; + /** @brief Deselect all clips in project tree. */ + void clearSelection(); + /** @brief Print required overlays over clip thumb (proxy, stabilized,...). */ + void processThumbOverlays(ProjectItem *item, QPixmap &pix); public slots: void setDocument(KdenliveDoc *doc); - void updateAllClips(); - 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); + void updateAllClips(bool displayRatioChanged, bool fpsChanged, QStringList brokenClips); + 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); void slotRefreshClipThumbnail(const QString &clipId, bool update = true); void slotRefreshClipThumbnail(QTreeWidgetItem *item, bool update = true); void slotRemoveInvalidClip(const QString &id, bool replace); + void slotRemoveInvalidProxy(const QString &id, bool durationError); void slotSelectClip(const QString &ix); /** @brief Prepares removing the selected items. */ @@ -224,14 +273,16 @@ public slots: void slotUpdateClipCut(QPoint p); void slotAddClipCut(const QString &id, int in, int out); void slotForceProcessing(const QString &id); + /** @brief Remove all instances of a proxy and delete the file. */ + void slotDeleteProxy(const QString proxyPath); private: ProjectListView *m_listView; Render *m_render; Timecode m_timecode; double m_fps; - QTimer m_queueTimer; QMenu *m_menu; + QFuture m_queueRunner; QUndoStack *m_commandStack; ProjectItem *getItemById(const QString &id); QTreeWidgetItem *getAnyItemById(const QString &id); @@ -239,17 +290,31 @@ private: QAction *m_openAction; QAction *m_reloadAction; QMenu *m_transcodeAction; + QMenu *m_stabilizeAction; KdenliveDoc *m_doc; 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; + /** @brief Holds a list of proxy urls that should be aborted. */ + 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); /** @brief Creates an EditFolderCommand to change the name of an folder item. */ @@ -262,12 +327,27 @@ private: /** @brief Enables and disables transcode actions based on the selected clip's type. */ void adjustTranscodeActions(ProjectItem *clip) const; + /** @brief Enables and disables stabilize actions based on the selected clip's type. */ + void adjustStabilizeActions(ProjectItem *clip) const; /** @brief Enables and disables proxy action based on the selected clip. */ void adjustProxyActions(ProjectItem *clip) const; /** @brief Sets the buttons enabled/disabled according to selected item. */ void updateButtons() const; + /** @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(ProjectItem *item, PROXYSTATUS status, int progress = 0); + /** @brief Process ffmpeg output to find out process progress. */ + void processLogInfo(QList items, int *duration, const QString &log); + void monitorItemEditing(bool enable); + /** @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(); void slotAddSlideshowClip(); @@ -285,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(); @@ -298,13 +377,19 @@ private slots: /** @brief Add a sequence from the stopmotion widget. */ void slotAddOrUpdateSequence(const QString frameName); /** @brief A proxy clip was created, update display. */ - void slotGotProxy(const QString id, bool success); + void slotGotProxy(const QString &proxyPath); + void slotGotProxy(ProjectItem *item); /** @brief Enable / disable proxy for current clip. */ - void slotProxyCurrentItem(bool doProxy); + void slotProxyCurrentItem(bool doProxy, ProjectItem *itemToProxy = NULL); + /** @brief Put clip in the proxy waiting list. */ + void slotCreateProxy(const QString id); + /** @brief Stop creation of this clip's proxy. */ + void slotAbortProxy(const QString id, const QString path); + /** @brief Start creation of proxy clip. */ + void slotGenerateProxy(); signals: - void clipSelected(DocClipBase *, QPoint zone = QPoint()); - void getFileProperties(const QDomElement, const QString &, int pixHeight, bool); + void clipSelected(DocClipBase *, QPoint zone = QPoint(), bool forceUpdate = false); void receivedClipDuration(const QString &); void showClipProperties(DocClipBase *); void showClipProperties(QList , QMap commonproperties); @@ -312,15 +397,19 @@ 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 */ - void refreshClip(const QString &id); + * @param id: The clip's id string + * @param resetThumbs Should we recreate the timeline thumbnails. */ + void refreshClip(const QString &id, bool resetThumbs); void updateRenderStatus(); void deleteProjectClips(QStringList ids, QMap folderids); void findInTimeline(const QString &clipId); /** @brief Request a profile change for current document. */ void updateProfile(const QString &); + void processNextThumbnail(); + /** @brief Activate the clip monitor. */ + void raiseClipMonitor(); }; #endif