Remove emms-volume-mpd-raise/lower, make chapter in manual for emms-volume.el

darcs-hash:20070105000820-1bfb2-20d9168d8cc55d2098f37602ade9aff5875b61aa.gz

2 files changed, 29 insertions, 42 deletions

diff --git a/emms-player-mpd.el b/emms-player-mpd.el
index 1fc42ec..fb64ff5 100644
--- a/emms-player-mpd.el
+++ b/emms-player-mpd.el
@@ -76,8 +76,7 @@
 
 ;; To change the volume using MusicPD, do the following.
 ;;
-;; (setq emms-volume-lower-function 'emms-volume-mpd-lower
-;;       emms-volume-raise-function 'emms-volume-mpd-raise)
+;; (setq emms-volume-change-function 'emms-volume-mpd-change)
 
 ;; Add 'emms-player-mpd to the top of `emms-player-list'.
 ;;
@@ -189,14 +188,6 @@ It should take same arguments as `open-network-stream' does."
                  string)
   :group 'emms-player-mpd)
 
-(defcustom emms-player-mpd-volume-change-amount 5
-  "The amount to use when raising or lowering the volume using the
-emms-volume interface.
-
-This should be a positive integer."
-  :type 'integer
-  :group 'emms-player-mpd)
-
 (defcustom emms-player-mpd-check-interval 1
   "How often to check to see whether MusicPD has advanced to the
 next song.  This may be an integer or a floating point number.
@@ -991,16 +982,6 @@ positive or negative."
         (concat "setvol \"" (number-to-string new-volume) "\"")
         nil #'ignore)))))
 
-(defun emms-volume-mpd-raise ()
-  "Increase the volume."
-  (interactive)
-  (emms-volume-mpd-change emms-player-mpd-volume-change-amount))
-
-(defun emms-volume-mpd-lower ()
-  "Decrease the volume."
-  (interactive)
-  (emms-volume-mpd-change (- 0 emms-player-mpd-volume-change-amount)))
-
 ;;; Now playing
 
 (defun emms-player-mpd-show-1 (closure response)
diff --git a/emms.texinfo b/emms.texinfo
index a55573f..f625e18 100644
--- a/emms.texinfo
+++ b/emms.texinfo
@@ -71,6 +71,7 @@ Modules and Extensions
 * Music Player Daemon:: Interface to Music Player Daemon.
 * Streaming Audio::     Interface to streaming audio.
 * Lyrics::              Displaying lyrics synchronously.
+* Volume::              Changing the volume
 * Last.fm::             Interact with http://www.last.fm's services.
 * Extending Emms::      How to define new players and modules.
 
@@ -1672,30 +1673,10 @@ order to prime the cache.
 To activate this, add the following to your .emacs.
 
 @example
-(setq emms-volume-lower-function 'emms-volume-mpd-lower
-      emms-volume-raise-function 'emms-volume-mpd-raise)
+(require 'emms-volume)
+(setq emms-volume-change-function 'emms-volume-mpd-change)
 @end example
 
-@defopt emms-player-mpd-volume-change-amount
-The amount to use when raising or lowering the volume using the
-emms-volume interface.
-
-This should be a positive integer.
-@end defopt
-
-@defun emms-volume-mpd-change amount
-Change volume up or down by AMOUNT, depending on whether it is
-positive or negative.
-@end defun
-
-@defun emms-volume-mpd-raise
-Increase the volume.
-@end defun
-
-@defun emms-volume-mpd-lower
-Decrease the volume.
-@end defun
-
 @node Lyrics
 @chapter Lyrics
 
@@ -1770,6 +1751,31 @@ Toggle displaying Emms lyrics.
 @end defun
 
 
+
+@node Volume
+@chapter volume
+
+@cindex volume
+
+We can use the `emms-volume' package, as provided by the
+@file{emms-volume.el} file, to manipulate the volume.
+
+@defopt emms-volume-change-amount
+The amount to use when raising or lowering the volume using the
+emms-volume interface.
+
+This should be a positive integer.
+@end defopt
+
+@defun emms-volume-raise
+Increase the volume.
+@end defun
+
+@defun emms-volume-lower
+Decrease the volume.
+@end defun
+
+
 @node Last.fm
 @chapter Last.fm