[pitivi] pitivi: Properly import the utils we need

[Jean-FranÃois Fortin Tam <jfft src gnome org>]

commit 2488645ecfd5ce54229e7b7928a6dd9aaa5f7d13
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Mon Jul 2 16:10:38 2012 -0400

    pitivi: Properly import the utils we need

 pitivi/mainwindow.py          |    5 +++--
 pitivi/mediafilespreviewer.py |    5 +++--
 pitivi/medialibrary.py        |    8 ++++----
 pitivi/render.py              |    8 +++++---
 pitivi/utils/ui.py            |   13 +++++++------
 5 files changed, 22 insertions(+), 17 deletions(-)
---
diff --git a/pitivi/mainwindow.py b/pitivi/mainwindow.py
index f3dd610..1651cc0 100644
--- a/pitivi/mainwindow.py
+++ b/pitivi/mainwindow.py
@@ -35,6 +35,7 @@ from urllib import unquote
 from gettext import gettext as _
 from gtk import RecentManager
 from hashlib import md5
+from gst.pbutils import InstallPluginsContext, install_plugins_async
 
 from pitivi.utils.loggable import Loggable
 from pitivi.utils.misc import in_devel
@@ -517,10 +518,10 @@ class PitiviMainWindow(gtk.Window, Loggable):
 ## Missing Plugin Support
 
     def _installPlugins(self, details, missingPluginsCallback):
-        context = gst.pbutils.InstallPluginsContext()
+        context = InstallPluginsContext()
         context.set_xid(self.window.xid)
 
-        res = gst.pbutils.install_plugins_async(details, context,
+        res = install_plugins_async(details, context,
                 missingPluginsCallback)
         return res
 
diff --git a/pitivi/mediafilespreviewer.py b/pitivi/mediafilespreviewer.py
index c81d33a..f98ef56 100644
--- a/pitivi/mediafilespreviewer.py
+++ b/pitivi/mediafilespreviewer.py
@@ -6,6 +6,7 @@ import pango
 import os
 
 from gettext import gettext as _
+from gst.pbutils import Discoverer
 
 from pitivi.configure import get_pixmap_dir
 from pitivi.settings import GlobalSettings
@@ -50,7 +51,7 @@ class PreviewWidget(gtk.VBox, Loggable):
         self.preview_cache = {}
         self.preview_cache_errors = {}
 
-        self.discoverer = gst.pbutils.Discoverer(gst.SECOND)
+        self.discoverer = Discoverer.new(gst.SECOND)
 
         #playbin for play pics
         self._unsurePlaybin()
@@ -151,7 +152,7 @@ class PreviewWidget(gtk.VBox, Loggable):
         self.previewUri(uri)
 
     def previewUri(self, uri):
-        self.log("Preview request for " + uri)
+        self.log("Preview request for %s", uri)
         self.clear_preview()
         self.current_selected_uri = uri
         if uri in self.preview_cache:  # Already discovered
diff --git a/pitivi/medialibrary.py b/pitivi/medialibrary.py
index 18794ae..d7022c1 100644
--- a/pitivi/medialibrary.py
+++ b/pitivi/medialibrary.py
@@ -27,7 +27,6 @@ Handles the list of source for a project
 import gst
 import ges
 import gobject
-import glib
 import gtk
 import pango
 import os
@@ -36,6 +35,7 @@ import time
 from urllib import unquote
 from gettext import gettext as _
 from hashlib import md5
+from gst.pbutils import Discoverer, DiscovererVideoInfo
 
 from pitivi.configure import get_pixmap_dir
 from pitivi.settings import GlobalSettings
@@ -116,7 +116,7 @@ class MediaLibraryError(Exception):
 
 
 class MediaLibrary(Signallable, Loggable):
-    discovererClass = gst.pbutils.Discoverer
+    discovererClass = Discoverer
 
     """
     Contains the sources for a project, stored as SourceFactory objects.
@@ -156,7 +156,7 @@ class MediaLibrary(Signallable, Loggable):
         self._ordered_sources = []
         self._resetImportCounters()
 
-        self.discoverer = self.discovererClass(gst.SECOND)
+        self.discoverer = self.discovererClass.new(gst.SECOND)
         self.discoverer.connect("discovered", self.addDiscovererInfo)
         self.discoverer.connect("finished", self.finishDiscovererCb)
         self.discoverer.start()
@@ -746,7 +746,7 @@ class MediaLibraryWidget(gtk.VBox, Loggable):
         # thumbnails directory (~/.thumbnails). The filenames are simply
         # the file URI hashed with md5, so we can retrieve them easily.
         if [i for i in info.get_stream_list() if\
-            isinstance(i, gst.pbutils.DiscovererVideoInfo)]:
+            isinstance(i, DiscovererVideoInfo)]:
             thumbnail_hash = md5(info.get_uri()).hexdigest()
             thumb_dir = os.path.expanduser("~/.thumbnails/")
             thumb_path_normal = thumb_dir + "normal/" + thumbnail_hash + ".png"
diff --git a/pitivi/render.py b/pitivi/render.py
index 0da83c3..e6d37c4 100644
--- a/pitivi/render.py
+++ b/pitivi/render.py
@@ -33,6 +33,8 @@ import time
 import pitivi.utils.loggable as log
 
 from gettext import gettext as _
+from gst.pbutils import EncodingContainerProfile, EncodingVideoProfile, \
+    EncodingAudioProfile
 
 from pitivi import configure
 from pitivi.utils.signal import Signallable
@@ -941,16 +943,16 @@ class RenderDialog(Loggable):
         self.window.hide()  # Hide the rendering settings dialog while rendering
 
         # FIXME GES: Handle presets here!
-        self.containerprofile = gst.pbutils.EncodingContainerProfile(None, None,
+        self.containerprofile = EncodingContainerProfile(None, None,
                                     gst.Caps(self.muxertype), None)
 
         if self.video_output_checkbutton.get_active():
-            self.videoprofile = gst.pbutils.EncodingVideoProfile(
+            self.videoprofile = EncodingVideoProfile(
                                     gst.Caps(self.videotype), None,
                                     self.settings.getVideoCaps(True), 0)
             self.containerprofile.add_profile(self.videoprofile)
         if self.audio_output_checkbutton.get_active():
-            self.audioprofile = gst.pbutils.EncodingAudioProfile(
+            self.audioprofile = EncodingAudioProfile(
                                     gst.Caps(self.audiotype), None,
                                     self.settings.getAudioCaps(), 0)
             self.containerprofile.add_profile(self.audioprofile)
diff --git a/pitivi/utils/ui.py b/pitivi/utils/ui.py
index 1e35b49..3a295fb 100644
--- a/pitivi/utils/ui.py
+++ b/pitivi/utils/ui.py
@@ -35,6 +35,7 @@ from itertools import izip
 from urllib import unquote
 from gettext import ngettext, gettext as _
 from decimal import Decimal
+from gst.pbutils import DiscovererVideoInfo, DiscovererAudioInfo, DiscovererStreamInfo
 
 from pitivi.utils.loggable import doLog, ERROR
 
@@ -165,9 +166,9 @@ def hex_to_rgb(value):
 #------ Helper to help beatify indos so they can be displayed in the UI -----#
 def beautify_info(info):
     ranks = {
-        gst.pbutils.DiscovererVideoInfo: 0,
-        gst.pbutils.DiscovererAudioInfo: 1,
-        gst.pbutils.DiscovererStreamInfo: 2
+        DiscovererVideoInfo: 0,
+        DiscovererAudioInfo: 1,
+        DiscovererStreamInfo: 2
     }
 
     def stream_sort_key(stream):
@@ -193,7 +194,7 @@ def info_name(info):
 
 
 def beautify_stream(stream):
-    if type(stream) == gst.pbutils.DiscovererAudioInfo:
+    if type(stream) == DiscovererAudioInfo:
         templ = ngettext("<b>Audio:</b> %d channel at %d <i>Hz</i> (%d <i>bits</i>)",
                 "<b>Audio:</b> %d channels at %d <i>Hz</i> (%d <i>bits</i>)",
                 stream.get_channels())
@@ -201,7 +202,7 @@ def beautify_stream(stream):
             stream.get_depth())
         return templ
 
-    elif type(stream) == gst.pbutils.DiscovererVideoInfo:
+    elif type(stream) == DiscovererVideoInfo:
         par = stream.get_par_num() / stream.get_par_denom()
         if not stream.is_image():
             templ = _(u"<b>Video:</b> %dÃ%d <i>pixels</i> at %.3f <i>fps</i>")
@@ -214,7 +215,7 @@ def beautify_stream(stream):
             templ = _(u"<b>Image:</b> %dÃ%d <i>pixels</i>")
             templ = templ % (par * stream.get_width(), stream.get_height())
         return templ
-    elif type(stream) == gst.pbutils.DiscovererStreamInfo:
+    elif type(stream) == DiscovererStreamInfo:
         caps = stream.get_caps().to_string()
         if "text" in caps:
             return _("Subtitles")