diff options
| -rw-r--r-- | emms-volume-amixer.el | 57 | ||||
| -rw-r--r-- | emms-volume.el | 122 |
2 files changed, 179 insertions, 0 deletions
diff --git a/emms-volume-amixer.el b/emms-volume-amixer.el new file mode 100644 index 0000000..b721b38 --- /dev/null +++ b/emms-volume-amixer.el @@ -0,0 +1,57 @@ +;;; emms-volume-amixer.el --- a mode for changing volume using amixer + +;; Copyright (C) 2006 Free Software Foundation, Inc. + +;; Author: Martin Schoenmakers <aiviru@diamond-age.net> + +;; This file is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. +;; +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +;; Boston, MA 02110-1301 USA + +;;; Commentary: + +;; This file defines a few simple functions to raise or lower the volume +;; using amixer. It can be used stand-alone, though it's meant for usage +;; with EMMS, particularly with emms-volume.el + +;;; History: + +;; May 30 2006: First cleanup and collation of amixer functions into a +;; separate file for releasability. + +;;; Todo: + +;; There probably needs to be more configurability, which may in turn +;; mean adding some more functions. +;; Some of this could benefit from adding customize interfaces. + +;;; Code: + +(defun emms-volume-amixer-sset-master (var) + "Change amixer master volume by VAR." + (start-process "mixer" nil "amixer" "sset" "Master" var)) + +(defun emms-volume-amixer-raise () + "Increase volume by 2%." + (interactive) + (emms-volume-amixer-sset-master "2%+")) + +(defun emms-volume-amixer-lower () + "Decrease volume by 2%." + (interactive) + (emms-volume-amixer-sset-master "2%-")) + +(provide 'emms-volume-amixer) + +;;; emms-volume-amixer.el ends here diff --git a/emms-volume.el b/emms-volume.el new file mode 100644 index 0000000..0e8b5d7 --- /dev/null +++ b/emms-volume.el @@ -0,0 +1,122 @@ +;;; emms-volume.el --- Volume functions and a minor mode to adjust volume easily + +;; Copyright (C) 2006 Free Software Foundation, Inc. + +;; Author: Martin Schoenmakers <aiviru@diamond-age.net> + +;; This file is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. +;; +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +;; Boston, MA 02110-1301 USA + +;;; Commentary: +;; +;; This file provides generally two things: +;; Generic volume setting functions and some appropriate bindings for EMMS +;; playlist buffers. These can also be bound to global keys,however, the +;; second part may be more useful for this. This part provides functions +;; meant to be bound to a global key (the author uses C-c e + and C-c e -), +;; which then temporarily activates a minor mode allowing you to change the +;; volume with just + and -. This mode deactivates a short (configurable) +;; amount of time after the last volume change. This allows for easier volume +;; adjustment without getting in the way. + +;;; History: + +;; May 2006: First stab at writing the minor mode. +;; +;; 30 May 2006: Cleanup and restructuring to fit with EMMS. + +;;; Todo: + +;; Some of this could benefit from adding customize interfaces. + +;;; Code: + +;; General volume setting related code. +(defvar emms-volume-raise-function 'emms-volume-amixer-raise + "*The function to use to raise the volume. +If you have your own functions for changing volume, set this and + `emms-volume-lower-function' accordingly.") + +(defvar emms-volume-lower-function 'emms-volume-amixer-lower + "*The function to use to lower the volume. +If you have your own functions for changing volume, set this and + `emms-volume-raise-function' accordingly.") + +(defun emms-volume-raise () + "Raise the speaker volume." + (interactive) + (funcall emms-volume-raise-function)) + +(defun emms-volume-lower () + "Lower the speaker volume." + (interactive) + (funcall emms-volume-lower-function)) + +(define-key emms-playlist-mode-map (kbd "+") 'emms-volume-raise) +(define-key emms-playlist-mode-map (kbd "-") 'emms-volume-lower) + +;; Code specific to the minor mode. +(define-minor-mode emms-volume-minor-mode + "Allows volume setting with + and - after an initial key combo." + :global t + :init-value nil + :lighter " (+/-)" + :keymap '(("+" . emms-volume-mode-plus) + ("-" . emms-volume-mode-minus))) + +(defvar emms-volume-mode-timeout 2 + "*The timeout in amount of seconds used by `emms-volume-minor-mode'.") + +(defvar emms-volume-mode-timer nil + "The timer `emms-volume-minor-mode' uses.") + +(defun emms-volume-mode-plus () + "Raise volume and enable or extend the `emms-volume-minor-mode' timeout." + (interactive) + (emms-volume-raise) + (emms-volume-mode-start-or-extend)) + +(defun emms-volume-mode-minus () + "Lower volume and enable or extend the `emms-volume-minor-mode' timeout." + (interactive) + (emms-volume-lower) + (emms-volume-mode-start-or-extend)) + +(defun emms-volume-mode-disable-timer () + "Disable `emms-volume-minor-mode' timer." + (cancel-timer emms-volume-mode-timer) + (setq emms-volume-mode-timer nil)) + +(defun emms-volume-mode-set-timer () + "Set a new `emms-volume-minor-mode' timer." + (unless (null emms-volume-mode-timer) + (emms-volume-mode-disable-timer)) + (setq emms-volume-mode-timer (run-at-time emms-volume-mode-timeout + nil + 'emms-volume-mode-timer-timeout))) + +(defun emms-volume-mode-timer-timeout () + "Function to disable `emms-volume-minor-mode' at timeout." + (emms-volume-minor-mode -1)) + +(defun emms-volume-mode-start-or-extend () + "Start `emms-volume-minor-mode' or extend its running time." + (when (null emms-volume-minor-mode) + (emms-volume-minor-mode 1)) + (emms-volume-mode-set-timer)) + +(provide 'emms-volume) + +;;; emms-volume.el ends here |