Merge lp:~laney/unity-lens-music/gstreamer1.0 into lp:unity-lens-music

[Iain Lane]

Port from gstreamer 0.10 to gstreamer 1.0

For Raring, we want to port everything in main from gstreamer-0.10 to gstreamer-1.0.

unity-lens-music is on that list. This branch implements the port.

I'm sure there are still gremlins ("soft" 0.10/1.0 changes) that will need to be ironed out, but in my testing this performed as well before the port as after. (That is, not spectacularly - previews still frequently fail to play - but it at least works).

[Iain Lane (laney)]

BTW if you want to test you should manually install gstreamer1.0-{pulseaudio,alsa} and the plugins they need, otherwise you won't get any sound. :-)

[Didier Roche-Tolomelli (didrocks)]

Please, do not merge until Laney gives the green light, meaning gstreamer 1.0 in main :)

[Michael Terry (mterry)]

Looks fine to me, and it does seem to work as well in my quick testing (it only uses it for preview mode music playing, right?).

review: Approve

[Michael Terry (mterry)]

Oh wait. Is there not a bug for this? Can you open one and link it please before it gets approved for a proper debian/changelog entry?

[Michael Terry (mterry)]

Laney is on holiday, whoops. I went ahead and made a bug and linked it. Approving.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-lens-music-mbs-autolanding/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-music-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-music-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/7/console

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

To resolve the merge conflict, since laney is on vacation, I made: https://code.launchpad.net/~mterry/unity-lens-music/gst1/+merge/139031

So I'll mark this branch as rejected.

Unmerged revisions

=== modified file 'configure.ac'
--- configure.ac	2012-10-19 15:38:25 +0000
+++ configure.ac	2012-11-14 14:57:26 +0000
@@ -16,7 +16,7 @@
 # Init the other things we depend on
 #####################################################
 AM_MAINTAINER_MODE
-AM_PROG_VALAC([0.16.0])
+AM_PROG_VALAC([0.18.0])
 AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No valac compiler found."])])
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -72,8 +72,8 @@
                   glib-2.0 >= $GLIB_REQUIRED
                   gobject-2.0 >= $GLIB_REQUIRED
                   gio-2.0 >= $GLIB_REQUIRED
-                  gstreamer-0.10 >= 0.10.36
-                  gstreamer-pbutils-0.10 >= 0.10.36
+                  gstreamer-1.0
+                  gstreamer-pbutils-1.0
                   )
 
 AC_SUBST(LENS_DAEMON_CFLAGS)

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-08 22:38:28 +0000
+++ debian/changelog	2012-11-14 14:57:26 +0000
@@ -1,5 +1,6 @@
 unity-lens-music (6.8.1-0ubuntu2) UNRELEASED; urgency=low
 
+  [ Michael Terry ]
   * Install daemons into pkglibexecdir, not libexecdir
   * debian/control:
     - Update Vcs-Bzr
@@ -8,6 +9,11 @@
     - Use dh_autoreconf
     - Use --fail-missing
 
+  [ Iain Lane ]
+  * Switch BDs for gstreamer1.0 port
+    - gstreamer 0.10 to gstreamer 1.0
+    - vala to vala-0.18 - this version has the gstreamer-1.0 vala bindings
+
  -- Michael Terry <[e-mail]>  Tue, 06 Nov 2012 10:37:44 -0500
 
 unity-lens-music (6.8.1-0ubuntu1) quantal-proposed; urgency=low

=== modified file 'debian/control'
--- debian/control	2012-11-06 17:01:41 +0000
+++ debian/control	2012-11-14 14:57:26 +0000
@@ -7,7 +7,7 @@
                gnome-common,
                pkg-config,
                dh-translations,
-               valac (>= 0.16),
+               valac-0.18,
                libglib2.0-dev (>= 2.27),
                libgee-dev,
                libjson-glib-dev,
@@ -15,8 +15,8 @@
                libsqlite3-dev (>= 3.7.7),
                libunity-dev (>= 6.8.0),
                libtdb-dev (>= 1.2.6),
-               libgstreamer0.10-dev (>= 0.10.36),
-               libgstreamer-plugins-base0.10-dev (>= 0.10.36),
+               libgstreamer1.0-dev,
+               libgstreamer-plugins-base1.0-dev
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/unity-lens-music
 # If you aren't a member of ~unity-team but need to upload packaging changes,

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-11-08 22:38:28 +0000
+++ src/Makefile.am	2012-11-14 14:57:26 +0000
@@ -117,8 +117,8 @@
 
 music_preview_player_VALAFLAGS = \
   -C \
-  --pkg gstreamer-0.10 \
-  --pkg gstreamer-pbutils-0.10 \
+  --pkg gstreamer-1.0 \
+  --pkg gstreamer-pbutils-1.0 \
   --pkg gio-2.0 \
   $(MAINTAINER_VALAFLAGS)
 

=== modified file 'src/player.vala'
--- src/player.vala	2012-09-07 12:03:01 +0000
+++ src/player.vala	2012-11-14 14:57:26 +0000
@@ -17,6 +17,7 @@
  */
 
 using Gst;
+using Gst.PbUtils;
 
 namespace PreviewPlayer
 {
@@ -38,7 +39,7 @@
     private static uint GST_NETWORK_TIMEOUT_SECS = 10; //gstreamer network timeout (in seconds)
     private static uint64 GST_STATE_QUERY_TIMEOUT = 1000000;
 
-    // gstreamer - playbin plugin flags; run 'gst-inspect-0.10 playbin2' for more flags & description
+    // gstreamer - playbin plugin flags; run 'gst-inspect1.0 playbin' for more flags & description
     private static int GST_PLAYBIN_AUDIO = 0x02;
     private static int GST_PLAYBIN_SOFT_VOLUME = 0x10;
 
@@ -62,7 +63,7 @@
     internal void init_gst () throws PreviewPlayerError
     {
       gst_pipeline = new Gst.Pipeline ("preview-player-pipeline");
-      gst_playbin = Gst.ElementFactory.make ("playbin2", "playbin2");
+      gst_playbin = Gst.ElementFactory.make ("playbin", "playbin");
       gst_sink = Gst.ElementFactory.make ("pulsesink", "sink");
       if (gst_sink == null)
       {
@@ -79,12 +80,12 @@
       gst_pipeline.add (gst_playbin);
 
       gst_bus = gst_pipeline.get_bus ();
-      gst_bus.add_watch_full (GLib.Priority.DEFAULT, gst_bus_message_cb);
+      gst_bus.add_watch (GLib.Priority.DEFAULT, gst_bus_message_cb);
     }
 
     internal void playbin_setup (GLib.Object source, GLib.ParamSpec spec)
     {
-      Gst.Value source_element = GLib.Value (GLib.Type.from_name("GstElement"));
+      GLib.Value source_element = GLib.Value (GLib.Type.from_name("GstElement"));
       gst_playbin.get_property ("source", ref source_element);
       Gst.Element obj = (Gst.Element)source_element.get_object();
 
@@ -108,7 +109,7 @@
           error = true;
           break;
         case Gst.MessageType.ELEMENT:
-          if (Gst.is_missing_plugin_message (message))
+          if (Gst.PbUtils.is_missing_plugin_message (message))
           {
             handle_missing_plugin (message);
           }
@@ -122,13 +123,14 @@
 
     private void handle_missing_plugin (Gst.Message message)
     {
-      var detail = Gst.missing_plugin_message_get_installer_detail (message);
-      var descr = Gst.missing_plugin_message_get_description (message);
+      var detail = Gst.PbUtils.missing_plugin_message_get_installer_detail (message);
+      var descr = Gst.PbUtils.missing_plugin_message_get_description (message);
       warning ("Missing plugin: '%s': %s\n", descr, detail);
 
       string[] details = {detail};
-      var status = Gst.install_plugins_async (details, null, codec_install_finished);
-      if (status == Gst.InstallPluginsReturn.STARTED_OK)
+
+      var status = Gst.PbUtils.install_plugins_async (details, null, codec_install_finished);
+      if (status == Gst.PbUtils.InstallPluginsReturn.STARTED_OK)
       {
         var dash_proxy = new DashProxy ();
         try
@@ -146,11 +148,11 @@
       }
     }
 
-    private void codec_install_finished (Gst.InstallPluginsReturn result)
+    private void codec_install_finished (Gst.PbUtils.InstallPluginsReturn result)
     {
       debug ("Codec install returned: %d\n", result);
 
-      if (result == Gst.InstallPluginsReturn.SUCCESS)
+      if (result == Gst.PbUtils.InstallPluginsReturn.SUCCESS)
       {
         /* In theory we should get here after codec installation successfully finished and then calling Gst.update_registry() would
            pick the changes. It turns out we get SUCCESS before apt actually finishes installation... As a workaround set a flag
@@ -201,9 +203,9 @@
       int64 dur;
 
       var fmt = Gst.Format.TIME;
-      if (gst_pipeline.query_position (ref fmt, out pos))
+      if (gst_pipeline.query_position (fmt, out pos))
       {
-        if (gst_pipeline.query_duration (ref fmt, out dur))
+        if (gst_pipeline.query_duration (fmt, out dur))
         {
           if (dur > 0)
           {
@@ -342,17 +344,17 @@
 
       try
       {
-        var discoverer = new Gst.Discoverer (2 * 1000000000); //2 seconds
+        var discoverer = new Gst.PbUtils.Discoverer (2 * 1000000000); //2 seconds
         var discoverer_info = discoverer.discover_uri (uri);
         var 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 != null && video_streams.length () > 0)
         {
-          var vstream = video_streams.nth_data (0);
+          var vstream = video_streams.nth_data (0) as Gst.PbUtils.DiscovererVideoInfo;
           props.insert ("width", new GLib.Variant.uint32 (vstream.get_width ()));
           props.insert ("height", new GLib.Variant.uint32 (vstream.get_height ()));
-          props.insert ("codec", new GLib.Variant.string (Gst.pb_utils_get_codec_description (vstream.get_caps ())));
+          props.insert ("codec", new GLib.Variant.string (Gst.PbUtils.get_codec_description (vstream.get_caps ())));
         }
       }
       catch (GLib.Error e)
@@ -363,4 +365,4 @@
       return props;
     }
   }
-}
\ No newline at end of file
+}