[pitivi: 1/5] Fix the use of the gstreamer missing-plugins helper.



commit 4ac43537672092dbfbc18034ad62ff7dbf0218de
Author: Luis de Bethencourt <luis debethencourt com>
Date:   Wed Sep 8 16:11:20 2010 +0200

    Fix the use of the gstreamer missing-plugins helper.

 pitivi/discoverer.py    |    3 ++-
 pitivi/ui/mainwindow.py |    1 -
 pitivi/ui/sourcelist.py |    9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/pitivi/discoverer.py b/pitivi/discoverer.py
index 7ce7c25..2015a88 100644
--- a/pitivi/discoverer.py
+++ b/pitivi/discoverer.py
@@ -234,8 +234,9 @@ class Discoverer(Signallable, Loggable):
         self.emit("discovery-done", self.current_uri, factory)
 
     def _emitResult(self):
+        missing_plugins = bool(self.missing_plugin_details)
         # we got a gst error, error out ASAP
-        if self.error:
+        if not missing_plugins and self.error:
             self._emitError()
             return True
 
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index 2d78702..71f944f 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -707,7 +707,6 @@ class PitiviMainWindow(gtk.Window, Loggable):
     def loop(self, unused_action):
         pass
 
-
     def _projectManagerNewProjectLoadedCb(self, projectManager, project):
         self.log("A NEW project is loaded, update the UI!")
         self.project = project
diff --git a/pitivi/ui/sourcelist.py b/pitivi/ui/sourcelist.py
index a247faa..b68bd8c 100644
--- a/pitivi/ui/sourcelist.py
+++ b/pitivi/ui/sourcelist.py
@@ -378,8 +378,8 @@ class SourceList(gtk.VBox, Loggable):
             project.sources, "source-removed", None, self._sourceRemovedCb)
         self.project_signals.connect(
             project.sources, "discovery-error", None, self._discoveryErrorCb)
-        #self.project_signals.connect(
-        #    project.sources, "missing-plugins", None, self._missingPluginsCb)
+        self.project_signals.connect(
+            project.sources, "missing-plugins", None, self._missingPluginsCb)
         self.project_signals.connect(
             project.sources, "ready", None, self._sourcesStoppedImportingCb)
         self.project_signals.connect(
@@ -547,9 +547,8 @@ class SourceList(gtk.VBox, Loggable):
         """ The given uri isn't a media file """
         self.infostub.addErrors(uri, reason, extra)
 
-    def _missingPluginsCb(self, sourcelist, uri, details, descriptions):
-        #self.infostub.addErrors(uri, "Missing plugins", "\n".join(descriptions))
-        pass
+    def _missingPluginsCb(self, sourcelist, uri, factory, details, descriptions, cb):
+        self.infostub.addErrors(uri, "Missing plugins", "\n".join(descriptions))
 
     def _sourcesStartedImportingCb(self, unused_sourcelist):
         if not self.infostub.showing:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]