[Emms-patches] [COMMIT] Move emms-cue.el from emms-devel to emms-all and update manual.

[William Xu]

---
 doc/emms.texinfo   |   34 ++++++++++++++++++++++++++++++----
 lisp/emms-setup.el |   10 +++++-----
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/doc/emms.texinfo b/doc/emms.texinfo
index 0f44add..1fca86c 100644
--- a/doc/emms.texinfo
+++ b/doc/emms.texinfo
@@ -82,6 +82,7 @@ Modules and Extensions
 * Lyrics::               Displaying lyrics synchronously.
 * Volume::               Changing the volume.
 * Last.fm::              Interact with http://www.last.fm's services.
+* APE / FLAC Commands::  How to play next or previous track in these files.  
 * Extending Emms::       How to define new players and modules.
 
 Copying and license
@@ -860,13 +861,15 @@ The current Emms playlist buffer is stored in the variable
 @cindex track information
 @cindex info tags
 
-Emms is distributed with two predefined methods for retrieving info,
-provided by @file{emms-info-mp3info.el} and
address@hidden Both packages are front-ends for
+Emms is distributed with three predefined methods for retrieving info,
+provided by @file{emms-info-mp3info.el}, @file{emms-info-ogginfo.el} and
address@hidden The first two packages are front-ends for
 command-line tools. Ogg track information is retrieved using the
 @uref{http://directory.fsf.org/audio/ogg/vorbistools.html, ogginfo}
 software. Likewise, mp3 track information is available using
address@hidden://www.ibiblio.org/mp3info/, mp3info}.
address@hidden://www.ibiblio.org/mp3info/, mp3info}. While,
address@hidden retrieves tracks information for ape/flac files by
+parsing a cue sheet file, which is plain text.
 
 Automatic track information retrieval is enabled by default in the
 `emms-standard', `emms-all' and `emms-devel' setup levels provided by
@@ -1129,6 +1132,29 @@ except it collects result of given function (that's why 
named with
 `mapcar').
 @end defun
 
address@hidden APE / FLAC Commands
address@hidden APE / FLAC Commands
+
+Often, a single APE or FLAC file contains a complete ablum.  We can still
+play next or previous track in the ablum with the help of
address@hidden package, provided there is a corresponding cue sheet
+file.  This package also defines @code{emms-info-cueinfo} for retreiving
+the track information for APE / FLAC itself.  
+
+To load @file{emms-cue.el}: 
+
address@hidden
+(require 'emms-cue)
+(add-to-list 'emms-info-functions 'emms-info-cueinfo)
address@hidden lisp
+
address@hidden emms-cue-next
+Play next track from .cue file
address@hidden defun
address@hidden emms-cue-previous
+Play previous track from .cue file
address@hidden defun
+
 @node Extending Emms
 @chapter Extending Emms
 
diff --git a/lisp/emms-setup.el b/lisp/emms-setup.el
index 15f8cb7..04cf404 100644
--- a/lisp/emms-setup.el
+++ b/lisp/emms-setup.el
@@ -109,12 +109,14 @@ stable features which come with the Emms distribution."
     (require 'emms-player-xine)
     (require 'emms-playlist-sort)
     (require 'emms-browser)
-    (require 'emms-mode-line-icon))
+    (require 'emms-mode-line-icon)
+    (require 'emms-cue))
   ;; setup
   (emms-mode-line 1)
   (emms-mode-line-blank)
   (emms-lyrics 1)
-  (emms-playing-time 1))
+  (emms-playing-time 1)
+  (add-to-list 'emms-info-functions 'emms-info-cueinfo))
 
 ;;;###autoload
 (defun emms-devel ()
@@ -138,13 +140,11 @@ on the edge."
     (require 'emms-tag-editor)
     (require 'emms-volume)
     (require 'emms-playlist-limit)
-    (require 'emms-cue)
     (require 'emms-lastfm-client))
   ;; setup
   (add-hook 'emms-player-started-hook 'emms-last-played-update-current)
   (emms-score 1)
-  (emms-playlist-limit 1)
-  (add-to-list 'emms-info-functions 'emms-info-cueinfo))
+  (emms-playlist-limit 1))
 
 ;;;###autoload
 (defun emms-default-players ()
-- 
debian.1.5.6.1.19.ge6b2