[pitivi: 10/11] Discoverer: pass the discovered uri in discovery-done.



commit a94ae5a147d568a20413e52ca5de401d49547d66
Author: Alessandro Decina <alessandro d gmail com>
Date:   Wed May 6 17:56:29 2009 +0200

    Discoverer: pass the discovered uri in discovery-done.
---
 pitivi/discoverer.py     |    4 ++--
 pitivi/sourcelist.py     |    2 +-
 tests/test_discoverer.py |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pitivi/discoverer.py b/pitivi/discoverer.py
index d964f46..b712502 100644
--- a/pitivi/discoverer.py
+++ b/pitivi/discoverer.py
@@ -64,7 +64,7 @@ class Discoverer(Signallable, Loggable):
 
     __signals__ = {
         "discovery-error" : ["a", "b", "c" ],
-        "discovery-done" : ["factory"],
+        "discovery-done" : ["uri", "factory"],
         "ready" : None,
         "starting" : None,
         "missing-plugins": ["uri", "detail", "description"]
@@ -212,7 +212,7 @@ class Discoverer(Signallable, Loggable):
                 for stream in self.current_streams:
                     factory.addOutputStream(stream)
 
-            self.emit('discovery-done', factory)
+            self.emit('discovery-done', self.current_uri, factory)
 
         self.info("Cleaning up after finished analyzing %s", self.current_uri)
         self._resetState()
diff --git a/pitivi/sourcelist.py b/pitivi/sourcelist.py
index 78ad1be..a2125f6 100644
--- a/pitivi/sourcelist.py
+++ b/pitivi/sourcelist.py
@@ -166,7 +166,7 @@ class SourceList(Signallable, Loggable):
             res.append(self[i])
         return res
 
-    def _discoveryDoneCb(self, unused_discoverer, factory):
+    def _discoveryDoneCb(self, unused_discoverer, uri, factory):
         # callback from finishing analyzing factory
         if factory.name in self.tempsources:
             self.tempsources[factory.name] = factory
diff --git a/tests/test_discoverer.py b/tests/test_discoverer.py
index 6f7e698..4451c47 100644
--- a/tests/test_discoverer.py
+++ b/tests/test_discoverer.py
@@ -364,7 +364,7 @@ class TestStateChange(TestCase):
         self.error = error
         self.error_detail = debug
 
-    def discoveryDoneCb(self, disc, factory):
+    def discoveryDoneCb(self, disc, uri, factory):
         self.failUnlessEqual(factory.duration, 10 * gst.SECOND)
         self.factories.append(factory)
 



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