mpc: old tidal code removed

3 files changed, 21 insertions, 21 deletions

diff --git a/attic/elisp/misc.el b/attic/elisp/misc.el
index 534c38a..dc3a76c 100644
--- a/attic/elisp/misc.el
+++ b/attic/elisp/misc.el
@@ -776,6 +776,26 @@
            (enwc-display-mode-line nil)))
 
 
+;;; tidal/mpc
+(defconst jao-mpc--search-cmd
+  "-f '%%album%% - %%artist%% :::%%file%%' search %s '%s'|grep :::tidal:album")
+
+(defun jao-mpc--search-albums (query)
+  (let* ((cmd (format jao-mpc--search-cmd "any" query))
+         (str (jao-mpc--cmd cmd))
+         (res (split-string str "\n" t)))
+    (message "%s" str)
+    (mapcar (lambda (s) (split-string s ":::" t " ")) res)))
+
+(defun jao-mpc-select-tidal-album (&optional query port)
+  (interactive "sSearch terms: ")
+  (let* ((jao-mpc-port (or port jao-mpc-port))
+         (resa (jao-mpc--search-albums query)))
+    (if (null resa)
+        (user-error "No results")
+      (when-let* ((a (completing-read "Play album: " resa nil t))
+                  (s (car (alist-get a resa nil nil 'string=))))
+        (jao-mpc--add-and-play s port t)))))
 ;;; snippets
 (defun jao-sway-run-or-focus-tidal ()
   (interactive)
diff --git a/init.el b/init.el
index a155dcd..fa075be 100644
--- a/init.el
+++ b/init.el
@@ -2959,7 +2959,7 @@
    ["Seek and search"
     ("f" "seek fwd" jao-player-seek-10 :transient t)
     ("F" "seek bwd" jao-player-seek--10 :transient t)
-    ("a" "search album" jao-mpc-search-and-select-album)
+    ("a" "search album" jao-mpc-select-album)
     ("S" "play stream" jao-mpc-play-stream)]
    ["Browse"
     ("b" "browse" jao-player-browse)
diff --git a/lib/media/jao-mpc.el b/lib/media/jao-mpc.el
index 74f9b5b..4aef47d 100644
--- a/lib/media/jao-mpc.el
+++ b/lib/media/jao-mpc.el
@@ -323,25 +323,5 @@
     (when-let (album (completing-read "Play album: " albums nil t))
       (jao-mpc--add-and-play (car (split-string album "-" t " ")) port))))
 
-(defconst jao-mpc--search-cmd
-  "-f '%%album%% - %%artist%% :::%%file%%' search %s '%s'|grep :::tidal:album")
-
-(defun jao-mpc--search-albums (query)
-  (let* ((cmd (format jao-mpc--search-cmd "any" query))
-         (str (jao-mpc--cmd cmd))
-         (res (split-string str "\n" t)))
-    (mapcar (lambda (s) (split-string s ":::" t " ")) res)))
-
-;;;###autoload
-(defun jao-mpc-search-and-select-album (&optional query port)
-  (interactive "sSearch terms: ")
-  (let* ((jao-mpc-port (or port jao-mpc-port))
-         (resa (jao-mpc--search-albums query)))
-    (if (null resa)
-        (user-error "No results")
-      (when-let* ((a (completing-read "Play album: " resa nil t))
-                  (s (car (alist-get a resa nil nil 'string=))))
-        (jao-mpc--add-and-play s port t)))))
-
 (provide 'jao-mpc)
 ;;; jao-mpc.el ends here