aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--emms-browser.el67
-rw-r--r--emms-history.el11
-rw-r--r--emms-info-libtag.el9
-rw-r--r--emms-info-metaflac.el10
-rw-r--r--emms-info-mp3info.el16
-rw-r--r--emms-info-ogginfo.el12
-rw-r--r--emms-info-opusinfo.el12
-rw-r--r--emms-info-tinytag.el8
-rw-r--r--emms-info.el22
-rw-r--r--emms-later-do.el31
-rw-r--r--emms-lyrics.el32
-rw-r--r--emms-metaplaylist-mode.el18
-rw-r--r--emms-mode-line.el9
-rw-r--r--emms-player-mpd.el34
-rw-r--r--emms-player-mpg321-remote.el17
-rw-r--r--emms-player-simple.el22
-rw-r--r--emms-playing-time.el11
-rw-r--r--emms-playlist-limit.el5
-rw-r--r--emms-playlist-mode.el33
-rw-r--r--emms-playlist-sort.el8
-rw-r--r--emms-setup.el5
-rw-r--r--emms-source-file.el24
-rw-r--r--emms-volume.el10
-rw-r--r--jack.el32
24 files changed, 172 insertions, 286 deletions
diff --git a/emms-browser.el b/emms-browser.el
index 08dd546..070efd4 100644
--- a/emms-browser.el
+++ b/emms-browser.el
@@ -1,6 +1,6 @@
;;; emms-browser.el --- a track browser supporting covers and filtering -*- lexical-binding: t; -*-
-;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2021 Free Software Foundation, Inc.
;; Author: Damien Elmes <emacs@repose.cx>
;; Keywords: emms, mp3, mpeg, multimedia
@@ -307,117 +307,94 @@
(defcustom emms-browser-default-browse-type
'info-artist
- "*The default browsing mode."
- :group 'emms-browser
- :type 'function)
-
-(defcustom emms-browser-make-name-function
- 'emms-browser-make-name-standard
- "*A function to make names for entries and subentries.
-Overriding this function allows you to customise how various elements
-are displayed. It is called with two arguments - track and type."
- :group 'emms-browser
+ "The default browsing mode."
:type 'function)
(defcustom emms-browser-get-track-field-function
- 'emms-browser-get-track-field-albumartist
- "*A function to get an element from a track.
+ #'emms-browser-get-track-field-albumartist
+ "A function to get an element from a track.
Change this to customize the way data is organized in the
browser. For example,
`emms-browser-get-track-field-use-directory-name' uses the
directory name to determine the artist. This means that
soundtracks, compilations and so on don't populate the artist
view with lots of 1-track elements."
- :group 'emms-browser
:type '(choice (function :tag "Sort by album-artist" emms-browser-get-track-field-albumartist)
(function :tag "Simple" emms-browser-get-track-field-simple)))
(defcustom emms-browser-covers
'("cover_small" "cover_med" "cover_large")
- "*Control how cover images are found.
+ "Control how cover images are found.
Can be either a list of small, medium and large images (large
currently not used), a function which takes a directory and one
of the symbols `small', `medium' or `large', and should return a
path to the cover, or nil to turn off cover loading."
- :group 'emms-browser
:type '(choice list function boolean))
(defcustom emms-browser-covers-file-extensions
'("jpg" "jpeg" "png" "gif" "bmp")
- "*File extensions accepted for `emms-browser-covers'.
+ "File extensions accepted for `emms-browser-covers'.
Should be a list of extensions as strings. Should be set before
emms-browser is required."
- :group 'emms-browser
:type '(repeat (string :tag "Extension")))
(defconst emms-browser--covers-filename nil
"*List of potential cover art names.")
(defcustom emms-browser-default-covers nil
- "*A list of default images to use if a cover isn't found."
- :group 'emms-browser
+ "A list of default images to use if a cover isn't found."
:type 'list)
(defcustom emms-browser-comparison-test
(if (fboundp 'define-hash-table-test)
'case-fold
'equal)
- "*A method for comparing entries in the cache.
+ "A method for comparing entries in the cache.
The default is to compare case-insensitively."
- :group 'emms-browser
:type 'symbol)
(defcustom emms-browser-track-sort-function
- 'emms-sort-natural-order-less-p
- "*How to sort tracks in the browser.
+ #'emms-sort-natural-order-less-p
+ "How to sort tracks in the browser.
Ues nil for no sorting."
- :group 'emms-browser
:type 'function)
(defcustom emms-browser-alpha-sort-function
- (if (functionp 'string-collate-lessp) 'string-collate-lessp 'string<)
- "*How to sort artists/albums/etc. in the browser.
+ (if (functionp 'string-collate-lessp) #'string-collate-lessp #'string<)
+ "How to sort artists/albums/etc. in the browser.
Use nil for no sorting."
- :group 'emms-browser
:type 'function)
(defcustom emms-browser-album-sort-function
- 'emms-browser-sort-by-year-or-name
- "*How to sort artists/albums/etc. in the browser.
+ #'emms-browser-sort-by-year-or-name
+ "How to sort artists/albums/etc. in the browser.
Use nil for no sorting."
- :group 'emms-browser
:type 'function)
(defcustom emms-browser-show-display-hook nil
- "*Hooks to run when starting or switching to a browser buffer."
- :group 'emms-browser
+ "Hooks to run when starting or switching to a browser buffer."
:type 'hook)
(defcustom emms-browser-hide-display-hook nil
- "*Hooks to run when burying or removing a browser buffer."
- :group 'emms-browser
+ "Hooks to run when burying or removing a browser buffer."
:type 'hook)
(defcustom emms-browser-tracks-added-hook nil
- "*Hooks to run when tracks are added to the playlist."
- :group 'emms-browser
+ "Hooks to run when tracks are added to the playlist."
:type 'hook)
(defcustom emms-browser-filter-tracks-hook nil
- "*Given a track, return t if the track should be ignored."
- :group 'emms-browser
+ "Given a track, return t if the track should be ignored."
:type 'hook)
(defcustom emms-browser-filter-changed-hook nil
- "*Hook run after the filter has changed."
- :group 'emms-browser
+ "Hook run after the filter has changed."
:type 'hook)
(defcustom emms-browser-delete-files-hook nil
- "*Hook run after files have been deleted.
+ "Hook run after files have been deleted.
This hook can be used to clean up extra files, such as album covers.
Called once for each directory."
- :group 'emms-browser
:type 'hook)
(defvar emms-browser-buffer nil
@@ -1502,7 +1479,6 @@ tracks from point, it does not delete files."
(defcustom emms-browser-switch-to-playlist-on-add
nil
"Whether to switch to to the playlist after adding files."
- :group 'emms-browser
:type 'boolean)
;;;###autoload
@@ -2015,8 +1991,7 @@ the text that it generates."
(t (:background ,dark-col)))
,(concat "Face for "
name
- " in a browser/playlist buffer.")
- :group 'emms-browser-mode)))
+ " in a browser/playlist buffer."))))
(emms-browser-make-face "year/genre" "#aaaaff" "#444477" 1.5)
(emms-browser-make-face "artist" "#aaaaff" "#444477" 1.3)
diff --git a/emms-history.el b/emms-history.el
index f5e4ca6..973113d 100644
--- a/emms-history.el
+++ b/emms-history.el
@@ -1,6 +1,6 @@
;;; emms-history.el -- save all playlists when exiting emacs -*- lexical-binding: t; -*-
-;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2021 Free Software Foundation, Inc.
;;
;; Author: Ye Wenbin <wenbinye@163.com>
@@ -45,19 +45,16 @@ Emacs."
(defcustom emms-history-file (concat (file-name-as-directory emms-directory) "history")
"The file to save playlists in."
- :type 'string
- :group 'emms-history)
+ :type 'string)
(defcustom emms-history-start-playing nil
"If non-nil emms starts playing the current track after
`emms-history-load' was invoked."
- :type 'boolean
- :group 'emms-history)
+ :type 'boolean)
(defcustom emms-history-file-coding-system 'utf-8
"Coding system used for saving `emms-history-file'."
- :type 'coding-system
- :group 'emms-history)
+ :type 'coding-system)
(defun emms-history-save ()
"Save all playlists that are open in this Emacs session."
diff --git a/emms-info-libtag.el b/emms-info-libtag.el
index 97d25c2..28add10 100644
--- a/emms-info-libtag.el
+++ b/emms-info-libtag.el
@@ -1,7 +1,6 @@
;;; emms-info-libtag.el --- Info-method for EMMS using libtag -*- lexical-binding: t; -*-
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008,
-;; 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2021 Free Software Foundation, Inc.
;; Authors: Ulrik Jensen <terryp@daimi.au.dk>
;; Jorgen Schäfer <forcer@forcix.cx>
@@ -72,16 +71,14 @@
(defcustom emms-info-libtag-program-name "emms-print-metadata"
"Name of emms-info-libtag program."
- :type '(string)
- :group 'emms-info-libtag)
+ :type '(string))
(defcustom emms-info-libtag-known-extensions
(regexp-opt '("mp3" "mp4" "m4a" "ogg" "flac" "spx" "wma"))
"Regexp of known extensions compatible with `emms-info-libtag-program-name'.
Case is irrelevant."
- :type '(string)
- :group 'emms-info-libtag)
+ :type '(string))
(defun emms-info-libtag (track)
(when (and (eq 'file (emms-track-type track))
diff --git a/emms-info-metaflac.el b/emms-info-metaflac.el
index 8b528c4..d9eebbc 100644
--- a/emms-info-metaflac.el
+++ b/emms-info-metaflac.el
@@ -1,6 +1,6 @@
;;; emms-info-metaflac.el --- Info-method for EMMS using metaflac -*- lexical-binding: t; -*-
-;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2021 Free Software Foundation, Inc.
;; Author: Matthew Kennedy <mkennedy@gentoo.org>
;; Keywords:
@@ -51,9 +51,8 @@ external metaflac program"
:group 'emms-info)
(defcustom emms-info-metaflac-program-name "metaflac"
- "*The name/path of the metaflac program."
- :type 'string
- :group 'emms-info-metaflac)
+ "The name/path of the metaflac program."
+ :type 'string)
(defcustom emms-info-metaflac-options
'("--no-utf8-convert"
@@ -66,8 +65,7 @@ external metaflac program"
"--show-tag=DISCNUMBER"
"--show-tag=GENRE")
"The argument to pass to `emms-info-metaflac-program-name'."
- :type '(repeat string)
- :group 'emms-info-metaflac)
+ :type '(repeat string))
(defun emms-info-metaflac (track)
"Get the FLAC tag of file TRACK, using `emms-info-metaflac-program'
diff --git a/emms-info-mp3info.el b/emms-info-mp3info.el
index 07cf6d2..06624d5 100644
--- a/emms-info-mp3info.el
+++ b/emms-info-mp3info.el
@@ -1,7 +1,6 @@
;;; emms-info-mp3info.el --- Info-method for EMMS using mp3info -*- lexical-binding: t; -*-
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008,
-;; 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2021 Free Software Foundation, Inc.
;; Authors: Ulrik Jensen <terryp@daimi.au.dk>
;; Jorgen Schäfer <forcer@forcix.cx>
@@ -50,14 +49,12 @@ external mp3info program"
:group 'emms-info)
(defcustom emms-info-mp3info-coding-system 'utf-8
- "*Coding system used in the output of mp3info."
- :type 'coding-system
- :group 'emms-info-mp3info)
+ "Coding system used in the output of mp3info."
+ :type 'coding-system)
(defcustom emms-info-mp3info-program-name "mp3info"
- "*The name/path of the mp3info tag program."
- :type 'string
- :group 'emms-info-mp3info)
+ "The name/path of the mp3info tag program."
+ :type 'string)
(defcustom emms-info-mp3find-arguments
`("-p" ,(concat "info-artist=%a\\n"
@@ -70,8 +67,7 @@ external mp3info program"
"info-playing-time=%S\\n"))
"The argument to pass to `emms-info-mp3info-program-name'.
This should be a list of info-flag=value lines."
- :type '(repeat string)
- :group 'emms-info-mp3info)
+ :type '(repeat string))
(defun emms-info-mp3info (track)
"Add track information to TRACK.
diff --git a/emms-info-ogginfo.el b/emms-info-ogginfo.el
index f28b072..fbe64ec 100644
--- a/emms-info-ogginfo.el
+++ b/emms-info-ogginfo.el
@@ -1,6 +1,6 @@
;;; emms-info-ogginfo.el --- Emms information from Ogg Vorbis files. -*- lexical-binding: t; -*-
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: Jorgen Schaefer <forcer@forcix.cx>
;; Yoni Rabkin <yrk@gnu.org>
@@ -34,14 +34,12 @@ program"
:group 'emms-info)
(defcustom emms-info-ogginfo-coding-system 'utf-8
- "*Coding system used in the output of ogginfo."
- :type 'coding-system
- :group 'emms-info-ogginfo)
+ "Coding system used in the output of ogginfo."
+ :type 'coding-system)
(defcustom emms-info-ogginfo-program-name "ogginfo"
- "*The name/path of the ogginfo tag program."
- :type 'string
- :group 'emms-info-ogginfo)
+ "The name/path of the ogginfo tag program."
+ :type 'string)
(defun emms-info-ogginfo (track)
"Add track information to TRACK.
diff --git a/emms-info-opusinfo.el b/emms-info-opusinfo.el
index 0a6cee6..af1a9b8 100644
--- a/emms-info-opusinfo.el
+++ b/emms-info-opusinfo.el
@@ -1,6 +1,6 @@
;;; emms-info-opusinfo.el --- Emms information from Ogg Opus files. -*- lexical-binding: t; -*-
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2021 Free Software Foundation, Inc.
;; Author: Pierre Neidhardt <mail@ambrevar.xyz>
@@ -33,14 +33,12 @@ program"
:group 'emms-info)
(defcustom emms-info-opusinfo-coding-system 'utf-8
- "*Coding system used in the output of opusinfo."
- :type 'coding-system
- :group 'emms-info-opusinfo)
+ "Coding system used in the output of opusinfo."
+ :type 'coding-system)
(defcustom emms-info-opusinfo-program-name "opusinfo"
- "*The name/path of the opusinfo tag program."
- :type 'string
- :group 'emms-info-opusinfo)
+ "The name/path of the opusinfo tag program."
+ :type 'string)
(defun emms-info-opusinfo (track)
"Add track information to TRACK.
diff --git a/emms-info-tinytag.el b/emms-info-tinytag.el
index fe21653..32895f0 100644
--- a/emms-info-tinytag.el
+++ b/emms-info-tinytag.el
@@ -1,6 +1,6 @@
;;; emms-info-tinytag.el --- Info-method for EMMS using tinytag -*- lexical-binding: t; -*-
-;; Copyright (C) 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2020-2021 Free Software Foundation, Inc.
;; Author: Fran Burstall <fran.burstall@gmail.com>
;; Keywords: multimedia
@@ -55,16 +55,14 @@
(defcustom emms-info-tinytag-python-name "python"
"Name of python we use."
- :type '(string)
- :group 'emms-info-tinytag)
+ :type '(string))
(defcustom emms-info-tinytag-known-extensions
(regexp-opt '("mp3" "mp4" "m4a" "m4b" "ogg" "opus" "flac" "wma" "wav"))
"Regexp of known extensions that `emms-info-tinytag' can handle.
Case is irrelevant."
- :type '(string)
- :group 'emms-info-tinytag)
+ :type '(string))
(defvar emms-info-tinytag--info-fields
'((info-album . album)
diff --git a/emms-info.el b/emms-info.el
index 9a49a5c..a120236 100644
--- a/emms-info.el
+++ b/emms-info.el
@@ -1,6 +1,6 @@
;;; emms-info.el --- Retrieving track information -*- lexical-binding: t; -*-
-;; Copyright (C) 2005-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: Jorgen Schaefer <forcer@forcix.cx>
@@ -51,30 +51,26 @@
:group 'emms)
(defcustom emms-info-auto-update t
- "*Non-nil when EMMS should update track information if the file changes.
+ "Non-nil when EMMS should update track information if the file changes.
This will cause hard drive activity on track loading. If this is
too annoying for you, set this variable to nil."
- :type 'boolean
- :group 'emms-info)
+ :type 'boolean)
(defcustom emms-info-asynchronously t
- "*Non-nil when track information should be loaded asynchronously.
+ "Non-nil when track information should be loaded asynchronously.
This requires `emms-later-do', which should come with EMMS."
- :type 'boolean
- :group 'emms-info)
+ :type 'boolean)
(defcustom emms-info-report-each-num-tracks 200
- "*Non-zero will report progress information every number of tracks.
+ "Non-zero will report progress information every number of tracks.
The default is to display a message every 200 tracks.
This variable is only used when adding tracks asynchronously."
- :type 'integer
- :group 'emms-info)
+ :type 'integer)
(defcustom emms-info-functions nil
- "*Functions which add information to tracks.
+ "Functions which add information to tracks.
Each is called with a track as argument."
- :type 'hook
- :group 'emms-info)
+ :type 'hook)
(defvar emms-info-asynchronous-tracks 0
"Number of tracks we're waiting for to be done.")
diff --git a/emms-later-do.el b/emms-later-do.el
index 68e29d3..d41d8b1 100644
--- a/emms-later-do.el
+++ b/emms-later-do.el
@@ -1,24 +1,23 @@
-;;; emms-later-do.el --- execute lisp code ... later -*- lexical-binding: t; -*-
+;;; emms-later-do.el --- Execute Lisp code ... later -*- lexical-binding: t; -*-
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008,
-;; 2009, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2021 Free Software Foundation, Inc.
;; Author: Jorgen Schaefer <forcer@forcix.cx>
-;;; This program 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 3
-;;; of the License, or (at your option) any later version.
+;; This program 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 3
+;; of the License, or (at your option) any later version.
-;;; This program 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.
+;; This program 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 this program; if not, write to the Free Software
-;;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-;;; 02110-1301 USA
+;; You should have received a copy of the GNU General Public License
+;; along with this program; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+;; 02110-1301 USA
;;; Commentary
@@ -41,7 +40,6 @@
(defcustom emms-later-do-interval 0.5
"How many seconds to wait between running events."
- :group 'emms-later-do
:type 'number)
(defcustom emms-later-do-batch 20
@@ -49,7 +47,6 @@
The functions are processed from `emms-later-do-list'. Must be 1 or
greater. Too high a value might make Emacs slower while the
list is being processed."
- :group 'emms-later-do
:type 'number)
(defvar emms-later-do-list nil
diff --git a/emms-lyrics.el b/emms-lyrics.el
index 0b18d24..9c0304a 100644
--- a/emms-lyrics.el
+++ b/emms-lyrics.el
@@ -1,6 +1,6 @@
;;; emms-lyrics.el --- Display lyrics synchronically -*- lexical-binding: t; -*-
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: William Xu <william.xwl@gmail.com>
;; Keywords: emms music lyrics
@@ -57,30 +57,25 @@
(defcustom emms-lyrics-display-on-modeline t
"If non-nil, display lyrics on mode line."
- :type 'boolean
- :group 'emms-lyrics)
+ :type 'boolean)
(defcustom emms-lyrics-display-on-minibuffer nil
"If non-nil, display lyrics on minibuffer."
- :type 'boolean
- :group 'emms-lyrics)
+ :type 'boolean)
(defcustom emms-lyrics-display-buffer nil
"Non-nil will create deciated `emms-lyrics-buffer' to display lyrics."
- :type 'boolean
- :group 'emms-lyrics)
+ :type 'boolean)
(defcustom emms-lyrics-dir "~/music/lyrics"
"Local lyrics repository.
`emms-lyrics-find-lyric' will look for lyrics in current directory(i.e.,
same as the music file) and this directory."
- :type 'string
- :group 'emms-lyrics)
+ :type 'string)
(defcustom emms-lyrics-display-format " %s "
"Format for displaying lyrics."
- :type 'string
- :group 'emms-lyrics)
+ :type 'string)
(defcustom emms-lyrics-coding-system nil
"Coding system for reading lyrics files.
@@ -90,31 +85,26 @@ variable to that value; else you'd better leave it to nil, and
rely on `prefer-coding-system', `file-coding-system-alist' or
\(info \"(emacs)File Variables\"), sorted by priority
increasingly."
- :type 'coding-system
- :group 'emms-lyrics)
+ :type 'coding-system)
(defcustom emms-lyrics-mode-hook nil
"Normal hook run after entering Emms Lyric mode."
- :type 'hook
- :group 'emms-lyrics)
+ :type 'hook)
(defcustom emms-lyrics-find-lyric-function 'emms-lyrics-find-lyric
"Function for finding lyric files."
- :type 'symbol
- :group 'emms-lyrics)
+ :type 'symbol)
(defcustom emms-lyrics-scroll-p t
"Non-nil value will enable lyrics scrolling on mode line.
Note: Even if this is set to t, it also depends on
`emms-lyrics-display-on-modeline' to be t."
- :type 'boolean
- :group 'emms-lyrics)
+ :type 'boolean)
(defcustom emms-lyrics-scroll-timer-interval 0.4
"Interval between scroller timers. The shorter, the faster."
- :type 'number
- :group 'emms-lyrics)
+ :type 'number)
;;; User Interfaces
diff --git a/emms-metaplaylist-mode.el b/emms-metaplaylist-mode.el
index 40d7b74..5e78226 100644
--- a/emms-metaplaylist-mode.el
+++ b/emms-metaplaylist-mode.el
@@ -1,6 +1,6 @@
;;; emms-metaplaylist-mode.el --- A major mode for lists of Emms playlists -*- lexical-binding: t; -*-
-;; Copyright (C) 2006, 2007, 2008, 2009, 2017-2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2021 Free Software Foundation, Inc.
;; Author: Yoni Rabkin <yrk@gnu.org>
@@ -43,14 +43,12 @@
:group 'multimedia)
(defcustom emms-metaplaylist-mode-buffer-name "*Emms Playlist Buffers*"
- "*Name of the buffer in which Emms playlists will be listed."
- :type 'string
- :group 'emms-metaplaylist-mode)
+ "Name of the buffer in which Emms playlists will be listed."
+ :type 'string)
(defcustom emms-metaplaylist-mode-hooks nil
- "*List of hooks to run on entry to emms-metaplaylist-mode."
- :type 'list
- :group 'emms-metaplaylist-mode)
+ "List of hooks to run on entry to emms-metaplaylist-mode."
+ :type 'list)
(defface emms-metaplaylist-mode-face
'((((class color) (background dark))
@@ -60,8 +58,7 @@
(((type tty) (class mono))
(:inverse-video t))
(t (:background "WhiteSmoke")))
- "Face for the buffer names in the playlists buffer."
- :group 'emms-metaplaylist-mode)
+ "Face for the buffer names in the playlists buffer.")
(defface emms-metaplaylist-mode-current-face
'((((class color) (background dark))
@@ -71,8 +68,7 @@
(((type tty) (class mono))
(:inverse-video t))
(t (:background "red3")))
- "Face for the current buffer name in the playlists buffer."
- :group 'emms-metaplaylist-mode)
+ "Face for the current buffer name in the playlists buffer.")
;;; --------------------------------------------------------
;;; Keymap
diff --git a/emms-mode-line.el b/emms-mode-line.el
index 02d3a33..2c49075 100644
--- a/emms-mode-line.el
+++ b/emms-mode-line.el
@@ -1,7 +1,6 @@
;;; emms-mode-line.el --- Mode-Line and titlebar infos for emms -*- lexical-binding: t; -*-
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008,
-;; 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2004-2021 Free Software Foundation, Inc.
;; Author: Mario Domgörgen <kanaldrache@gmx.de>
;; Keywords: multimedia
@@ -41,13 +40,11 @@
(defcustom emms-mode-line-mode-line-function 'emms-mode-line-playlist-current
"Function for showing infos in mode-line or nil if don't want to."
- :type '(choice (const :tag "Don't show info on mode-line" nil) function)
- :group 'emms-mode-line)
+ :type '(choice (const :tag "Don't show info on mode-line" nil) function))
(defcustom emms-mode-line-titlebar-function nil
"Function for showing infos in titlebar or nil if you don't want to."
- :type '(choice (const :tag "Don't show info on titlebar" nil) function)
- :group 'emms-mode-line)
+ :type '(choice (const :tag "Don't show info on titlebar" nil) function))
(defcustom emms-mode-line-format " [ %s ] "
"String used for displaying the current track in mode-line and titlebar."
diff --git a/emms-player-mpd.el b/emms-player-mpd.el
index 78fd857..1a4f407 100644
--- a/emms-player-mpd.el
+++ b/emms-player-mpd.el
@@ -1,6 +1,6 @@
;;; emms-player-mpd.el --- MusicPD support for EMMS -*- lexical-binding: t; -*-
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: Michael Olson <mwolson@gnu.org>, Jose Antonio Ortega Ruiz
;; <jao@gnu.org>
@@ -125,9 +125,8 @@
(defcustom emms-player-mpd (emms-player 'emms-player-mpd-start
'emms-player-mpd-stop
'emms-player-mpd-playable-p)
- "*Parameters for the MusicPD player."
- :type '(cons symbol alist)
- :group 'emms-player-mpd)
+ "Parameters for the MusicPD player."
+ :type '(cons symbol alist))
(defcustom emms-player-mpd-music-directory nil
"The value of 'music_directory' in your MusicPD configuration file.
@@ -139,8 +138,7 @@ config."
;; next line, where there is more space to work with
:type '(choice :format "%{%t%}:\n %[Value Menu%] %v"
(const nil)
- directory)
- :group 'emms-player-mpd)
+ directory))
(defun emms-player-mpd-get-supported-regexp ()
"Returns a regexp of file extensions that MusicPD supports,
@@ -196,30 +194,25 @@ or nil if we cannot figure it out."
:set (function
(lambda (sym value)
(set sym value)
- (emms-player-set emms-player-mpd 'regex value)))
- :group 'emms-player-mpd)
+ (emms-player-set emms-player-mpd 'regex value))))
(defcustom emms-player-mpd-connect-function 'open-network-stream
"Function used to initiate the connection to MusicPD.
It should take same arguments as `open-network-stream' does."
- :type 'function
- :group 'emms-player-mpd)
+ :type 'function)
(defcustom emms-player-mpd-server-name (or (getenv "MPD_HOST") "localhost")
"The MusicPD server that we should connect to."
- :type 'string
- :group 'emms-player-mpd)
+ :type 'string)
(defcustom emms-player-mpd-server-port (or (getenv "MPD_PORT") "6600")
"The port of the MusicPD server that we should connect to."
- :type '(choice number string)
- :group 'emms-player-mpd)
+ :type '(choice number string))
(defcustom emms-player-mpd-server-password nil
"The password for the MusicPD server that we should connect to."
:type '(choice (const :tag "None" nil)
- string)
- :group 'emms-player-mpd)
+ string))
(defcustom emms-player-mpd-check-interval 1
"How often to check to see whether MusicPD has advanced to the
@@ -230,14 +223,12 @@ performed.
This variable is used only if `emms-player-mpd-sync-playlist' is
non-nil."
:type '(choice (const :tag "Disable check" nil)
- number)
- :group 'emms-player-mpd)
+ number))
(defcustom emms-player-mpd-verbose nil
"Whether to provide notifications for server connection events
and errors."
- :type 'boolean
- :group 'emms-player-mpd)
+ :type 'boolean)
(defcustom emms-player-mpd-sync-playlist t
"Whether to synchronize the EMMS playlist with the MusicPD playlist.
@@ -246,8 +237,7 @@ If your EMMS playlist contains music files rather than playlists,
leave this set to non-nil.
If your EMMS playlist contains stored playlists, set this to nil."
- :type 'boolean
- :group 'emms-player-mpd)
+ :type 'boolean)
(emms-player-set emms-player-mpd
'regex
diff --git a/emms-player-mpg321-remote.el b/emms-player-mpg321-remote.el
index 40ff9d0..a61b4a0 100644
--- a/emms-player-mpg321-remote.el
+++ b/emms-player-mpg321-remote.el
@@ -1,6 +1,6 @@
;;; emms-player-mpg321-remote.el --- play files with mpg321 -R -*- lexical-binding: t; -*-
-;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2021 Free Software Foundation, Inc.
;; Author: Damien Elmes <emacs@repose.cx>
;; Keywords: emms, mp3, mpeg, multimedia
@@ -49,23 +49,20 @@
:prefix "emms-player-mpg321-remote")
(defcustom emms-player-mpg321-remote-command "mpg321"
- "*The command name of mpg321."
- :type 'string
- :group 'emms-player-mpg321-remote)
+ "The command name of mpg321."
+ :type 'string)
(defcustom emms-player-mpg321-remote-parameters nil
- "*Extra arguments to pass to mpg321 when using remote mode
+ "Extra arguments to pass to mpg321 when using remote mode
For example: (list \"-o\" \"alsa\")"
- :type '(repeat string)
- :group 'emms-player-mpg321-remote)
+ :type '(repeat string))
(defcustom emms-player-mpg321-remote
(emms-player 'emms-player-mpg321-remote-start-playing
'emms-player-mpg321-remote-stop-playing
'emms-player-mpg321-remote-playable-p)
- "*A player for EMMS."
- :type '(cons symbol alist)
- :group 'emms-player-mpg321-remote)
+ "A player for EMMS."
+ :type '(cons symbol alist))
(defvar emms-player-mpg321-remote-initial-args
(list "--skip-printing-frames=10" "-R" "-")
diff --git a/emms-player-simple.el b/emms-player-simple.el
index 0e921fe..dd7eec9 100644
--- a/emms-player-simple.el
+++ b/emms-player-simple.el
@@ -1,7 +1,6 @@
;;; emms-player-simple.el --- A generic simple player. -*- lexical-binding: t; -*-
-;; Copyright (C) 2003, 2004, 2006, 2007, 2008,
-;; 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2021 Free Software Foundation, Inc.
;; Authors: Ulrik Jensen <terryp@daimi.au.dk>
;; Jorgen Schäfer <forcer@forcix.cx>
@@ -52,8 +51,8 @@
NAME is used to contruct the name of the function like
emms-player-NAME. TYPES is a list of track types understood by
this player. REGEX must be a regexp that matches the filenames
-the player can play. COMMAND specifies the command line arguement
-to call the player and ARGS are the command line arguements."
+the player can play. COMMAND specifies the command line argument
+to call the player and ARGS are the command line arguments."
(let ((group (intern (concat "emms-player-" (symbol-name name))))
(command-name (intern (concat "emms-player-"
(symbol-name name)
@@ -71,17 +70,14 @@ to call the player and ARGS are the command line arguements."
:group 'emms-player
:prefix ,(concat "emms-player-" (symbol-name name) "-"))
(defcustom ,command-name ,command
- ,(concat "*The command name of " command ".")
- :type 'string
- :group ',group)
+ ,(concat "The command name of " command ".")
+ :type 'string)
(defcustom ,parameters ',args
- ,(concat "*The arguments to `" (symbol-name command-name) "'.")
- :type '(repeat string)
- :group ',group)
+ ,(concat "The arguments to `" (symbol-name command-name) "'.")
+ :type '(repeat string))
(defcustom ,player-name (emms-player ',start ',stop ',playablep)
- ,(concat "*A player for EMMS.")
- :type '(cons symbol alist)
- :group ',group)
+ ,(concat "A player for EMMS.")
+ :type '(cons symbol alist))
(emms-player-set ,player-name 'regex ,regex)
(emms-player-set ,player-name 'pause 'emms-player-simple-pause)
(emms-player-set ,player-name 'resume 'emms-player-simple-resume)
diff --git a/emms-playing-time.el b/emms-playing-time.el
index 920c9d5..bca96b1 100644
--- a/emms-playing-time.el
+++ b/emms-playing-time.el
@@ -1,6 +1,6 @@
;;; emms-playing-time.el --- Display emms playing time on mode line -*- lexical-binding: t; -*-
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: William Xu <william.xwl@gmail.com>, Yoni Rabkin (yrk@gnu.org)
@@ -52,21 +52,18 @@
(defcustom emms-playing-time-display-short-p nil
"Non-nil will only display elapsed time.
e.g., display 02:37 instead of 02:37/05:49."
- :type 'boolean
- :group 'emms-playing-time)
+ :type 'boolean)
(defcustom emms-playing-time-display-format " %s "
"Format used for displaying playing time."
- :type 'string
- :group 'emms-playing-time)
+ :type 'string)
(defcustom emms-playing-time-style 'time
"Style used for displaying playing time.
Valid styles are `time' (e.g., 01:30/4:20),
`bar' (e.g., [===> ]),
and `downtime' (e.g. -03:58)."
- :type 'symbol
- :group 'emms-playing-time)
+ :type 'symbol)
;;; Emms Playing Time
diff --git a/emms-playlist-limit.el b/emms-playlist-limit.el
index 91eff1e..59ad0f5 100644
--- a/emms-playlist-limit.el
+++ b/emms-playlist-limit.el
@@ -1,6 +1,6 @@
;;; emms-playlist-limit.el --- Limit playlist by various info -*- lexical-binding: t -*-
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2021 Free Software Foundation, Inc.
;; Author: William Xu <william.xwl@gmail.com>
;; Author: Fran Burstall <fran.burstall@gmail.com>
@@ -65,8 +65,7 @@
(defcustom emms-playlist-limit-hook nil
"Hooks to run after each limit operation."
- :type 'symbol
- :group 'emms-playlist-limit)
+ :type 'symbol)
(defmacro define-emms-playlist-limit (attribute)
"Macro for defining emms playlist limit to ATTRIBUTE function."
diff --git a/emms-playlist-mode.el b/emms-playlist-mode.el
index f851b63..9692f19 100644
--- a/emms-playlist-mode.el
+++ b/emms-playlist-mode.el
@@ -1,6 +1,6 @@
;;; emms-playlist-mode.el --- Playlist mode for Emms. -*- lexical-binding: t; -*-
-;; Copyright (C) 2005-2019 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: Yoni Rabkin <yrk@gnu.org>
@@ -22,11 +22,11 @@
;;; Commentary:
;;;
-;;; This is a method of displaying and manipulating the different Emms
-;;; playlist buffers.
-;;;
-;;; Emms developer's motto: "When forcer says (require 'jump) we say
-;;; (funcall #'jump height)"
+;; This is a method of displaying and manipulating the different Emms
+;; playlist buffers.
+;;
+;; Emms developer's motto: "When forcer says (require 'jump) we say
+;; (funcall #'jump height)"
;;; Code:
@@ -64,23 +64,20 @@
:group 'emms)
(defcustom emms-playlist-mode-open-playlists nil
- "*Determine whether to open playlists in a new EMMS buffer on RET.
+ "Determine whether to open playlists in a new EMMS buffer on RET.
This is useful if you have a master playlist buffer that is
composed of other playlists."
- :type 'boolean
- :group 'emms-playlist-mode)
+ :type 'boolean)
(defcustom emms-playlist-mode-window-width 25
- "*Determine the width of the Emms popup window.
+ "Determine the width of the Emms popup window.
The value should a positive integer."
- :type 'integer
- :group 'emms-playlist-mode)
+ :type 'integer)
(defcustom emms-playlist-mode-center-when-go nil
- "*Determine whether to center on the currently selected track.
+ "Determine whether to center on the currently selected track.
This is true for every invocation of `emms-playlist-mode-go'."
- :type 'boolean
- :group 'emms-playlist-mode)
+ :type 'boolean)
;;; --------------------------------------------------------
;;; Faces
@@ -94,8 +91,7 @@ This is true for every invocation of `emms-playlist-mode-go'."
(((type tty) (class mono))
(:inverse-video t))
(t (:background "Blue")))
- "Face for the tracks in a playlist buffer."
- :group 'emms-playlist-mode)
+ "Face for the tracks in a playlist buffer.")
(defface emms-playlist-selected-face
'((((class color) (background dark))
@@ -105,8 +101,7 @@ This is true for every invocation of `emms-playlist-mode-go'."
(((type tty) (class mono))
(:inverse-video t))
(t (:background "blue3")))
- "Face for highlighting the selected track."
- :group 'emms-playlist-mode)
+ "Face for highlighting the selected track.")
;;; --------------------------------------------------------
;;; Keys
diff --git a/emms-playlist-sort.el b/emms-playlist-sort.el
index ae5bb56..cfab320 100644
--- a/emms-playlist-sort.el
+++ b/emms-playlist-sort.el
@@ -1,6 +1,6 @@
;;; emms-playlist-sort.el --- sort emms playlist -*- lexical-binding: t; -*-
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: William Xu <william.xwl@gmail.com>
@@ -38,14 +38,12 @@
Currently it understands the following fields: name info-artist
imfo-composer info-performer info-title info-album info-genre
info-playing-time info-tracknumber info-discnumber."
- :type 'symbol
- :group 'emms-playlist-sort)
+ :type 'symbol)
(defcustom emms-playlist-sort-prefix "S"
"Prefix key sequence for `emms-playlist-sort-map'.
Remember to call `emms-playlist-sort-map-setup' if you modify it."
- :type 'string
- :group 'emms-playlist-sort)
+ :type 'string)
;;; User Interfaces
diff --git a/emms-setup.el b/emms-setup.el
index 9754c5c..60ebe38 100644
--- a/emms-setup.el
+++ b/emms-setup.el
@@ -1,6 +1,6 @@
;;; emms-setup.el --- Setup script for EMMS -*- lexical-binding: t; -*-
-;; Copyright (C) 2005-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: Yoni Rabkin <yrk@gnu.org>
;; Keywords: emms setup multimedia
@@ -54,8 +54,7 @@
emms-player-mpv
emms-player-vlc
emms-player-vlc-playlist)
- "*Default list of players for emms-setup."
- :group 'emms-setup
+ "Default list of players for emms-setup."
:type 'list)
;;;###autoload
diff --git a/emms-source-file.el b/emms-source-file.el
index ed8d832..9060528 100644
--- a/emms-source-file.el
+++ b/emms-source-file.el
@@ -1,7 +1,6 @@
;;; emms-source-file.el --- EMMS sources from the filesystem. -*- lexical-binding: t; -*-
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008,
-;; 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2021 Free Software Foundation, Inc.
;; Author: Jorgen Schäfer <forcer@forcix.cx>
;; Keywords: emms, mp3, mpeg, multimedia
@@ -53,9 +52,8 @@
:group 'emms-source)
(defcustom emms-source-file-default-directory nil
- "*The default directory to look for media files."
- :type '(choice (const :tag "None" nil) file)
- :group 'emms-source-file)
+ "The default directory to look for media files."
+ :type '(choice (const :tag "None" nil) file))
(defcustom emms-source-file-directory-tree-function
'emms-source-file-directory-tree-internal
@@ -69,8 +67,7 @@ be slow.
find, but it's faster."
:type 'function
:options '(emms-source-file-directory-tree-internal
- emms-source-file-directory-tree-find)
- :group 'emms-source-file)
+ emms-source-file-directory-tree-find))
(defcustom emms-source-file-exclude-regexp
(concat "\\`\\(#.*#\\|.*,v\\|.*~\\|\\.\\.?\\|\\.#.*\\|,.*\\)\\'\\|"
@@ -80,18 +77,15 @@ find, but it's faster."
You should set case-fold-search to nil before using this regexp
in code."
- :type 'regexp
- :group 'emms-source-file)
+ :type 'regexp)
(defcustom emms-source-file-gnu-find "find"
- "*The program name for GNU find."
- :type 'string
- :group 'emms-source-file)
+ "The program name for GNU find."
+ :type 'string)
(defcustom emms-source-file-directory-hint-p t
- "*When non-nil, guess the directory based on a track at point."
- :type 'boolean
- :group 'emms-source-file)
+ "When non-nil, guess the directory based on a track at point."
+ :type 'boolean)
;; The `read-directory-name' function is not available in Emacs 21.
(defalias 'emms-read-directory-name
diff --git a/emms-volume.el b/emms-volume.el
index 655e587..98b99ee 100644
--- a/emms-volume.el
+++ b/emms-volume.el
@@ -1,6 +1,6 @@
;;; emms-volume.el --- Volume functions and a minor mode to adjust volume easily -*- lexical-binding: t; -*-
-;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2021 Free Software Foundation, Inc.
;; Author: Martin Schoenmakers <aiviru@diamond-age.net>
;; Bruno Félix Rezende Ribeiro <oitofelix@gnu.org>
@@ -65,22 +65,20 @@
((executable-find "pactl") 'emms-volume-pulse-change)
((executable-find "mixerctl") 'emms-volume-mixerctl-change)
(t #'(lambda (_amount) (user-error "%s" "No supported mixer found. Please, define ‘emms-volume-change-function’."))))
- "*The function to use to change the volume.
+ "The function to use to change the volume.
If you have your own functions for changing volume, set this."
:type '(choice (const :tag "Amixer" emms-volume-amixer-change)
(const :tag "MPD" emms-volume-mpd-change)
(const :tag "PulseAudio" emms-volume-pulse-change)
(const :tag "Mixerctl" emms-volume-mixerctl-change)
- (function :tag "Lisp function"))
- :group 'emms-volume)
+ (function :tag "Lisp function")))
(defcustom emms-volume-change-amount 2
"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-volume)
+ :type 'integer)
;;;###autoload
(defun emms-volume-raise ()
diff --git a/jack.el b/jack.el
index d248a12..ffee3b1 100644
--- a/jack.el
+++ b/jack.el
@@ -1,6 +1,6 @@
;;; jack.el --- Jack Audio Connection Kit support
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2021 Free Software Foundation, Inc.
;; Author: Mario Lang <mlang@delysid.org>
;; Keywords: multimedia, processes
@@ -48,35 +48,29 @@
:group 'processes)
(defcustom jack-rc '("~/.jackdrc" "/etc/jackd.conf")
- "*JACK run control paths."
- :group 'jack
+ "JACK run control paths."
:type 'repeat)
(defcustom jack-use-jack-rc t
- "*If non-nil, try to retrieve jack startup arguments from run control files
+ "If non-nil, try to retrieve jack startup arguments from run control files
listed in `jack-rc'. If no rc file is found or this variable is set
to nil, use the Emacs variables to build the startup args."
- :group 'jack
:type 'boolean)
(defcustom jack-program (executable-find "jackd")
- "*JACK executable path."
- :group 'jack
+ "JACK executable path."
:type 'file)
(defcustom jack-sample-rate 44100
- "*Default sampling rate for JACK."
- :group 'jack
+ "Default sampling rate for JACK."
:type 'integer)
(defcustom jack-period-size 128
- "*Period size to use when launching new JACK process."
- :group 'jack
+ "Period size to use when launching new JACK process."
:type 'integer)
(defcustom jack-alsa-device nil
- "*ALSA soundcard to use."
- :group 'jack
+ "ALSA soundcard to use."
:type '(choice (const :tag "Ask" nil) string))
(defun jack-read-alsa-device ()
@@ -94,8 +88,7 @@ to nil, use the Emacs variables to build the startup args."
(or jack-alsa-device (jack-read-alsa-device)))
(defcustom jack-output-buffer-name "*JACK output*"
- "*Output buffer name."
- :group 'jack
+ "Output buffer name."
:type 'string)
(defun jack-args ()
@@ -122,14 +115,12 @@ First element is the executable path."
(format "-p%d" jack-period-size))))
(defcustom jack-set-rtlimits t
- "*Use set_rtlimits (if available) to gain realtime priorities if -R
+ "Use set_rtlimits (if available) to gain realtime priorities if -R
is given in jackd command-line."
- :group 'jack
:type 'boolean)
(defcustom jack-set-rtlimits-program (executable-find "set_rtlimits")
- "*Path to set_rtlimits."
- :group 'jack
+ "Path to set_rtlimits."
:type 'file)
(defun jack-maybe-rtlimits (args)
@@ -181,8 +172,7 @@ is given in jackd command-line."
(eq (process-status jack-process) 'run)))
(defcustom jack-started-hook nil
- "*Hook run when `jack-start' successfully started a new JACK intance."
- :group 'jack
+ "Hook run when `jack-start' successfully started a new JACK intance."
:type 'hook)
(defun jack-start ()
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 19:24:29 +0000