aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Bonnet <lucas@rincevent.net>2011-01-03 09:43:59 +0100
committerLucas Bonnet <lucas@rincevent.net>2011-01-03 09:43:59 +0100
commit7aae0a2a002d7ec0b2c4bd3468a0e40bdee416c8 (patch)
treec3fbd74d6593db893a1afd1d037a40c47b3a4d27
parent4bb75d5f7304d1a986ff0508bce8700100908849 (diff)
parent11831694fed9bb73fce80fb3e288cc490c2a8f65 (diff)
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/emms
-rw-r--r--doc/emms.texinfo9
-rw-r--r--lisp/emms-lastfm-client.el14
2 files changed, 23 insertions, 0 deletions
diff --git a/doc/emms.texinfo b/doc/emms.texinfo
index 8f4f459..b0da260 100644
--- a/doc/emms.texinfo
+++ b/doc/emms.texinfo
@@ -2324,10 +2324,19 @@ Space} to enter literal spaces.
There are personal streams you can tune into:
+(at the time of writing these are in a state of flux as Last.fm
+depreciate old stations and bring in new ones; If a station which used
+to work doesn't anymore that is probably the reason. As Last.fm add
+and remove stations emms-lastfm-client will be updated accordingly)
+
@kbd{M-x emms-lastfm-client-play-library}: Your Last.fm Library.
@kbd{M-x emms-lastfm-client-play-loved}: Your ``loved'' tracks.
+@kbd{M-x emms-lastfm-client-play-recommended}: Your ``recommended'' tracks.
+
+@kbd{M-x emms-lastfm-client-play-mix}: Your ``mix'' radio.
+
@kbd{M-x emms-lastfm-client-play-neighborhood}: Your ``neighborhood''.
You can use similar commands to tune into other people's streams. For
diff --git a/lisp/emms-lastfm-client.el b/lisp/emms-lastfm-client.el
index 9f66877..9332216 100644
--- a/lisp/emms-lastfm-client.el
+++ b/lisp/emms-lastfm-client.el
@@ -587,6 +587,13 @@ This function includes the cryptographic signature."
(emms-lastfm-scrobbler-handshake)
(emms-lastfm-client-play-playlist))
+(defun emms-lastfm-client-play-recommended ()
+ "Play a Last.fm station with \"recommended\" tracks."
+ (interactive)
+ (emms-lastfm-client-play-user-station
+ emms-lastfm-client-username
+ "lastfm://user/%s/recommended"))
+
(defun emms-lastfm-client-play-loved ()
"Play a Last.fm station with \"loved\" tracks."
(interactive)
@@ -594,6 +601,13 @@ This function includes the cryptographic signature."
emms-lastfm-client-username
"lastfm://user/%s/loved"))
+(defun emms-lastfm-client-play-mix ()
+ "Play the \"Mix\" station the current user."
+ (interactive)
+ (emms-lastfm-client-play-user-station
+ emms-lastfm-client-username
+ "lastfm://user/%s/mix"))
+
(defun emms-lastfm-client-play-neighborhood ()
"Play a Last.fm station with \"neighborhood\" tracks."
(interactive)