From 0efea84ffc3c57647a480154e8b54a889e1d1641 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 25 Jun 2021 13:23:50 -0500 Subject: [PATCH] fixing bongo --- README.org | 24 +++++++++--------------- init.el | 24 +++++++++--------------- 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/README.org b/README.org index 3ae26ce1..4bce987f 100644 --- a/README.org +++ b/README.org @@ -1843,23 +1843,12 @@ interfere with the default `bongo-playlist-buffer'." (use-package bongo :commands (bongo bongo-playlist-buffer) :config - (define-bongo-backend mpv-slow - :program-name 'mpv - :constructor 'bongo-start-mpv-player - :extra-program-arguments '("--profile=slow --input-ipc-server=/tmp/mpvsocket") - :matcher '((local-file "file:" "http:" "ftp:" "lbry:") - "ogg" "flac" "mp3" "mka" "wav" - "ogm" "opus" ) - :matcher '(("mms:" "mmst:" "rtp:" "rtsp:" "udp:" "unsv:" - "dvd:" "vcd:" "tv:" "dvb:" "mf:" "cdda:" "cddb:" - "cue:" "sdp:" "mpst:" "tivo:") . t) - :matcher '(("http:" "https:" "lbry:") . t)) - - (define-bongo-backend mpv-fast + (define-bongo-backend mpv :constructor 'bongo-start-mpv-player :extra-program-arguments '("--profile=fast --input-ipc-server=/tmp/mpvsocket") :matcher '((local-file "file:" "http:" "ftp:" "lbry:") - "mka" "wav" "wma" + "mka" "wav" "wma" "ogm" "opus" + "ogg" "flac" "mp3" "mka" "wav" "mpg" "mpeg" "vob" "avi" "ogm" "mp4" "mkv" "mov" "asf" "wmv" "rm" "rmvb" "ts") :matcher '(("mms:" "mmst:" "rtp:" "rtsp:" "udp:" "unsv:" @@ -1867,7 +1856,7 @@ interfere with the default `bongo-playlist-buffer'." "cue:" "sdp:" "mpst:" "tivo:") . t) :matcher '(("http:" "https:" "lbry:") . t)) - (setq bongo-enabled-backends '(mpv-fast mpv-slow) + (setq bongo-enabled-backends '(mpv) bongo-track-mark-icon-file-name "track-mark-icon.png") (defun chris/bongo-mark-line-forward () @@ -1880,6 +1869,10 @@ interfere with the default `bongo-playlist-buffer'." (interactive) (bongo-mpv-player-pause/resume bongo-player)) + (defun chris/bongo-mpv-speed-up () + (interactive) + (bongo--run-mpv-command bongo-player "speed" "set" "speed" "1.95")) + :general (chris/leader-keys :states 'normal @@ -1893,6 +1886,7 @@ interfere with the default `bongo-playlist-buffer'." "P" 'bongo-yank "H" 'bongo-switch-buffers "q" 'bury-buffer + "+" 'chris/bongo-mpv-speed-up "m" 'chris/bongo-mark-line-forward) (general-def 'normal bongo-library-mode-map "RET" 'bongo-dwim diff --git a/init.el b/init.el index 2b67428b..c2b09a7e 100644 --- a/init.el +++ b/init.el @@ -1375,23 +1375,12 @@ interfere with the default `bongo-playlist-buffer'." (use-package bongo :commands (bongo bongo-playlist-buffer) :config - (define-bongo-backend mpv-slow - :program-name 'mpv - :constructor 'bongo-start-mpv-player - :extra-program-arguments '("--profile=slow --input-ipc-server=/tmp/mpvsocket") - :matcher '((local-file "file:" "http:" "ftp:" "lbry:") - "ogg" "flac" "mp3" "mka" "wav" - "ogm" "opus" ) - :matcher '(("mms:" "mmst:" "rtp:" "rtsp:" "udp:" "unsv:" - "dvd:" "vcd:" "tv:" "dvb:" "mf:" "cdda:" "cddb:" - "cue:" "sdp:" "mpst:" "tivo:") . t) - :matcher '(("http:" "https:" "lbry:") . t)) - - (define-bongo-backend mpv-fast + (define-bongo-backend mpv :constructor 'bongo-start-mpv-player :extra-program-arguments '("--profile=fast --input-ipc-server=/tmp/mpvsocket") :matcher '((local-file "file:" "http:" "ftp:" "lbry:") - "mka" "wav" "wma" + "mka" "wav" "wma" "ogm" "opus" + "ogg" "flac" "mp3" "mka" "wav" "mpg" "mpeg" "vob" "avi" "ogm" "mp4" "mkv" "mov" "asf" "wmv" "rm" "rmvb" "ts") :matcher '(("mms:" "mmst:" "rtp:" "rtsp:" "udp:" "unsv:" @@ -1399,7 +1388,7 @@ interfere with the default `bongo-playlist-buffer'." "cue:" "sdp:" "mpst:" "tivo:") . t) :matcher '(("http:" "https:" "lbry:") . t)) - (setq bongo-enabled-backends '(mpv-fast mpv-slow) + (setq bongo-enabled-backends '(mpv) bongo-track-mark-icon-file-name "track-mark-icon.png") (defun chris/bongo-mark-line-forward () @@ -1412,6 +1401,10 @@ interfere with the default `bongo-playlist-buffer'." (interactive) (bongo-mpv-player-pause/resume bongo-player)) + (defun chris/bongo-mpv-speed-up () + (interactive) + (bongo--run-mpv-command bongo-player "speed" "set" "speed" "1.95")) + :general (chris/leader-keys :states 'normal @@ -1425,6 +1418,7 @@ interfere with the default `bongo-playlist-buffer'." "P" 'bongo-yank "H" 'bongo-switch-buffers "q" 'bury-buffer + "+" 'chris/bongo-mpv-speed-up "m" 'chris/bongo-mark-line-forward) (general-def 'normal bongo-library-mode-map "RET" 'bongo-dwim