Update image properties panel when out point changes.

mltframework · Jan 15, 2015 · 70b6550 · 70b6550
1 parent 885a6e3
commit 70b6550
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1708,8 +1708,11 @@ QWidget *MainWindow::loadProducerWidget(Mlt::Producer* producer)
         w = new X11grabWidget(this);
     else if (service.startsWith("avformat"))
         w = new AvformatProducerWidget(this);
-    else if (service == "pixbuf" || service == "qimage")
-        w = new ImageProducerWidget(this);
+    else if (service == "pixbuf" || service == "qimage") {
+        ImageProducerWidget* ipw = new ImageProducerWidget(this);
+        connect(m_player, SIGNAL(outChanged(int)), ipw, SLOT(setOutPoint(int)));
+        w = ipw;
+    }
     else if (service == "decklink" || resource.contains("decklink"))
         w = new DecklinkProducerWidget(this);
     else if (service == "color")

diff --git a/src/player.cpp b/src/player.cpp
@@ -228,17 +228,9 @@ Player::Player(QWidget *parent)
 void Player::connectTransport(const TransportControllable* receiver)
 {
     if (receiver == m_currentTransport) return;
+    if (m_currentTransport)
+        disconnect(m_currentTransport);
     m_currentTransport = receiver;
-    disconnect(SIGNAL(played(double)));
-    disconnect(SIGNAL(paused()));
-    disconnect(SIGNAL(stopped()));
-    disconnect(SIGNAL(seeked(int)));
-    disconnect(SIGNAL(rewound()));
-    disconnect(SIGNAL(fastForwarded()));
-    disconnect(SIGNAL(previousSought(int)));
-    disconnect(SIGNAL(nextSought(int)));
-    disconnect(SIGNAL(inChanged(int)));
-    disconnect(SIGNAL(outChanged(int)));
     connect(this, SIGNAL(played(double)), receiver, SLOT(play(double)));
     connect(this, SIGNAL(paused()), receiver, SLOT(pause()));
     connect(this, SIGNAL(stopped()), receiver, SLOT(stop()));

diff --git a/src/widgets/imageproducerwidget.cpp b/src/widgets/imageproducerwidget.cpp
@@ -81,6 +81,11 @@ void ImageProducerWidget::setProducer(Mlt::Producer* p)
     ui->repeatSpinBox->setEnabled(m_producer->get_int("shotcut_sequence"));
 }
 
+void ImageProducerWidget::setOutPoint(int duration)
+{
+    ui->durationSpinBox->setValue(duration + 1);
+}
+
 void ImageProducerWidget::reopen(Mlt::Producer* p)
 {
     int out = ui->durationSpinBox->value() - 1;

diff --git a/src/widgets/imageproducerwidget.h b/src/widgets/imageproducerwidget.h
@@ -43,6 +43,9 @@ class ImageProducerWidget : public QWidget, public AbstractProducerWidget
     void producerChanged();
     void producerReopened();
 
+public slots:
+    void setOutPoint(int duration);
+
 private slots:
     void on_resetButton_clicked();