chris/emacs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:chriscochrun/dotemacs

Browse source
This commit is contained in:
Chris Cochrun 2021-07-05 13:26:27 -05:00
parent 964f2aedb7 0efea84ffc
commit 76f8758df5
2 changed files with 67 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
README.org
View file

@ -1859,25 +1859,14 @@ interfere with the default `bongo-playlist-buffer'."
(use-package bongo (use-package bongo
:commands (bongo bongo-playlist-buffer) :commands (bongo bongo-playlist-buffer)
:config :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 (define-bongo-backend mpv
:constructor 'bongo-start-mpv-player :constructor 'bongo-start-mpv-player
:program-name 'mpv :program-name 'mpv
:extra-program-arguments '("--profile=fast --input-ipc-server=/tmp/mpvsocket") :extra-program-arguments '("--profile=fast --input-ipc-server=/tmp/mpvsocket")
:matcher '((local-file "file:" "http:" "ftp:" "lbry:") :matcher '((local-file "file:" "http:" "ftp:" "lbry:")
"wma" "ogg" "flac" "mp3" "mka" "wav" "mka" "wav" "wma" "ogm" "opus"
"mpg" "mpeg" "vob" "avi" "ogm" "opus" "mp4" "ogg" "flac" "mp3" "mka" "wav"
"mpg" "mpeg" "vob" "avi" "ogm" "mp4"
"mkv" "mov" "asf" "wmv" "rm" "rmvb" "ts") "mkv" "mov" "asf" "wmv" "rm" "rmvb" "ts")
:matcher '(("mms:" "mmst:" "rtp:" "rtsp:" "udp:" "unsv:" :matcher '(("mms:" "mmst:" "rtp:" "rtsp:" "udp:" "unsv:"
"dvd:" "vcd:" "tv:" "dvb:" "mf:" "cdda:" "cddb:" "dvd:" "vcd:" "tv:" "dvb:" "mf:" "cdda:" "cddb:"
@ -1897,6 +1886,10 @@ interfere with the default `bongo-playlist-buffer'."
(interactive) (interactive)
(bongo-mpv-player-pause/resume bongo-player)) (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 :general
(chris/leader-keys (chris/leader-keys
:states 'normal :states 'normal
@ -1910,6 +1903,7 @@ interfere with the default `bongo-playlist-buffer'."
"P" 'bongo-yank "P" 'bongo-yank
"H" 'bongo-switch-buffers "H" 'bongo-switch-buffers
"q" 'bury-buffer "q" 'bury-buffer
"+" 'chris/bongo-mpv-speed-up
"m" 'chris/bongo-mark-line-forward) "m" 'chris/bongo-mark-line-forward)
(general-def 'normal bongo-library-mode-map (general-def 'normal bongo-library-mode-map
"RET" 'bongo-dwim "RET" 'bongo-dwim

26
init.el
View file

@ -65,7 +65,7 @@
;; ...especially on linux ;; ...especially on linux
(setq x-gtk-use-system-tooltips nil) (setq x-gtk-use-system-tooltips nil)
;; Favor vertical splits over horizontal ones. Screens are usually wide. ;; Favor vertical splits over horizontal ones. Screens are usually wide.
(setq split-width-threshold 160 (setq split-width-threshold 160
split-height-threshold nil) split-height-threshold nil)
@ -99,7 +99,7 @@
(straight-use-package 'use-package) (straight-use-package 'use-package)
(setq use-package-verbose t) (setq use-package-verbose t)
(use-package command-log-mode (use-package command-log-mode
:commands command-log-mode) :commands command-log-mode)
(use-package all-the-icons) (use-package all-the-icons)
@ -1392,25 +1392,14 @@ interfere with the default `bongo-playlist-buffer'."
(use-package bongo (use-package bongo
:commands (bongo bongo-playlist-buffer) :commands (bongo bongo-playlist-buffer)
:config :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 (define-bongo-backend mpv
:constructor 'bongo-start-mpv-player :constructor 'bongo-start-mpv-player
:program-name 'mpv :program-name 'mpv
:extra-program-arguments '("--profile=fast --input-ipc-server=/tmp/mpvsocket") :extra-program-arguments '("--profile=fast --input-ipc-server=/tmp/mpvsocket")
:matcher '((local-file "file:" "http:" "ftp:" "lbry:") :matcher '((local-file "file:" "http:" "ftp:" "lbry:")
"wma" "ogg" "flac" "mp3" "mka" "wav" "mka" "wav" "wma" "ogm" "opus"
"mpg" "mpeg" "vob" "avi" "ogm" "opus" "mp4" "ogg" "flac" "mp3" "mka" "wav"
"mpg" "mpeg" "vob" "avi" "ogm" "mp4"
"mkv" "mov" "asf" "wmv" "rm" "rmvb" "ts") "mkv" "mov" "asf" "wmv" "rm" "rmvb" "ts")
:matcher '(("mms:" "mmst:" "rtp:" "rtsp:" "udp:" "unsv:" :matcher '(("mms:" "mmst:" "rtp:" "rtsp:" "udp:" "unsv:"
"dvd:" "vcd:" "tv:" "dvb:" "mf:" "cdda:" "cddb:" "dvd:" "vcd:" "tv:" "dvb:" "mf:" "cdda:" "cddb:"
@ -1430,6 +1419,10 @@ interfere with the default `bongo-playlist-buffer'."
(interactive) (interactive)
(bongo-mpv-player-pause/resume bongo-player)) (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 :general
(chris/leader-keys (chris/leader-keys
:states 'normal :states 'normal
@ -1443,6 +1436,7 @@ interfere with the default `bongo-playlist-buffer'."
"P" 'bongo-yank "P" 'bongo-yank
"H" 'bongo-switch-buffers "H" 'bongo-switch-buffers
"q" 'bury-buffer "q" 'bury-buffer
"+" 'chris/bongo-mpv-speed-up
"m" 'chris/bongo-mark-line-forward) "m" 'chris/bongo-mark-line-forward)
(general-def 'normal bongo-library-mode-map (general-def 'normal bongo-library-mode-map
"RET" 'bongo-dwim "RET" 'bongo-dwim