X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.h;h=63c8f7450f4321e1b3a2884c5e8bc8e948b48687;hb=290ad96d0c2765f5b1955165a47e07c3e328cae3;hp=3028e7ab6e537683f6c90536692835773bafba1a;hpb=4903f29ea890a7029a17cbc22ee1ad0fc1dea05e;p=kdenlive

diff --git a/src/projectlist.h b/src/projectlist.h
index 3028e7ab..63c8f745 100644
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -84,13 +84,6 @@ public:
             }
             const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1;
             QPixmap pixmap = qVariantValue<QPixmap>(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);
             int decoWidth = pixmap.width() + 2 * textMargin;
 
@@ -123,9 +116,17 @@ public:
                     color = option.palette.color(QPalette::WindowText);
                 }
                 else {
-                    if (proxy == CREATINGPROXY) proxyText = i18n("Generating proxy ...");
-                    else if (proxy == PROXYWAITING) proxyText = i18n("Waiting proxy ...");
-                    else if (proxy == PROXYCRASHED) proxyText = i18n("Proxy crashed");
+                    switch (proxy)  {
+                        case CREATINGPROXY:
+                            proxyText = i18n("Generating proxy ...");
+                            break;
+                        case PROXYWAITING:
+                            proxyText = i18n("Waiting proxy ...");
+                            break;
+                        case PROXYCRASHED:
+                        default:
+                            proxyText = i18n("Proxy crashed");
+                    }
                     brush = option.palette.highlight();
                     color = option.palette.color(QPalette::HighlightedText);
                 }
@@ -175,7 +176,6 @@ public:
     void setupGeneratorMenu(QMenu *addMenu, QMenu *transcodeMenu, QMenu *inTimelineMenu);
     QString currentClipUrl() const;
     KUrl::List getConditionalUrls(const QString &condition) const;
-    void reloadClipThumbnails();
     QDomDocument generateTemplateXml(QString data, const QString &replaceString);
     void cleanup();
     void trashUnusedClips();
@@ -209,7 +209,7 @@ public:
 
 public slots:
     void setDocument(KdenliveDoc *doc);
-    void updateAllClips();
+    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 slotAddClip(DocClipBase *clip, bool getProperties);
@@ -218,7 +218,7 @@ public slots:
     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);
+    void slotRemoveInvalidProxy(const QString &id, bool durationError);
     void slotSelectClip(const QString &ix);
 
     /** @brief Prepares removing the selected items. */
@@ -240,6 +240,8 @@ 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;
@@ -257,21 +259,21 @@ private:
     QMenu *m_transcodeAction;
     KdenliveDoc *m_doc;
     ItemDelegate *m_listViewDelegate;
-    /** @brief True if we have not yet finished opening the document. */
+    /** @brief False if we have not yet finished opening the document. */
     bool m_refreshed;
     QToolButton *m_addButton;
     QToolButton *m_deleteButton;
     QToolButton *m_editButton;
     QMap <QString, QDomElement> m_infoQueue;
     QMap <QString, QDomElement> m_producerQueue;
-    void requestClipInfo(const QDomElement xml, const QString id);
     QList <QString> m_thumbnailQueue;
     QAction *m_proxyAction;
     QStringList m_processingClips;
-    /** @brief Holds a list of ids for the clips that need to be proxied. */
-    QStringList m_proxyList;
-    /** @brief Holds a list of proxy clip that should be aborted. */
-    QStringList m_abortProxyId;
+    /** @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;
     
     void requestClipThumbnail(const QString id);
 
@@ -294,7 +296,7 @@ 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 id, PROXYSTATUS status);
+    void setProxyStatus(const QString proxyPath, PROXYSTATUS status);
     void setProxyStatus(ProjectItem *item, PROXYSTATUS status);
 
     void monitorItemEditing(bool enable);
@@ -329,15 +331,16 @@ 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);
+    void slotGotProxy(const QString &proxyPath);
+    void slotGotProxy(ProjectItem *item);
     /** @brief Enable / disable proxy for current clip. */
     void slotProxyCurrentItem(bool doProxy);
     /** @brief Put clip in the proxy waiting list. */
-    void slotCreateProxy(const QString id, bool createProducer = true);
+    void slotCreateProxy(const QString id);
     /** @brief Stop creation of this clip's proxy. */
-    void slotAbortProxy(const QString id);
+    void slotAbortProxy(const QString id, const QString path);
     /** @brief Start creation of proxy clip. */
-    void slotGenerateProxy(const QString id);
+    void slotGenerateProxy(const QString destPath, const QString sourcePath, int clipType, int exif);
 
 signals:
     void clipSelected(DocClipBase *, QPoint zone = QPoint());