Refactor to Mlt::Controller::isImageProducer().

mltframework · Jan 27, 2015 · 6c49a67 · 6c49a67
1 parent 23b2429
commit 6c49a67
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/src/docks/playlistdock.cpp b/src/docks/playlistdock.cpp
@@ -274,8 +274,7 @@ void PlaylistDock::on_actionOpen_triggered()
     if (i) {
         QString xml = MLT.XML(i->producer);
         Mlt::Producer* p = new Mlt::Producer(MLT.profile(), "xml-string", xml.toUtf8().constData());
-        QString service = p->get("mlt_service");
-        if (service == "pixbuf" || service == "qimage")
+        if (MLT.isImageProducer(p))
             p->set_in_and_out(i->frame_in, i->frame_out);
         emit clipOpened(p, i->frame_in, i->frame_out);
         delete i;
@@ -314,8 +313,7 @@ void PlaylistDock::on_tableView_doubleClicked(const QModelIndex &index)
         } else {
             QString xml = MLT.XML(i->producer);
             Mlt::Producer* p = new Mlt::Producer(MLT.profile(), "xml-string", xml.toUtf8().constData());
-            QString service = p->get("mlt_service");
-            if (service == "pixbuf" || service == "qimage")
+            if (MLT.isImageProducer(p))
                 p->set_in_and_out(i->frame_in, i->frame_out);
             emit clipOpened(p, i->frame_in, i->frame_out);
         }

diff --git a/src/docks/timelinedock.cpp b/src/docks/timelinedock.cpp
@@ -263,8 +263,7 @@ void TimelineDock::openClip(int trackIndex, int clipIndex)
     if (info) {
         QString xml = MLT.XML(info->producer);
         Mlt::Producer* p = new Mlt::Producer(MLT.profile(), "xml-string", xml.toUtf8().constData());
-        QString service = p->get("mlt_service");
-        if (service == "pixbuf" || service == "qimage")
+        if (MLT.isImageProducer(p))
             p->set_in_and_out(info->frame_in, info->frame_out);
         emit clipOpened(p, info->frame_in, info->frame_out);
     }

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1728,7 +1728,7 @@ 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") {
+    else if (MLT.isImageProducer(producer)) {
         ImageProducerWidget* ipw = new ImageProducerWidget(this);
         connect(m_player, SIGNAL(outChanged(int)), ipw, SLOT(setOutPoint(int)));
         w = ipw;
@@ -1960,8 +1960,7 @@ class AppendTask : public QRunnable
         foreach (QString filename, filenames) {
             Mlt::Producer p(MLT.profile(), filename.toUtf8().constData());
             if (p.is_valid()) {
-                QString service(p.get("mlt_service"));
-                if (service == "pixbuf" || service == "qimage") {
+                if (MLT.isImageProducer(&p)) {
                     p.set("ttl", 1);
                     p.set("length", qRound(MLT.profile().fps() * 600));
                     p.set("out", qRound(MLT.profile().fps() * Settings.imageDuration()) - 1);

diff --git a/src/mltcontroller.cpp b/src/mltcontroller.cpp
@@ -177,8 +177,7 @@ int Controller::open(const QString &url)
                (m_producer->get_int("_original_type") == tractor_type && m_producer->get("shotcut")))
                 m_url = url;
         }
-        const char *service = m_producer->get("mlt_service");
-        if (service && (!strcmp(service, "pixbuf") || !strcmp(service, "qimage"))) {
+        if (MLT.isImageProducer()) {
             m_producer->set("length", qRound(profile().fps() * 600));
             m_producer->set("out", qRound(profile().fps() * Settings.imageDuration()) - 1);
         }
@@ -525,7 +524,15 @@ bool Controller::isMultitrack() const
     return m_producer && m_producer->is_valid()
         && !m_producer->get_int(kShotcutVirtualClip)
         && (m_producer->get_int("_original_type") == tractor_type || resource() == "<tractor>")
-        && (m_producer->get("shotcut"));
+            && (m_producer->get("shotcut"));
+}
+
+bool Controller::isImageProducer(Service* service) const
+{
+    if (!service)
+        service = (Service*) m_producer;
+    QString serviceName = service->get("mlt_service");
+    return (serviceName == "pixbuf" || serviceName == "qimage");
 }
 
 void Controller::rewind()

diff --git a/src/mltcontroller.h b/src/mltcontroller.h
@@ -115,6 +115,7 @@ class Controller
     bool isSeekableClip();
     bool isPlaylist() const;
     bool isMultitrack() const;
+    bool isImageProducer(Service* service = 0) const;
     void rewind();
     void fastForward();
     void previous(int currentPosition);