From 6a2419934fd491a24ab91c14feadbbe1522fe690 Mon Sep 17 00:00:00 2001 From: yonirabkin Date: Sun, 18 Sep 2005 18:53:00 +0000 Subject: fix emms-streams.el and emms-player-mplayer.el darcs-hash:20050918185351-be80e-6b9fdd384b25c68e2e1935bd39324c0fc7fe2900.gz --- emms-player-mplayer.el | 2 +- emms-streams.el | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/emms-player-mplayer.el b/emms-player-mplayer.el index 3c53e45..fcc996b 100644 --- a/emms-player-mplayer.el +++ b/emms-player-mplayer.el @@ -36,7 +36,7 @@ ".rm" ".rmvb" ".mp4")) "mplayer") -(define-emms-simple-player mplayer-playlist '(playlist) +(define-emms-simple-player mplayer-playlist '(streamlist) "http://" "mplayer" "-playlist") diff --git a/emms-streams.el b/emms-streams.el index d790069..9338216 100644 --- a/emms-streams.el +++ b/emms-streams.el @@ -431,17 +431,16 @@ about it, use this. Otherwise returns the name alone." (setq emms-track-initialize-functions '(emms-stream-add-data-to-track)) -;; emms-info-playlist is no more, anyone wish to fix this (Lukhas). -;; (when (featurep 'emms-info) -;; (eval-when-compile (require 'emms-info)) ; appease byte-compiler -;; (add-to-list 'emms-info-methods-list 'emms-info-playlist) -;; (defun emms-info-playlist-providep (track) -;; (if (eq (emms-track-type track) 'streamlist) -;; t -;; nil)) -;; (define-emms-info-method emms-info-streamlist ;; FIXME-PLS ? -;; :providep 'emms-info-streamlist-providep ;; FIXME-PLS ? -;; :get 'emms-info-url-get)) +(when (featurep 'emms-info) + (eval-when-compile (require 'emms-info)) ; appease byte-compiler + (add-to-list 'emms-info-methods-list 'emms-info-streamlist) + (defun emms-info-streamlist-providep (track) + (if (eq (emms-track-type track) 'streamlist) + t + nil)) + (define-emms-info-method emms-info-streamlist ;; FIXME-PLS ? + :providep 'emms-info-streamlist-providep ;; FIXME-PLS ? + :get 'emms-info-url-get)) (provide 'emms-streams) ;;; emms-streams.el ends here -- cgit v1.2.3