aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Olson <mwolson@gnu.org>2006-08-04 18:38:00 +0000
committerMichael Olson <mwolson@gnu.org>2006-08-04 18:38:00 +0000
commit1359311d1d86162b1e0374afdc0dc28a9cd1d9eb (patch)
tree7da0ee0f923115883d5bf207efe27169968ea506
parentb42027e47722f2c038ad455b6ca18f0b9c115643 (diff)
emms-player-mpd: Correctly fetch track data when using remote MusicPD server.
darcs-hash:20060804183813-1bfb2-57e60908847a03eade1622689660cf2614d219e7.gz
-rw-r--r--emms-player-mpd.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/emms-player-mpd.el b/emms-player-mpd.el
index f064ec2..e01c7da 100644
--- a/emms-player-mpd.el
+++ b/emms-player-mpd.el
@@ -1072,12 +1072,12 @@ info from MusicPD."
(if info
(emms-info-mpd-process track info)
(let (file)
- (when (and (eq 'file (emms-track-type track))
- emms-player-mpd-music-directory
- (setq file (emms-player-mpd-get-mpd-filename
- (emms-track-name track)))
- (string-match emms-player-mpd-supported-regexp file)
- (not (string-match "\\`http://" file)))
+ (when (or emms-player-mpd-music-directory
+ (and (eq 'file (emms-track-type track))
+ (setq file (emms-player-mpd-get-mpd-filename
+ (emms-track-name track)))
+ (string-match emms-player-mpd-supported-regexp file)
+ (not (string-match "\\`http://" file))))
(condition-case nil
(emms-player-mpd-send
(concat "find filename "