Update manual and emms-setup with the preferred way of invoking emms-playing-time and emms-lyrics from .emacs. Update MusicPD section of manual.

darcs-hash:20060402144407-1bfb2-857e5408fe3df2dffd111150018b3bbf60436679.gz

3 files changed, 21 insertions, 31 deletions

diff --git a/emms-player-mpd.el b/emms-player-mpd.el
index 8034b9c..c59e715 100644
--- a/emms-player-mpd.el
+++ b/emms-player-mpd.el
@@ -117,7 +117,7 @@ or nil if we cannot figure it out."
       "\\.\\(m3u\\|ogg\\|flac\\|mp3\\|wav\\|mod\\|aac\\)\\'")
   "Formats supported by MusicPD Client.")
 
-(defgroup emsm-player-mpd nil
+(defgroup emms-player-mpd nil
   "EMMS player for MusicPD."
   :group 'emms-player
   :prefix "emms-player-mpd-")
diff --git a/emms-setup.el b/emms-setup.el
index 96f57c6..6bc594d 100644
--- a/emms-setup.el
+++ b/emms-setup.el
@@ -96,8 +96,8 @@ stable features which come with the Emms distribution."
   ;; setup
   (emms-mode-line 1)
   (emms-mode-line-blank)
-  (emms-lyrics-enable)
-  (emms-playing-time-enable))
+  (emms-lyrics 1)
+  (emms-playing-time 1))
 
 (defun emms-devel ()
   "An Emms setup script.
diff --git a/emms.texinfo b/emms.texinfo
index 15fb4e8..88d477e 100644
--- a/emms.texinfo
+++ b/emms.texinfo
@@ -1060,7 +1060,7 @@ To use this feature invoke:
 
 @lisp
 (require 'emms-playing-time)
-(emms-playing-time-enable)
+(emms-playing-time 1)
 @end lisp
 
 @defun emms-playing-time-enable
@@ -1084,8 +1084,20 @@ Toggle displaying emms playing time on the mode line.
 
 Emms provides an interface to the @uref{http://www.musicpd.org/, Music
 Player Daemon}(MusicPD) software. The package is called `emms-player-mpd' and
-is provided by the file @file{emms-player-mpd.el}. To load
-`emms-player-mpd' invoke:
+is provided by the file @file{emms-player-mpd.el}.
+
+The advantages of using MusicPD as an EMMS backend include the
+following.
+
+@itemize @bullet
+@item minimal CPU usage
+@item fast access of track information
+@item optional crossfade
+@end itemize
+
+@subsubheading Setup
+
+To load `emms-player-mpd' invoke:
 
 @lisp
 (require 'emms-player-mpd)
@@ -1122,27 +1134,13 @@ sufficient for most uses.
 You can set @var{emms-player-mpd-sync-playlist} to nil if your master
 EMMS playlist contains only stored playlists.
 
+@subsubheading Commands provided
+
 @defun emms-player-mpd-connect
 Connect to MusicPD and retrieve its current playlist. Afterward, the
 status of MusicPD will be tracked.
 @end defun
 
-@defun emms-player-mpd-pause
-Pause the currently playing song.
-@end defun
-
-@defun emms-player-mpd-seek sec
-Seek backward or forward by SEC seconds, depending on sign of SEC.
-@end defun
-
-@defun emms-player-mpd-next
-Move forward by one track in MusicPD's internal playlist.
-@end defun
-
-@defun emms-player-mpd-previous
-Move backward by one track in MusicPD's internal playlist.
-@end defun
-
 @defun emms-player-mpd-show &optional insertp
 Describe the current EMMS track in the minibuffer. If INSERTP is
 non-nil, insert the description into the current buffer instead. This
@@ -1151,14 +1149,6 @@ differs from @command{emms-show} in that it asks MusicPD for the
 current track, rather than Emms.
 @end defun
 
-@defun emms-player-mpd-start track
-Starts a process playing TRACK.
-@end defun
-
-@defun emms-player-mpd-stop
-Stop the currently playing song.
-@end defun
-
 @node Lyrics
 @chapter Lyrics
 
@@ -1173,7 +1163,7 @@ To add this feature we invoke:
 
 @lisp
 (require 'emms-lyrics)
-(emms-lyrics-enable)
+(emms-lyrics 1)
 @end lisp
 
 There are a number of variables we can set to define the way that