Merge lp:~stolowski/unity-lens-video/unity-lens-videos.use-preview-player into lp:unity-lens-video

[Paweł Stołowski]

Use preview-player video_properties() DBus call instead of gstreamer-0.11 (1.0).

Use preview-player video_properties() DBus call instead of gstreamer-0.11 (1.0).

[lp:~stolowski/unity-lens-video/unity-lens-videos.use-preview-player]

88. By Paweł Stołowski on 2012-08-23

Preview: call dbus via dbus.Interface(...) method name rather then a callable method object.

[Michal Hruby (mhr3)]

Works well with latest preview player.

review: Approve

=== modified file 'src/unity-lens-video'
--- src/unity-lens-video	2012-08-14 12:44:20 +0000
+++ src/unity-lens-video	2012-08-23 16:22:25 +0000
@@ -26,10 +26,7 @@
 from zeitgeist import client, datamodel
 import time
 import fractions
-
-import gi
-gi.require_version("Gst", "1.0")
-gi.require_version("GstPbutils", "1.0")
+import dbus
 
 #pylint: disable=E0611
 from gi.repository import (
@@ -37,9 +34,7 @@
     GObject,
     Gio,
     Unity,
-    Dee,
-    Gst,
-    GstPbutils
+    Dee
 )
 #pylint: enable=E0611
 
@@ -71,6 +66,10 @@
 except:
     raise SystemExit(1)
 
+PREVIEW_PLAYER_DBUS_NAME = "com.canonical.Unity.Lens.Music.PreviewPlayer"
+PREVIEW_PLAYER_DBUS_PATH = "/com/canonical/Unity/Lens/Music/PreviewPlayer"
+PREVIEW_PLAYER_DBUS_IFACE = PREVIEW_PLAYER_DBUS_NAME
+
 # pylint: disable=R0903
 class Daemon:
     
@@ -104,6 +103,7 @@
         filters = []
         self._lens.props.filters = filters
         
+        self.bus = dbus.SessionBus()
         
         # Create the scope
         self._scope = Unity.Scope.new("/net/launchpad/lens/video/main")
@@ -142,23 +142,23 @@
                 subtitle = time.strftime("%x, %X", time.localtime(os.path.getmtime(GLib.filename_from_uri(uri, None))))
                 desc = model.get_string(iter, 5);
                 preview = Unity.MoviePreview.new(title, subtitle, desc, None)
+
                 # we may get remote uris from zeitgeist - fetch details for local files only
                 if uri.startswith("file://"):
                     preview.props.image_source_uri = uri
-                    try:
-                        discoverer = GstPbutils.Discoverer.new(2 * 1000000000) #2 seconds
-                        discoverer_info = discoverer.discover_uri(uri)
-                        video_streams = discoverer_info.get_video_streams()
-                        # note: the container may have multiple video and audio streams, we just get properties of the first one
-                        if video_streams and len(video_streams) > 0:
-                            vstream = video_streams[0]
-                            dimensions = str(vstream.get_width()) + "*" + str(vstream.get_height())
-                            if vstream.get_width() > 0 and vstream.get_height() > 0:
-                                gcd = fractions.gcd(vstream.get_width(), vstream.get_height())
-                                dimensions += ", " + str(vstream.get_width() / gcd) + ":" + str(vstream.get_height() / gcd)
-                            preview.add_info(Unity.InfoHint.new("format", _("Format"), None, GstPbutils.pb_utils_get_codec_description(vstream.get_caps())))
-                            preview.add_info(Unity.InfoHint.new("dimensions", _("Dimensions"), None, dimensions))
-                            preview.add_info(Unity.InfoHint.new("size", _("Size"), None, GLib.format_size(os.path.getsize(GLib.filename_from_uri(uri, None)))))
+                    try:                        
+                        player = self.bus.get_object (PREVIEW_PLAYER_DBUS_NAME, PREVIEW_PLAYER_DBUS_PATH)
+                        props = dbus.Interface (player, PREVIEW_PLAYER_DBUS_IFACE).VideoProperties(uri)
+                        width = props['width']
+                        height = props['height']
+                        codec = props['codec']
+                        dimensions = str(width) + "*" + str(height)
+                        if width > 0 and height > 0:
+                            gcd = fractions.gcd(width, height)
+                            dimensions += ", " + str(width / gcd) + ":" + str(height / gcd)
+                        preview.add_info(Unity.InfoHint.new("format", _("Format"), None, codec))
+                        preview.add_info(Unity.InfoHint.new("dimensions", _("Dimensions"), None, dimensions))
+                        preview.add_info(Unity.InfoHint.new("size", _("Size"), None, GLib.format_size(os.path.getsize(GLib.filename_from_uri(uri, None)))))
                     except Exception as e:
                         print "Couldn't get video details", e
                 show_folder = Unity.PreviewAction.new("show-in-folder", _("Show in Folder"), None)
@@ -498,7 +498,6 @@
     except:
         raise SystemExit(1)
 
-    Gst.init(sys.argv)
     daemon = Daemon()
     GObject.MainLoop().run()