[pitivi: 8/14] Fix a bug adding clips to the timeline introduced by 4215225a2f334c69bafeb846d26db2c97fbd7eb9.
- From: Edward Hervey <edwardrv src gnome org>
- To: svn-commits-list gnome org
- Subject: [pitivi: 8/14] Fix a bug adding clips to the timeline introduced by 4215225a2f334c69bafeb846d26db2c97fbd7eb9.
- Date: Wed, 24 Jun 2009 13:10:55 +0000 (UTC)
commit 328f503a5a87f602d6effb85f011b90563160958
Author: Alessandro Decina <alessandro d gmail com>
Date: Fri Jun 19 19:57:10 2009 +0200
Fix a bug adding clips to the timeline introduced by 4215225a2f334c69bafeb846d26db2c97fbd7eb9.
pitivi/sourcelist.py | 8 ++++----
pitivi/ui/sourcelist.py | 4 ++--
pitivi/ui/timeline.py | 1 +
3 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/pitivi/sourcelist.py b/pitivi/sourcelist.py
index a2125f6..58918b8 100644
--- a/pitivi/sourcelist.py
+++ b/pitivi/sourcelist.py
@@ -168,11 +168,11 @@ class SourceList(Signallable, Loggable):
def _discoveryDoneCb(self, unused_discoverer, uri, factory):
# callback from finishing analyzing factory
- if factory.name in self.tempsources:
- self.tempsources[factory.name] = factory
+ if uri in self.tempsources:
+ self.tempsources[uri] = factory
self.emit("tmp_is_ready", factory)
- elif factory.name in self.sources:
- self.addFactory(factory.name, factory)
+ elif uri in self.sources:
+ self.addFactory(uri, factory)
def _discoveryErrorCb(self, unused_discoverer, uri, reason, extra):
if self.missing_plugins.pop(uri, None) is None:
diff --git a/pitivi/ui/sourcelist.py b/pitivi/ui/sourcelist.py
index 13df07f..8621db5 100644
--- a/pitivi/ui/sourcelist.py
+++ b/pitivi/ui/sourcelist.py
@@ -466,7 +466,7 @@ class SourceList(gtk.VBox, Loggable):
self.storemodel.append([thumbnail,
beautify_factory(factory),
factory,
- factory.name,
+ factory.uri,
duration])
self._displayTreeView()
@@ -571,7 +571,7 @@ class SourceList(gtk.VBox, Loggable):
return
path = paths[0]
factory = model[path][COL_FACTORY]
- self.debug("Let's play %s", factory.name)
+ self.debug("Let's play %s", factory.uri)
self.emit('play', factory)
_dragStarted = False
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index 48ed73f..a3e1c2e 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -24,6 +24,7 @@ Timeline widgets for the complex view
"""
import gtk
+import urllib
from pitivi.log.loggable import Loggable
import ruler
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]