From d27a9216214bbd4193851e2e32bdd90bdb86e59c Mon Sep 17 00:00:00 2001 From: Mike Kazantsev Date: Sun, 25 Jul 2021 02:45:49 +0500 Subject: * emms-player-mpv.el: fix missing emms-player-mpv customize group and errors there --- emms-player-mpv.el | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/emms-player-mpv.el b/emms-player-mpv.el index 8687f3b..2659d55 100644 --- a/emms-player-mpv.el +++ b/emms-player-mpv.el @@ -64,22 +64,25 @@ (require 'cl-lib) +(defgroup emms-player-mpv nil + "EMMS player for mpv." + :group 'emms-player + :prefix "emms-player-mpv-") + (defcustom emms-player-mpv (emms-player #'emms-player-mpv-start #'emms-player-mpv-stop #'emms-player-mpv-playable-p) "*Parameters for mpv player." - :type '(cons symbol alist) - :group 'emms-player-mpv) + :type '(cons symbol alist)) (emms-player-set emms-player-mpv 'regex (apply #'emms-player-simple-regexp emms-player-base-format-list)) (defcustom emms-player-mpv-command-name "mpv" "mpv binary to use. Can be absolute path or just binary name." - :type 'file - :group 'emms-player-mpv) + :type 'file) (defcustom emms-player-mpv-parameters '("--quiet" "--really-quiet" "--no-audio-display") @@ -91,16 +94,14 @@ Note that unless --no-config option is specified here, mpv will also use options from its configuration files. For mpv binary path, see `emms-player-mpv-command-name'." :type '(choice (repeat :tag "List of mpv arguments" string) - function) - :group 'emms-player-mpv) + function)) (defcustom emms-player-mpv-environment () "List of extra environment variables (\"VAR=value\" strings) to pass on to mpv process. These are added on top of `process-environment' by default. Adding nil as an element to this list will discard emacs `process-environment' and only pass variables that are specified in the list." - :type '(repeat (choice string (const :tag "Start from blank environment" nil))) - :group 'emms-player-mpv) + :type '(repeat (choice string (const :tag "Start from blank environment" nil)))) (defcustom emms-player-mpv-ipc-method nil "Switch for which IPC method to use with mpv. @@ -113,16 +114,14 @@ support for various feedback and metadata options from mpv." (const :tag "Auto-detect from mpv --version" nil) (const :tag "Use --input-ipc-server JSON IPC (v0.17.0 2016-04-11)" ipc-server) (const :tag "Use --input-unix-socket JSON IPC (v0.7.0 2014-10-16)" unix-socket) - (const :tag "Use --input-file FIFO (any mpv version)" file)) - :group 'emms-player-mpv) + (const :tag "Use --input-file FIFO (any mpv version)" file))) (defcustom emms-player-mpv-ipc-socket (concat (file-name-as-directory emms-directory) "mpv-ipc.sock") "Unix IPC socket or FIFO to use with mpv --input-* options, depending on `emms-player-mpv-ipc-method' value and/or mpv version." - :type 'file - :group 'emms-player-mpv) + :type 'file) (defvar emms-player-mpv-ipc-proc nil) ; to avoid warnings while keeping useful defs at the top @@ -130,7 +129,8 @@ depending on `emms-player-mpv-ipc-method' value and/or mpv version." "Update track duration when played by mpv. Uses `emms-player-mpv-event-functions' hook." :type 'boolean - :set (lambda (_sym value) + :set (lambda (sym value) + (set-default-toplevel-value sym value) (run-at-time 0.1 nil (lambda (value) (if value @@ -140,15 +140,15 @@ Uses `emms-player-mpv-event-functions' hook." (remove-hook 'emms-player-mpv-event-functions #'emms-player-mpv-info-duration-event-func))) - value)) - :group 'emms-player-mpv) + value))) (defcustom emms-player-mpv-update-metadata nil "Update track info (artist, album, name, etc) from mpv events, when it is played. This allows to dynamically update stream info from ICY tags, for example. Uses `emms-player-mpv-event-connect-hook' and `emms-player-mpv-event-functions' hooks." :type 'boolean - :set (lambda (_sym value) + :set (lambda (sym value) + (set-default-toplevel-value sym value) (run-at-time 0.1 nil (lambda (value) (if value @@ -168,8 +168,7 @@ Uses `emms-player-mpv-event-connect-hook' and `emms-player-mpv-event-functions' (remove-hook 'emms-player-mpv-event-functions #'emms-player-mpv-info-meta-event-func)))) - value)) - :group 'emms-player-mpv) + value))) (defvar emms-player-mpv-proc nil -- cgit v1.2.3