Use const'ref, change if(foo) delete foo => delete foo not necessary to check it...

[kdenlive] / src / projectlist.h

diff --git a/src/projectlist.h b/src/projectlist.h
index fe8c03424f8b1ec8c9a71b57d580002a880aab8f..04a55f6c2c7767dbe460fc3f6d4d46b9c889ed6d 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -60,6 +60,7 @@
 #else
 // Dummy KMessageWidget to allow compilation of MyMessageWidget class since Qt's moc doesn work inside #ifdef
 #include <QLabel>
+
 class KMessageWidget: public QLabel
 {
 public:
@@ -86,7 +87,7 @@ signals:
 namespace Mlt
 {
 class Producer;
-};
+}
 
 class ProjectItem;
 class ProjectListView;
@@ -242,8 +243,8 @@ public:
     void setupGeneratorMenu(const QHash<QString,QMenu*>& menus);
     QString currentClipUrl() const;
     KUrl::List getConditionalUrls(const QString &condition) const;
-    /** @brief Get a list of selected clip Id's that match a condition. */
-    QStringList getConditionalIds(const QString &condition) const;
+    /** @brief Get a list of selected clip Id's and url's that match a condition. */
+    QMap <QString, QString> getConditionalIds(const QString &condition) const;
     QDomDocument generateTemplateXml(QString data, const QString &replaceString);
     void cleanup();
     void trashUnusedClips();
@@ -363,6 +364,7 @@ private:
     QList <QString> m_thumbnailQueue;
     QAction *m_proxyAction;
     QMutex m_jobMutex;
+    QMutex m_processMutex;
     bool m_abortAllJobs;
     /** @brief We are cleaning up the project list, so stop processing signals. */
     bool m_closing;
@@ -422,11 +424,14 @@ private:
     /** @brief Get the list of job names for current clip. */
     QStringList getPendingJobs(const QString &id);
     /** @brief Start an MLT process job. */
-    void processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, QMap <QString, QString>extraParams = QMap <QString, QString>());
+    void processClipJob(QStringList ids, const QString&destination, bool autoAdd, QStringList jobParams, const QString &description, stringMap extraParams = stringMap());
     /** @brief Create rounded shape pixmap for project tree thumb. */
-    QPixmap roundedPixmap(QImage img);
-    QPixmap roundedPixmap(QPixmap source);
+    QPixmap roundedPixmap(const QImage &img);
+    QPixmap roundedPixmap(const QPixmap &source);
+    /** @brief Extract a clip's metadata with the exiftool program. */
     void extractMetadata(DocClipBase *clip);
+    /** @brief Add a special FFmpeg tag if clip matches some properties (for example set full_luma for Sony NEX camcorders. */
+    //void checkCamcorderFilters(DocClipBase *clip, QMap <QString, QString> meta);
 
 private slots:
     void slotClipSelected();