Some filters are limited to a single instance per producer.

mltframework · Nov 18, 2014 · 7f6ebaa · 7f6ebaa
1 parent 9d63be6
commit 7f6ebaa
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 7 deletions.
diff --git a/src/controllers/filtercontroller.cpp b/src/controllers/filtercontroller.cpp
@@ -113,14 +113,24 @@ void FilterController::attachFilter(int metadataIndex)
 {
     QmlMetadata* meta = m_metadataModel.get(metadataIndex);
     QmlFilter* filter = NULL;
-    if (meta) {
-        m_currentFilterIndex = m_attachedModel.add(meta);
-        Mlt::Filter* mltFilter = m_attachedModel.getFilter(m_currentFilterIndex);
-        filter = new QmlFilter(mltFilter, meta);
-        filter->setIsNew(true);
-    } else {
-        m_currentFilterIndex = -1;
+
+    if (!meta) return;
+
+    if (meta->allowMultiple() == false) {
+        for (int i = 0; i < m_attachedModel.rowCount(); i++) {
+            const QmlMetadata* attachedMeta = m_attachedModel.getMetadata(i);
+            if (attachedMeta && meta->uniqueId() == attachedMeta->uniqueId()) {
+                emit errorOccurred(tr("Only one %1 filter is allowed.").arg(meta->name()));
+                setCurrentFilter(i);
+                return;
+            }
+        }
     }
+
+    m_currentFilterIndex = m_attachedModel.add(meta);
+    Mlt::Filter* mltFilter = m_attachedModel.getFilter(m_currentFilterIndex);
+    filter = new QmlFilter(mltFilter, meta);
+    filter->setIsNew(true);
     emit currentFilterChanged(filter, meta, m_currentFilterIndex);
     m_currentFilter.reset(filter);
 }

diff --git a/src/controllers/filtercontroller.h b/src/controllers/filtercontroller.h
@@ -41,6 +41,7 @@ class FilterController : public QObject
 signals:
     void currentFilterChanged(QmlFilter* filter, QmlMetadata* meta, int index);
     void newMetadataFound(QmlMetadata* meta);
+    void errorOccurred(QString);
 
 public slots:
     void setProducer(Mlt::Producer *producer = 0);

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -226,6 +226,7 @@ MainWindow::MainWindow()
     connect(this, SIGNAL(producerOpened()), m_filterController, SLOT(setProducer()));
     connect(m_filterController->attachedModel(), SIGNAL(changed(bool)), SLOT(setWindowModified(bool)));
     connect(m_filterController->attachedModel(), SIGNAL(changed()), SLOT(updateAutoSave()));
+    connect(m_filterController, SIGNAL(errorOccurred(QString)), this, SLOT(showStatusMessage(QString)));
     connect(m_timelineDock, SIGNAL(fadeInChanged(int)), m_filtersDock, SLOT(setFadeInDuration(int)));
     connect(m_timelineDock, SIGNAL(fadeOutChanged(int)), m_filtersDock, SLOT(setFadeOutDuration(int)));
     connect(m_timelineDock, SIGNAL(trackSelected(Mlt::Producer*)), m_filterController, SLOT(setProducer(Mlt::Producer*)));

diff --git a/src/models/attachedfiltersmodel.cpp b/src/models/attachedfiltersmodel.cpp
@@ -65,6 +65,14 @@ Mlt::Filter* AttachedFiltersModel::getFilter(int row) const
     return result;
 }
 
+const QmlMetadata* AttachedFiltersModel::getMetadata(int row) const
+{
+    if (row < m_metaList.count()) {
+        return m_metaList[row];
+    }
+    return NULL;
+}
+
 int AttachedFiltersModel::rowCount(const QModelIndex &parent) const
 {
     if (m_producer && m_producer->is_valid())

diff --git a/src/models/attachedfiltersmodel.h b/src/models/attachedfiltersmodel.h
@@ -38,6 +38,7 @@ class AttachedFiltersModel : public QAbstractListModel
 
     bool isReady();
     Mlt::Filter* getFilter(int row) const;
+    const QmlMetadata* getMetadata(int row) const;
 
     // QAbstractListModel Implementation
     int rowCount(const QModelIndex &parent = QModelIndex()) const;

diff --git a/src/qml/filters/audio_fadein/meta.qml b/src/qml/filters/audio_fadein/meta.qml
@@ -9,4 +9,5 @@ Metadata {
     mlt_service: "volume"
     qml: "ui.qml"
     isFavorite: true
+    allowMultiple: false
 }
diff --git a/src/qml/filters/audio_fadeout/meta.qml b/src/qml/filters/audio_fadeout/meta.qml
@@ -9,4 +9,5 @@ Metadata {
     mlt_service: "volume"
     qml: "ui.qml"
     isFavorite: true
+    allowMultiple: false
 }
diff --git a/src/qml/filters/crop/meta.qml b/src/qml/filters/crop/meta.qml
@@ -7,4 +7,5 @@ Metadata {
     mlt_service: "crop"
     qml: "ui.qml"
     gpuAlt: "crop"
+    allowMultiple: false
 }
diff --git a/src/qml/filters/crop/meta_movit.qml b/src/qml/filters/crop/meta_movit.qml
@@ -7,4 +7,5 @@ Metadata {
     mlt_service: "crop"
     needsGPU: true
     qml: "ui.qml"
+    allowMultiple: false
 }
diff --git a/src/qml/filters/fadein_brightness/meta.qml b/src/qml/filters/fadein_brightness/meta.qml
@@ -9,4 +9,5 @@ Metadata {
     qml: "ui.qml"
     isFavorite: true
     gpuAlt: "movit.opacity"
+    allowMultiple: false
 }
diff --git a/src/qml/filters/fadein_movit/meta.qml b/src/qml/filters/fadein_movit/meta.qml
@@ -9,4 +9,5 @@ Metadata {
     needsGPU: true
     qml: "ui.qml"
     isFavorite: true
+    allowMultiple: false
 }
diff --git a/src/qml/filters/fadeout_brightness/meta.qml b/src/qml/filters/fadeout_brightness/meta.qml
@@ -9,4 +9,5 @@ Metadata {
     qml: "ui.qml"
     isFavorite: true
     gpuAlt: "movit.opacity"
+    allowMultiple: false
 }
diff --git a/src/qml/filters/fadeout_movit/meta.qml b/src/qml/filters/fadeout_movit/meta.qml
@@ -9,4 +9,5 @@ Metadata {
     needsGPU: true
     qml: "ui.qml"
     isFavorite: true
+    allowMultiple: false
 }
diff --git a/src/qml/filters/size_position/meta_affine.qml b/src/qml/filters/size_position/meta_affine.qml
@@ -9,4 +9,5 @@ Metadata {
     qml: 'ui_affine.qml'
     vui: 'vui_affine.qml'
     gpuAlt: 'movit.rect'
+    allowMultiple: false
 }
diff --git a/src/qml/filters/size_position/meta_movit.qml b/src/qml/filters/size_position/meta_movit.qml
@@ -9,4 +9,5 @@ Metadata {
     needsGPU: true
     qml: 'ui_movit.qml'
     vui: 'vui_movit.qml'
+    allowMultiple: false
 }
diff --git a/src/qmltypes/qmlmetadata.cpp b/src/qmltypes/qmlmetadata.cpp
@@ -29,6 +29,7 @@ QmlMetadata::QmlMetadata(QObject *parent)
     , m_isHidden(false)
     , m_isFavorite(false)
     , m_gpuAlt("")
+    , m_allowMultiple(true)
 {
 }
 
@@ -137,3 +138,8 @@ void QmlMetadata::setGpuAlt(const QString& gpuAlt)
     m_gpuAlt = gpuAlt;
     emit changed();
 }
+
+void QmlMetadata::setAllowMultiple(bool allowMultiple)
+{
+    m_allowMultiple = allowMultiple;
+}
diff --git a/src/qmltypes/qmlmetadata.h b/src/qmltypes/qmlmetadata.h
@@ -40,6 +40,7 @@ class QmlMetadata : public QObject
     Q_PROPERTY(bool isHidden READ isHidden WRITE setIsHidden NOTIFY changed)
     Q_PROPERTY(bool isFavorite READ isFavorite WRITE setIsFavorite NOTIFY changed)
     Q_PROPERTY(QString gpuAlt READ gpuAlt WRITE setGpuAlt NOTIFY changed)
+    Q_PROPERTY(bool allowMultiple READ allowMultiple WRITE setAllowMultiple)
 
 public:
     enum PluginType {
@@ -76,6 +77,8 @@ class QmlMetadata : public QObject
     void setIsFavorite(bool isFavorite);
     QString gpuAlt() const { return m_gpuAlt; }
     void setGpuAlt(const QString&);
+    bool allowMultiple() const { return m_allowMultiple; }
+    void setAllowMultiple(bool allowMultiple);
 
 signals:
     void changed();
@@ -92,6 +95,7 @@ class QmlMetadata : public QObject
     bool m_isHidden;
     bool m_isFavorite;
     QString m_gpuAlt;
+    bool m_allowMultiple;
 };
 
 #endif // QMLMETADATA_H