From 9608e8fb3270f91db98e03471effedd611e89cbe Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Wed, 30 Dec 2009 01:29:47 +0000
Subject: [PATCH] Display other types of station for friends and neighbours

---
 src/lastfmservice.cpp | 43 ++++++++++++++++++++++++++-----------------
 src/lastfmservice.h   |  6 ++++--
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/lastfmservice.cpp b/src/lastfmservice.cpp
index 7ef45320d..6ec2a64b4 100644
--- a/src/lastfmservice.cpp
+++ b/src/lastfmservice.cpp
@@ -77,14 +77,10 @@ void LastFMService::LazyPopulate(RadioItem *item) {
   switch (item->type) {
     case RadioItem::Type_Service:
       // Normal radio types
-      CreateStationItem(Type_MyRecommendations, "My Recommendations",
-                        ":last.fm/recommended_radio.png", item);
-      CreateStationItem(Type_MyRadio, "My Radio Station",
-                        ":last.fm/personal_radio.png", item);
-      CreateStationItem(Type_MyLoved, "My Loved Tracks",
-                        ":last.fm/loved_radio.png", item);
-      CreateStationItem(Type_MyNeighbourhood, "My Neighbourhood",
-                        ":last.fm/neighbour_radio.png", item);
+      CreateStationItem(Type_MyRecommendations, "My Recommendations", ":last.fm/recommended_radio.png", item);
+      CreateStationItem(Type_MyRadio, "My Radio Station", ":last.fm/personal_radio.png", item);
+      CreateStationItem(Type_MyLoved, "My Loved Tracks", ":last.fm/loved_radio.png", item);
+      CreateStationItem(Type_MyNeighbourhood, "My Neighbourhood", ":last.fm/neighbour_radio.png", item);
 
       // Types that spawn a popup dialog
       c = CreateStationItem(Type_ArtistRadio, "Artist radio...",
@@ -114,6 +110,15 @@ void LastFMService::LazyPopulate(RadioItem *item) {
       RefreshNeighbours();
       break;
 
+    case Type_OtherUser:
+      CreateStationItem(Type_OtherUserRadio, item->key, ":last.fm/recommended_radio.png", item)
+          ->display_text = item->key + "'s Radio Station";
+      CreateStationItem(Type_OtherUserLoved, item->key, ":last.fm/loved_radio.png", item)
+          ->display_text = item->key + "'s Loved Tracks";
+      CreateStationItem(Type_OtherUserNeighbourhood, item->key, ":last.fm/neighbour_radio.png", item)
+          ->display_text = item->key + "'s Neighbourhood";
+      break;
+
     default:
       break;
   }
@@ -187,11 +192,15 @@ QUrl LastFMService::UrlForItem(const RadioItem* item) const {
     case Type_MyRadio:
       return "lastfm://user/" + lastfm::ws::Username + "/library";
 
-    case Type_FriendRadio:
+    case Type_OtherUser:
+    case Type_OtherUserRadio:
       return "lastfm://user/" + item->key + "/library";
 
-    case Type_NeighbourRadio:
-      return "lastfm://user/" + item->key + "/library";
+    case Type_OtherUserLoved:
+      return "lastfm://user/" + item->key + "/loved";
+
+    case Type_OtherUserNeighbourhood:
+      return "lastfm://user/" + item->key + "/neighbours";
   }
   return QUrl();
 }
@@ -204,8 +213,10 @@ QString LastFMService::TitleForItem(const RadioItem* item) const {
     case Type_MyLoved:           return me + "'s Loved Tracks";
     case Type_MyNeighbourhood:   return me + "'s Neighbour Radio";
     case Type_MyRadio:           return me + "'s Library";
-    case Type_FriendRadio:       return item->key + "'s Library";
-    case Type_NeighbourRadio:    return item->key + "'s Library";
+    case Type_OtherUser:
+    case Type_OtherUserRadio:    return item->key + "'s Library";
+    case Type_OtherUserLoved:    return item->key + "'s Loved Tracks";
+    case Type_OtherUserNeighbourhood: return item->key + "'s Neighbour Radio";
   }
   return QString();
 }
@@ -395,10 +406,9 @@ void LastFMService::RefreshFriendsFinished() {
   }
 
   foreach (const lastfm::User& f, friends) {
-    RadioItem* item = new RadioItem(this, Type_FriendRadio, f);
+    RadioItem* item = new RadioItem(this, Type_OtherUser, f);
     item->icon = QIcon(":last.fm/icon_user.png");
     item->playable = true;
-    item->lazy_loaded = true;
     item->InsertNotify(friends_list_);
   }
 }
@@ -418,10 +428,9 @@ void LastFMService::RefreshNeighboursFinished() {
   }
 
   foreach (const lastfm::User& n, neighbours) {
-    RadioItem* item = new RadioItem(this, Type_NeighbourRadio, n);
+    RadioItem* item = new RadioItem(this, Type_OtherUser, n);
     item->icon = QIcon(":last.fm/user_purple.png");
     item->playable = true;
-    item->lazy_loaded = true;
     item->InsertNotify(neighbours_list_);
   }
 }
diff --git a/src/lastfmservice.h b/src/lastfmservice.h
index 5f811c3bc..f9f617b27 100644
--- a/src/lastfmservice.h
+++ b/src/lastfmservice.h
@@ -32,8 +32,10 @@ class LastFMService : public RadioService {
     Type_TagRadio,
     Type_MyFriends,
     Type_MyNeighbours,
-    Type_FriendRadio,
-    Type_NeighbourRadio,
+    Type_OtherUser,
+    Type_OtherUserRadio,
+    Type_OtherUserLoved,
+    Type_OtherUserNeighbourhood,
   };
 
   // RadioService