From e7ab73a0cd1e46ec97c969addcab35f83a44a344 Mon Sep 17 00:00:00 2001
From: Daniel Borchmann <daniel@algebra20.de>
Date: Sat, 3 Nov 2018 18:19:49 +0100
Subject: [PATCH] =?UTF-8?q?[EMMS]=20Inline=20and=20adapt=20configuration?=
 =?UTF-8?q?=20normally=20done=20by=20=E2=80=98emms-all=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This way, we can fine tune the actual configuration done, and we don’t have to
reset ‘emms-track-description-function’.
---
 init.el | 88 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 67 insertions(+), 21 deletions(-)

diff --git a/init.el b/init.el
index b96c6a4..33e8479 100644
--- a/init.el
+++ b/init.el
@@ -1598,8 +1598,9 @@ are assumed to be of the form *.crt."
 
 ;; * Media
 
-(use-package emms-setup
-  :commands (emms-pause
+(use-package emms
+  :commands (emms
+             emms-pause
              emms-stop
              emms-next
              emms-previous)
@@ -1608,30 +1609,73 @@ are assumed to be of the form *.crt."
   :init (setq emms-source-file-default-directory "~/Documents/media/audio/"
               emms-player-list '(emms-player-mplayer emms-player-mplayer-playlist)
               emms-show-format "NP: %s"
-              emms-stream-default-action "play")
+              emms-stream-default-action "play"
+              emms-track-description-function 'db/emms-track-description
+              emms-playlist-default-major-mode 'emms-playlist-mode)
   :config (progn
-            (emms-all)
-            (emms-default-players)
 
-            ;; Reset track description function to personal configuration (it’s
-            ;; overwritten by `emms-all’)
-            (setq emms-track-description-function 'db/emms-track-description)
+            ;; Initialization copied and adapted from `emms-setup’
+
+            (require 'emms-source-file)
+            (require 'emms-source-playlist)
+            (require 'emms-player-simple)
+            (require 'emms-player-mplayer)
+            (require 'emms-playlist-mode)
+            (require 'emms-info)
+            (require 'emms-info-mp3info)
+            (require 'emms-info-ogginfo)
+            (require 'emms-info-opusinfo)
+            (require 'emms-cache)
+            (require 'emms-mode-line)
+            (require 'emms-mark)
+            (require 'emms-tag-editor)
+            (require 'emms-show-all)
+            (require 'emms-streams)
+            (require 'emms-playing-time)
+            (require 'emms-player-mpd)
+            (require 'emms-playlist-sort)
+            (require 'emms-browser)
+            (require 'emms-mode-line-icon)
+            (require 'emms-cue)
+            (require 'emms-bookmarks)
+            (require 'emms-last-played)
+            (require 'emms-metaplaylist-mode)
+            (require 'emms-stream-info)
+            (require 'emms-score)
+            (require 'emms-history)
+            (require 'emms-i18n)
+            (require 'emms-volume)
+            (require 'emms-playlist-limit)
+
+            (add-to-list 'emms-track-initialize-functions
+                         'emms-info-initialize-track)
+
+            (if (require 'emms-info-mediainfo nil 'no-error)
+                (setq emms-info-functions '(emms-info-mediainfo))
+              (when (executable-find emms-info-mp3info-program-name)
+                (add-to-list 'emms-info-functions 'emms-info-mp3info))
+              (when (executable-find emms-info-ogginfo-program-name)
+                (add-to-list 'emms-info-functions 'emms-info-ogginfo))
+              (when (executable-find emms-info-opusinfo-program-name)
+                (add-to-list 'emms-info-functions 'emms-info-opusinfo))
+              (add-to-list 'emms-info-functions 'emms-info-cueinfo))
+
+            (when (fboundp 'emms-cache) ; work around compiler warning
+              (emms-cache 1))
+            (emms-mode-line -1)
+            (emms-playing-time 1)
+
+            (emms-score 1)
+            (emms-playlist-limit 1)
+
+            (add-hook 'emms-player-started-hook 'emms-last-played-update-current)
+            (add-hook 'emms-player-started-hook 'emms-show)
 
             (advice-add 'emms-tag-editor-submit
                         :after (lambda (&rest r)
                                  (ignore r)
                                  (delete-window)))
 
-            (add-hook 'emms-player-started-hook 'emms-show)
-
-            (when (require 'emms-info-mediainfo nil 'no-error)
-              (setq emms-info-functions '(emms-info-mediainfo)))
-
-            (emms-mode-line -1)
-            (emms-playing-time-enable-display)
-
-            (run-with-timer 0 3600 #'emms-cache-save)
-
             (unless (eq system-type 'windows-nt)
               (setq emms-source-file-directory-tree-function
                     #'db/emms-source-file-directory-tree-find))
@@ -1639,13 +1683,15 @@ are assumed to be of the form *.crt."
             (add-hook 'emms-playlist-mode-hook
                       (lambda ()
                         (setq emms-playlist-insert-track-function
-                              #'db/emms-playlist-mode-insert-track)))))
+                              #'db/emms-playlist-mode-insert-track)))
+
+            (run-with-timer 0 3600 #'emms-cache-save)))
 
 ;; Make sure emms is up and running when we call functions such as
 ;; `emms-play-dired’ etc.
 (use-package emms-source-file
   :defer t
-  :config (require 'emms-setup))
+  :config (require 'emms))
 
 (use-package db-emms
   :commands (db/play-playlist
@@ -1661,7 +1707,7 @@ are assumed to be of the form *.crt."
                                           helm-source-emms-dired
                                           helm-source-emms-files))
   :config (progn
-            (require 'emms-setup)
+            (require 'emms)
             (require 'helm-adaptive)))