Connect fade in/out duration change to filter configuration

mltframework · Oct 25, 2014 · 7d4efbd · 7d4efbd
1 parent 7728efe
commit 7d4efbd
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 32 deletions.
diff --git a/src/controllers/filtercontroller.cpp b/src/controllers/filtercontroller.cpp
@@ -151,34 +151,6 @@ void FilterController::setCurrentFilter(int attachedIndex)
     delete mltFilter;
 }
 
-void FilterController::setFadeInDuration(int duration)
-{
-/* TODO: implement this
-    if (m_quickObject && ui->listView->currentIndex().isValid()) {
-        Mlt::Filter* filter = m_model.filterForRow(ui->listView->currentIndex().row());
-        if (filter && filter->is_valid()
-            && QString(filter->get("shotcut:filter")).startsWith("fadeIn")) {
-            m_quickObject->setProperty("duration", duration);
-        }
-        delete filter;
-    }
-*/
-}
-
-void FilterController::setFadeOutDuration(int duration)
-{
-/* TODO: implement this
-    if (m_quickObject && ui->listView->currentIndex().isValid()) {
-        Mlt::Filter* filter = m_model.filterForRow(ui->listView->currentIndex().row());
-        if (filter && filter->is_valid()
-            && QString(filter->get("shotcut:filter")).startsWith("fadeOut")) {
-            m_quickObject->setProperty("duration", duration);
-        }
-        delete filter;
-    }
-*/
-}
-
 void FilterController::handleAttachedModelChange()
 {
     MLT.refreshConsumer();

diff --git a/src/controllers/filtercontroller.h b/src/controllers/filtercontroller.h
@@ -46,8 +46,6 @@ public slots:
     void setProducer(Mlt::Producer *producer = 0);
     void attachFilter(int metadataIndex);
     void setCurrentFilter(int attachedIndex);
-    void setFadeInDuration(int duration);
-    void setFadeOutDuration(int duration);
 
 private slots:
     void handleAttachedModelChange();

diff --git a/src/docks/filtersdock.cpp b/src/docks/filtersdock.cpp
@@ -83,3 +83,19 @@ void FiltersDock::setCurrentFilter(QmlFilter* filter, QmlMetadata* meta)
     m_qview.rootContext()->setContextProperty("filter", filter);
     m_qview.rootContext()->setContextProperty("metadata", meta);
 }
+
+void FiltersDock::setFadeInDuration(int duration)
+{
+    QObject* filterUi = m_qview.rootObject()->findChild<QObject*>("fadeIn");
+    if (filterUi) {
+        filterUi->setProperty("duration", duration);
+    }
+}
+
+void FiltersDock::setFadeOutDuration(int duration)
+{
+    QObject* filterUi = m_qview.rootObject()->findChild<QObject*>("fadeOut");
+    if (filterUi) {
+        filterUi->setProperty("duration", duration);
+    }
+}
diff --git a/src/docks/filtersdock.h b/src/docks/filtersdock.h
@@ -42,6 +42,8 @@ class FiltersDock : public QDockWidget
 
 public slots:
     void setCurrentFilter(QmlFilter* filter, QmlMetadata* meta);
+    void setFadeInDuration(int duration);
+    void setFadeOutDuration(int duration);
 
 private:
     QQuickView m_qview;

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -226,8 +226,8 @@ 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_timelineDock, SIGNAL(fadeInChanged(int)), m_filterController, SLOT(setFadeInDuration(int)));
-    connect(m_timelineDock, SIGNAL(fadeOutChanged(int)), m_filterController, SLOT(setFadeOutDuration(int)));
+    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*)));
     connect(m_timelineDock, SIGNAL(clipSelected(Mlt::Producer*)), m_filterController, SLOT(setProducer(Mlt::Producer*)));
 

diff --git a/src/qml/filters/audio_fadein/ui.qml b/src/qml/filters/audio_fadein/ui.qml
@@ -25,6 +25,7 @@ Rectangle {
     width: 400
     height: 200
     color: 'transparent'
+    objectName: 'fadeIn'
     property alias duration: timeSpinner.value
 
     Component.onCompleted: {

diff --git a/src/qml/filters/audio_fadeout/ui.qml b/src/qml/filters/audio_fadeout/ui.qml
@@ -25,6 +25,7 @@ Rectangle {
     width: 400
     height: 200
     color: 'transparent'
+    objectName: 'fadeOut'
     property alias duration: timeSpinner.value
 
     Component.onCompleted: {

diff --git a/src/qml/filters/fadein_brightness/ui.qml b/src/qml/filters/fadein_brightness/ui.qml
@@ -25,6 +25,7 @@ Rectangle {
     width: 400
     height: 200
     color: 'transparent'
+    objectName: 'fadeIn'
     property alias duration: timeSpinner.value
 
     Component.onCompleted: {

diff --git a/src/qml/filters/fadein_movit/ui.qml b/src/qml/filters/fadein_movit/ui.qml
@@ -25,6 +25,7 @@ Rectangle {
     width: 400
     height: 200
     color: 'transparent'
+    objectName: 'fadeIn'
     property alias duration: timeSpinner.value
 
     Component.onCompleted: {

diff --git a/src/qml/filters/fadeout_brightness/ui.qml b/src/qml/filters/fadeout_brightness/ui.qml
@@ -25,6 +25,7 @@ Rectangle {
     width: 400
     height: 200
     color: 'transparent'
+    objectName: 'fadeOut'
     property alias duration: timeSpinner.value
 
     Component.onCompleted: {

diff --git a/src/qml/filters/fadeout_movit/ui.qml b/src/qml/filters/fadeout_movit/ui.qml
@@ -25,6 +25,7 @@ Rectangle {
     width: 400
     height: 200
     color: 'transparent'
+    objectName: 'fadeOut'
     property alias duration: timeSpinner.value
 
     Component.onCompleted: {