From 0db33fb84301f3029049cf1b6d6b553221886dc5 Mon Sep 17 00:00:00 2001
From: Daniel Borchmann <daniel@algebra20.de>
Date: Sat, 27 Jan 2018 17:28:20 +0100
Subject: [PATCH] [EMMS] Silence some compiler warnings

---
 init.el              |  9 +++------
 site-lisp/db-emms.el | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/init.el b/init.el
index 98f0bab..6518f91 100644
--- a/init.el
+++ b/init.el
@@ -977,21 +977,18 @@ Certificates are assumed to be of the form *.crt."
 
 ;; * Media
 
-(use-package emms-setup
+(use-package db-emms
   :commands (db/play-playlist
              emms-streams
              emms-play-dired
              emms-play-file
              emms-play-directory
-             emms-control/body)
-  :config (progn
-            (require 'db-emms)
-            (run-with-timer 0 3600 #'emms-cache-save)))
+             emms-control/body))
 
 (use-package helm-emms
   :commands (helm-emms)
   :config (progn
-            (require 'emms-setup)
+            (require 'db-emms)
             (require 'helm-adaptive)
             (setq helm-emms-default-sources
                   '(helm-source-emms-streams
diff --git a/site-lisp/db-emms.el b/site-lisp/db-emms.el
index c98fdc1..072955b 100644
--- a/site-lisp/db-emms.el
+++ b/site-lisp/db-emms.el
@@ -27,21 +27,29 @@
 (declare-function emms-pause "emms")
 (declare-function emms-show "emms")
 (declare-function emms "emms-playlist-mode")
+(declare-function emms-cache-save "emms-cache")
+(declare-function string-remove-prefix "subr-x")
+(declare-function emms-with-inhibit-read-only-t "emms")
 
 
 ;; Setup
 
+(require 'emms)
 (emms-all)
 (emms-default-players)
 
 
 ;; Basic configuration
 
+(require 'emms-source-file)
+(require 'emms-playlist-mode)
+(require 'emms-info)
+
 (setq emms-source-file-default-directory "~/Documents/media/audio/")
 
 (advice-add 'emms-tag-editor-submit
             :after (lambda (&rest r)
-                     (declare (ignore r))
+                     (ignore r)
                      (delete-window)))
 
 (bind-key "S s" #'emms-shuffle emms-playlist-mode-map)
@@ -57,6 +65,8 @@
 (when (require 'emms-info-mediainfo nil 'no-error)
   (setq emms-info-functions '(emms-info-mediainfo)))
 
+(run-with-timer 0 3600 #'emms-cache-save)
+
 
 ;; Custom playlist
 
@@ -102,7 +112,7 @@ that we also follow symbolic links."
                                             (point-max))
                           "\n"))))
 
-(unless on-windows
+(unless (eq system-type 'windows-nt)
   (setq emms-source-file-directory-tree-function
         #'db/emms-source-file-directory-tree-find))
 
@@ -166,6 +176,7 @@ When NO-NEWLINE is non-nil, do not insert a newline after the track."
 
 ;; Streams
 
+(require 'emms-streams)
 (setq emms-stream-default-action "play")