Merge lp:~stolowski/unity-lens-music/remove-banshee-preview-fix into lp:unity-lens-music

[Paweł Stołowski]

Reverted banshee preview support for now; it's not going to be released with Q.

Reverted banshee preview support for now; it's not going to be released with Q.

[Michal Hruby (mhr3)]

Rejecting, no need to revert this anymore.

Unmerged revisions

112. By Paweł Stołowski on 2012-09-28

Reverted banshee preview support for now; it's not going to be released with Q.

=== modified file 'src/banshee-scope.vala'
--- src/banshee-scope.vala	2012-09-28 10:27:26 +0000
+++ src/banshee-scope.vala	2012-09-28 13:10:30 +0000
@@ -24,8 +24,6 @@
   public class BansheeScopeProxy : SimpleScope
   { 
     private BansheeCollection collection;
-    private PreviewPlayer preview_player;
-    private Unity.MusicPreview? music_preview;
 
     public BansheeScopeProxy ()
     {
@@ -52,212 +50,57 @@
     protected override int num_results_global_search { get { return 20; } }
     protected override int num_results_lens_search { get { return 50; } }
 
-
-    public 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);
-        }
-      }
-    }
-
-    public 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);
-      }
-    }
-
-    private void on_progress_changed (string uri, Unity.MusicPreview.TrackState state, double progress)
-    {
-      if (preview != null)
-      {
-        music_preview.current_track_uri = uri;
-        music_preview.current_track_state = state;
-        music_preview.current_progress = (float)progress;
-      }
-    }
-
-
     public Unity.Preview preview (string uri)
     {
-      music_preview = null;
-      GLib.Icon? icon_file = null;
-      GLib.Icon? missing_icon_file = new GLib.FileIcon (File.new_for_path (ALBUM_MISSING_PREVIEW_ICON_PATH));
-
-      if (Uri.parse_scheme (uri) == "album")
-      {
-        string[] split = uri.split ("/"); //FIXME: there must be more reliable way
-        if (split.length >= 4)
-        {
-          string artist = split[2];
-          string title = split[3];
-
-          foreach (unowned Track track in collection.get_album_tracks_detailed (title, artist))
-          {
-            if (music_preview == null)
-            {
-              if (track.artwork_path != null && track.artwork_path != "" && FileUtils.test(track.artwork_path, FileTest.EXISTS))
-                icon_file = new GLib.ThemedIcon(track.artwork_path);
-              else
-                icon_file = missing_icon_file;
-              music_preview = new Unity.MusicPreview (title, artist, icon_file);
-            }
-            var tm = new Unity.TrackMetadata();
-            tm.uri = track.uri;
-            tm.track_no = track.track_number;
-            tm.title = track.title ?? "";
-            tm.length = track.duration;
-            music_preview.add_track(tm);
-          }
-        }
-        else
-        {
-          warning ("Invalid uri: %s", uri);
-        }
-      }
-      else // preview single track
-      {
-        Track? track = collection.get_album_track (uri);
-        if (track != null)
-        {
-          if (track.artwork_path != null && track.artwork_path != "" && FileUtils.test(track.artwork_path, FileTest.EXISTS))
-            icon_file = new GLib.ThemedIcon(track.artwork_path);
-          else
-            icon_file = missing_icon_file;
-          music_preview = new Unity.MusicPreview (track.title, track.artist, icon_file);
-          var tm = new Unity.TrackMetadata();
-          tm.uri = track.uri;
-          tm.track_no = track.track_number;
-          tm.title = track.title ?? "";
-          tm.length = track.duration;
-          music_preview.add_track(tm);
-        }
-      }
-
-      if (preview != null)
-      {
-        var play_action = new Unity.PreviewAction ("play", _("Play"), null);
-        play_action.activated.connect (play_in_banshee);
-        music_preview.add_action (play_action);
-
-        var show_folder_action = new Unity.PreviewAction ("show_in_folder", _("Show in Folder"), null);
-        show_folder_action.activated.connect (show_in_folder);
-        music_preview.add_action (show_folder_action);
-
-        music_preview.play.connect (play);
-        music_preview.pause.connect (pause);
-        music_preview.closed.connect (closed);
-      }
-
-      return music_preview;
-    }
-
-    private Unity.ActivationResponse play_in_banshee (string uri)
-    {
-      return activate (uri);
-    }
-
-    private Unity.ActivationResponse show_in_folder (string uri)
-    {
-      File? track_file = null;
-
-      if (Uri.parse_scheme (uri) == "album")
-      {
-        string[] split = uri.split ("/");
-        if (split.length >= 4)
-        {
-          string artist = split[2];
-          string title = split[3];
-          var album = new Album ()
-          {
-            title = split[3],
-            artist = split[2]
-          };
-          var tracks = collection.get_track_uris (album);
-          if (tracks.length > 0)
-          {
-            track_file = File.new_for_uri (tracks[0]);
-          }
-        }
-        else
-        {
-          warning ("Invalid uri: %s", uri);
-          return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
-        }
-      }
-      else //file
-      {
-        track_file = File.new_for_uri (uri);
-      }
-
-      File? parent_dir = track_file.get_parent ();
-      if (parent_dir != null)
-      {
-        try
-        {
-          GLib.AppInfo.launch_default_for_uri (parent_dir.get_uri (), null);
-          return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
-        }
-        catch (GLib.Error e)
-        {
-          warning ("Failed to launch application for uri '%s': %s", parent_dir.get_uri (), e.message);
-        }
-      }
-      else
-      {
-        warning ("Failed to get parent dir for uri: '%s'", uri);
-      }
-      return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
-    }
-
+        Unity.MusicPreview? preview = null;
+        GLib.Icon? icon_file = null;
+        GLib.Icon? missing_icon_file = new GLib.FileIcon (File.new_for_path (ALBUM_MISSING_PREVIEW_ICON_PATH));
+
+        if (Uri.parse_scheme (uri) == "album")
+        {
+            string[] split = uri.split ("/");
+            string artist = split[2];
+            string title = split[3];
+
+            foreach (unowned Track track in collection.get_album_tracks_detailed (title, artist))
+            {
+                if (preview == null)
+                {
+                    if (track.artwork_path != null && track.artwork_path != "" && FileUtils.test(track.artwork_path, FileTest.EXISTS))
+                        icon_file = new GLib.ThemedIcon(track.artwork_path);
+                    else
+                        icon_file = missing_icon_file;
+                    preview = new Unity.MusicPreview (title, artist, icon_file);
+                }
+                var tm = new Unity.TrackMetadata();
+                tm.uri = track.uri;
+                tm.track_no = track.track_number;
+                tm.title = track.title ?? "";
+                tm.length = track.duration;
+                preview.add_track(tm);
+            }
+        }
+        else // preview single track
+        {
+            Track? track = collection.get_album_track (uri);
+            if (track != null)
+            {
+                if (track.artwork_path != null && track.artwork_path != "" && FileUtils.test(track.artwork_path, FileTest.EXISTS))
+                    icon_file = new GLib.ThemedIcon(track.artwork_path);
+                else
+                    icon_file = missing_icon_file;
+                preview = new Unity.MusicPreview (track.title, track.artist, icon_file);
+                var tm = new Unity.TrackMetadata();
+                tm.uri = track.uri;
+                tm.track_no = track.track_number;
+                tm.title = track.title ?? "";
+                tm.length = track.duration;
+                preview.add_track(tm);
+            }
+        }
+
+        return preview;
+    }
 
     /**
      * Tells banshee to play the selected uri(s)