Merge lp:~stolowski/unity-lens-shopping/use-libunity-extras into lp:unity-lens-shopping

[Paweł Stołowski]

Removed PreviewPlayer client code. Use PreviewPlayerHandler from Unity.Extras (requires new libunity).

Removed PreviewPlayer client code. Use PreviewPlayerHandler from Unity.Extras (requires new libunity).

DON'T approve until https://code.launchpad.net/~stolowski/libunity/libunity-extras/+merge/129120 is merged!

[Michal Hruby (mhr3)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

review: Needs Fixing (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2012-10-04 14:00:06 +0000
+++ configure.ac	2012-10-17 14:53:21 +0000
@@ -64,7 +64,9 @@
                   gee-1.0
                   libsoup-gnome-2.4
                   json-glib-1.0
-                  unity >= 6.7)
+                  unity >= 6.90.0
+                  unity-extras >= 6.90.0
+                  )
 
 AC_SUBST(LENS_DAEMON_CFLAGS)
 AC_SUBST(LENS_DAEMON_LIBS)
@@ -134,7 +136,7 @@
   ----------------------------------
 
   Prefix          : ${prefix}
-  
+
   Local install   : ${with_localinstall}
 
   Extra CFlags    : ${CPPFLAGS} $MAINTAINER_CFLAGS

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-09-26 11:10:59 +0000
+++ src/Makefile.am	2012-10-17 14:53:21 +0000
@@ -23,6 +23,7 @@
   -C \
   --pkg dee-1.0 \
   --pkg unity \
+  --pkg unity-extras \
   --pkg gee-1.0 \
   --pkg gio-2.0 \
   --pkg gio-unix-2.0 \
@@ -47,7 +48,6 @@
   main.vala \
   scope.vala \
   markup-cleaner.vala \
-  preview-player-client.vala \
   u1ms-preview.vala \
   $(NULL)
 
@@ -72,4 +72,3 @@
   *.stamp \
   $(unity_shopping_daemon_VALASOURCES:.vala=.c) \
   $(NULL)
-

=== removed file 'src/preview-player-client.vala'
--- src/preview-player-client.vala	2012-09-25 15:57:47 +0000
+++ src/preview-player-client.vala	1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by Pawel Stolowski <[e-mail]>
- */
-
-
-/*
- * FIXME: this code was copied from music-lens; it needs to be kept in sync and eventually moved to a library !!!
- */
-namespace Unity.ShoppingLens {
-  
-  static const string PREVIEW_PLAYER_DBUS_NAME = "com.canonical.Unity.Lens.Music.PreviewPlayer";
-  static const string PREVIEW_PLAYER_DBUS_PATH = "/com/canonical/Unity/Lens/Music/PreviewPlayer";
-
-  [DBus (name = "com.canonical.Unity.Lens.Music.PreviewPlayer")]
-  public interface PreviewPlayerService: GLib.Object
-  {
-    public signal void progress(string uri, uint32 state, double progress);
-
-    public abstract async void play (string uri) throws Error;
-    public abstract async void pause () throws Error;
-    public abstract async void pause_resume () throws Error;
-    public abstract async void resume () throws Error;
-    public abstract async void stop () throws Error;
-    public abstract async void close () throws Error;
-  }
-  
-  public class PreviewPlayer: GLib.Object
-  {
-    public signal void progress(string uri, Unity.MusicPreview.TrackState state, double progress);
-
-    public async void connect_to () throws Error
-    {
-      _preview_player_service = Bus.get_proxy_sync (BusType.SESSION, PREVIEW_PLAYER_DBUS_NAME, PREVIEW_PLAYER_DBUS_PATH);
-      _preview_player_service.progress.connect (on_progress_signal);
-    }
-
-    public async void play (string uri) throws Error
-    {
-      if (_preview_player_service == null)
-      {
-        yield connect_to ();
-      }
-      yield _preview_player_service.play (uri);
-    }
-
-    public async void pause () throws Error
-    {
-      if (_preview_player_service == null)
-      {
-        yield connect_to ();
-      }
-      yield _preview_player_service.pause ();
-    }
-
-    public async void pause_resume () throws Error
-    {
-      if (_preview_player_service == null)
-      {
-        yield connect_to ();
-      }
-      yield _preview_player_service.pause_resume ();
-    }
-
-    public async void resume () throws Error
-    {
-      if (_preview_player_service == null)
-      {
-        yield connect_to ();
-      }
-      yield _preview_player_service.resume ();
-    }
-
-    public async void stop () throws Error
-    {
-      if (_preview_player_service == null)
-      {
-        yield connect_to ();
-      }
-      yield _preview_player_service.stop ();
-    }
-
-    public async void close () throws Error
-    {
-      if (_preview_player_service == null)
-      {
-        yield connect_to ();
-      }
-      yield _preview_player_service.close ();
-    }
-
-    internal void on_progress_signal (string uri, uint32 state, double progress_value)
-    {
-      progress(uri, (Unity.MusicPreview.TrackState)state, progress_value);
-    }
-
-    private PreviewPlayerService _preview_player_service;
-  }
-}
\ No newline at end of file

=== modified file 'src/scope.vala'
--- src/scope.vala	2012-10-11 09:17:45 +0000
+++ src/scope.vala	2012-10-17 14:53:21 +0000
@@ -28,7 +28,7 @@
     private HashTable<string, string> results_details_map;
     private HashTable<string, string> global_results_details_map;
     private Soup.Session session;
-    private PreviewPlayerHandler player;
+    private Unity.Extras.PreviewPlayerController player;
 
     private PreferencesManager preferences = PreferencesManager.get_default ();
 
@@ -78,7 +78,7 @@
 
       preferences.notify["remote-content-search"].connect ((obj, pspec) => { queue_search_changed (SearchType.GLOBAL); });
     }
-    
+
     private async void update_search_async (LensSearch search,
                                             SearchType search_type,
                                             Cancellable cancellable)
@@ -166,8 +166,8 @@
         var preview = u1mspf.create_preview (parser);
         u1mspf.add_download_action (preview); // download will be handled by normal activation
         if (player == null)
-            player = new PreviewPlayerHandler ();
-        player.music_preview = preview;
+            player = new Unity.Extras.PreviewPlayerController ();
+        player.active_preview = preview;
         return preview;
       }
       else

=== modified file 'src/u1ms-preview.vala'
--- src/u1ms-preview.vala	2012-09-25 15:57:47 +0000
+++ src/u1ms-preview.vala	2012-10-17 14:53:21 +0000
@@ -23,109 +23,6 @@
  */
 namespace Unity.ShoppingLens
 {
-
-  public class PreviewPlayerHandler
-  {
-    private PreviewPlayer preview_player;
-    private Unity.MusicPreview music_preview_;
-
-    public Unity.MusicPreview music_preview
-    {
-      get
-      {
-        return music_preview_;
-      }
-      set
-      {
-        music_preview_ = value;
-        if (value != null)
-        {
-          music_preview.play.connect (play);
-          music_preview.pause.connect (pause);
-          music_preview.closed.connect (closed);
-        }
-      }
-    }     
-
-    public PreviewPlayerHandler (Unity.MusicPreview? preview = null)
-    {
-      music_preview = preview;
-    }
-
-    private void on_progress_changed (string uri, Unity.MusicPreview.TrackState state, double progress)
-    {
-      if (music_preview != null)
-      {
-          music_preview.current_track_uri = uri;
-          music_preview.current_track_state = state;
-          music_preview.current_progress = (float)progress;
-        }
-      }
-
-    private void closed (Unity.Preview preview)
-    {
-      if (preview_player != null)
-      {
-        try
-        {
-          preview_player.close ();
-        }
-        catch (Error e)
-        {
-          warning ("Failed to close preview player: %s", e.message);
-        }
-      }
-    }
-
-    private void play (Unity.Preview preview, string uri)
-    {
-      debug ("play request: '%s'", uri);
-      
-      try
-      {
-        if (preview_player == null)
-        {
-          preview_player = new PreviewPlayer ();
-          preview_player.progress.connect (on_progress_changed);
-          preview_player.connect_to ();
-        }
-
-        // we will receive state back in on_progress_changed, but set it now so that it's immediately reflected in the dash
-        music_preview.current_track_uri = uri;
-        music_preview.current_progress = 0.0f;
-        music_preview.current_track_state = Unity.MusicPreview.TrackState.PLAYING;
-        
-        preview_player.play (uri);
-      }
-      catch (Error e)
-      {
-        warning ("Failed to play '%s': %s", uri, e.message);
-      }
-    }
-
-    public void pause (Unity.Preview preview, string uri)
-    {
-      debug ("pause request: '%s'", uri);
-      
-      try
-      {
-        if (preview_player != null)
-        {
-          // we will receive state back in on_progress_changed, but set it now so that it's immediately reflected in the dash
-          music_preview.current_track_uri = uri;
-          music_preview.current_track_state = Unity.MusicPreview.TrackState.PAUSED;
-          
-          preview_player.pause ();
-        }
-      }
-      catch (Error e)
-      {
-        warning ("Failed to pause '%s': %s", uri, e.message);
-      }
-    }
-  }
-
-
   public class U1MSPreviewFactory
   {
     public string formatted_price { get; internal set; }
@@ -146,14 +43,14 @@
       var cover = new FileIcon (cover_file);
 
       var artist = root_obj.get_string_member ("artist");
-    
+
       var preview = new Unity.MusicPreview (title, artist, cover);
 
       if (root_obj.has_member ("formatted_price"))
         formatted_price = root_obj.get_string_member ("formatted_price");
       else
         formatted_price = "";
-    
+
       if (root_obj.has_member ("tracks"))
       {
         var tracks_node = root_obj.get_array_member ("tracks");