Skip to content

Commit

Permalink
Upgrade python modules by default in mppinit, document custom mpcplus…
Browse files Browse the repository at this point in the history
… key bindings
  • Loading branch information
doctorfree committed Aug 8, 2022
1 parent 2c84aff commit bb9c1b6
Show file tree
Hide file tree
Showing 9 changed files with 153 additions and 28 deletions.
39 changes: 29 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1257,18 +1257,37 @@ Custom key bindings are also defined for the `mpcplus` music player client comma
Mpcplus custom key bindings are defined in `$HOME/.config/mpcplus/bindings`.
MusicPlayerPlus custom key bindings for `mpcplus` include the following:

- `[ Alt-c ]` - Display album cover art for currently playing song
- `[ Alt-f ]` - Open the fuzzy finder to search/select media
- `[ Alt-r ]` - Raise/lower the spectrum visualizer window
- `[ Alt-1 ]` - Set xfce4-terminal window transparency to 90%
- `[ Alt-2 ]` - Set xfce4-terminal window transparency to 80%
- `[ Alt-3 ]` - Set xfce4-terminal window transparency to 70%
- `[ Alt-4 ]` - Set xfce4-terminal window transparency to 60%
- `[ Alt-5 ]` - Set xfce4-terminal window transparency to 50%
- `[ Alt-6 ]` - Set xfce4-terminal window transparency to 40%
- `[ Alt-7 ]` - Set xfce4-terminal window transparency to 30%
- `[ Alt-8 ]` - Set xfce4-terminal window transparency to 20%
- `[ Alt-9 ]` - Set xfce4-terminal window transparency to 10%
- `[ Alt-0 ]` - Set xfce4-terminal window 100% opaque
- `[ Ctrl-a ]` - Add item to playlist
- `[ Ctrl-b ]` - Page up
- `[ Ctrl-f ]` - Page down
- `[ Ctrl-e ]` - Move to end
- `[ Shift-up ]` - Move selected items up
- `[ Shift-down ]` - Move selected items down
- `[ j ]` - Scroll down
- `[ k ]` - Scroll up
- `[ down ]` - Scroll down
- `[ up ]` - Scroll up
- `[ d ]` - Page down
- `[ u ]` - Page up
- `[ n ]` - Next
- `[ P ]` - Previous
- `[ space ]` - Next
- `[ backspace ]` - Previous
- `[ h ]` - Jump to parent directory
- `[ h ]` - Previous column
- `[ l ]` - Enter directory
- `[ l ]` - Play item
- `[ l ]` - Next column
- `[ l ]` - Run action
- `[ J ]` - Select item
- `[ K ]` - Select item
- `[ t ]` - Move home
- `[ N ]` - Move sort order down
- `[ C ]` - Toggle playing song centering
- `[ * ]` - Toggle visualization type

#### Tmux session exit issues

Expand Down
16 changes: 9 additions & 7 deletions bin/mppinit
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ usage() {
printf "\n\t'-e' use Essentia for Beets acoustic audio analysis (default)"
printf "\n\t'-o' indicates overwrite any pre-existing configuration"
printf "\n\t'-q' indicates quiet execution, no status messages"
printf "\n\t'-U' indicates upgrade installed Python modules if needed"
printf "\n\t'-U' indicates do not upgrade installed Python modules"
printf "\n\t'-y' indicates answer 'yes' to all and proceed"
printf "\n\t'-u' displays this usage message and exits\n"
printf "\n\t'bandcamp' downloads all albums in your Bandcamp collections"
Expand Down Expand Up @@ -323,17 +323,17 @@ acbrainz=
essentia=1
overwrite=
proceed=
upgrade=
upgrade=1
quiet=
beetsdev=
have_bliss=`type -p blissify`
while getopts "abdeoqUyu" flag; do
case $flag in
a)
acbrainz=1
essentia=
;;
b)
have_bliss=`type -p blissify`
if [ "${have_bliss}" ]
then
essentia=
Expand All @@ -358,7 +358,7 @@ while getopts "abdeoqUyu" flag; do
quiet=1
;;
U)
upgrade=1
upgrade=
;;
y)
proceed=1
Expand Down Expand Up @@ -503,10 +503,12 @@ shift $(( OPTIND - 1 ))
printf "\nAfter the Beets Import is complete, update metadata and perform"
printf "\nacoustic analysis and extraction with Essentia by executing:"
printf "\n\t${BOLD}mppinit metadata${NORM}\n"
printf "\nAlternatively, to use Blissify for acoustic metadata analysis:"
printf "\n\t${BOLD}mppinit -b metadata${NORM}\n"
printf "\nor, to use AcousticBrainz for acoustic metadata retrieval:"
printf "\nAlternatively, to use AcousticBrainz for metadata retrieval:"
printf "\n\t${BOLD}mppinit -a metadata${NORM}\n"
[ "${have_bliss}" ] && {
printf "\nTo use Blissify for acoustic metadata analysis:"
printf "\n\t${BOLD}mppinit -b metadata${NORM}\n"
}
printf "\nActivate the YAMS Last.fm scrobbler with the command:"
printf "\n\t${BOLD}mppinit yams${NORM}\n"
visit_wiki
Expand Down
4 changes: 2 additions & 2 deletions config/tmuxp/fzmp-env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ session_name: ${SESSION}
windows:
- window_name: Fuzzy Finder
layout: main-horizontal
options:
main-pane-height: ${MAIN_PANE_HEIGHT}
panes:
- shell_command:
- ${FZFCOMM}; exit
focus: true
- shell_command:
- ${VIZCOMM}; exit
options:
main-pane-height: ${MAIN_PANE_HEIGHT}
66 changes: 66 additions & 0 deletions man/man1/mpcpluskeys.1
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,72 @@
.PP
This man page describes the key bindings used to control the
\f[B]mpcplus\f[R] music player client.
.SH KEYS - CUSTOM
.PP
MusicPlayerPlus provides the following custom \f[I]mpcplus\f[R] key
bindings:
.IP \[bu] 2
\f[V][ Alt-c ]\f[R] - Display album cover art for currently playing song
.IP \[bu] 2
\f[V][ Alt-f ]\f[R] - Open the fuzzy finder to search/select media
.IP \[bu] 2
\f[V][ Alt-r ]\f[R] - Raise/lower the spectrum visualizer window
.IP \[bu] 2
\f[V][ Ctrl-a ]\f[R] - Add item to playlist
.IP \[bu] 2
\f[V][ Ctrl-b ]\f[R] - Page up
.IP \[bu] 2
\f[V][ Ctrl-f ]\f[R] - Page down
.IP \[bu] 2
\f[V][ Ctrl-e ]\f[R] - Move to end
.IP \[bu] 2
\f[V][ Shift-up ]\f[R] - Move selected items up
.IP \[bu] 2
\f[V][ Shift-down ]\f[R] - Move selected items down
.IP \[bu] 2
\f[V][ j ]\f[R] - Scroll down
.IP \[bu] 2
\f[V][ k ]\f[R] - Scroll up
.IP \[bu] 2
\f[V][ down ]\f[R] - Scroll down
.IP \[bu] 2
\f[V][ up ]\f[R] - Scroll up
.IP \[bu] 2
\f[V][ d ]\f[R] - Page down
.IP \[bu] 2
\f[V][ u ]\f[R] - Page up
.IP \[bu] 2
\f[V][ n ]\f[R] - Next
.IP \[bu] 2
\f[V][ P ]\f[R] - Previous
.IP \[bu] 2
\f[V][ space ]\f[R] - Next
.IP \[bu] 2
\f[V][ backspace ]\f[R] - Previous
.IP \[bu] 2
\f[V][ h ]\f[R] - Jump to parent directory
.IP \[bu] 2
\f[V][ h ]\f[R] - Previous column
.IP \[bu] 2
\f[V][ l ]\f[R] - Enter directory
.IP \[bu] 2
\f[V][ l ]\f[R] - Play item
.IP \[bu] 2
\f[V][ l ]\f[R] - Next column
.IP \[bu] 2
\f[V][ l ]\f[R] - Run action
.IP \[bu] 2
\f[V][ J ]\f[R] - Select item
.IP \[bu] 2
\f[V][ K ]\f[R] - Select item
.IP \[bu] 2
\f[V][ t ]\f[R] - Move home
.IP \[bu] 2
\f[V][ N ]\f[R] - Move sort order down
.IP \[bu] 2
\f[V][ C ]\f[R] - Toggle playing song centering
.IP \[bu] 2
\f[V][ * ]\f[R] - Toggle visualization type
.SH KEYS - MOVEMENT
.IP \[bu] 2
\f[V][ Up k ]\f[R] - Move cursor up
Expand Down
2 changes: 1 addition & 1 deletion man/man1/mppinit.1
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ indicates overwrite any pre-existing configuration
indicates quiet execution, no status messages
.TP
\f[B]-U\f[R]
indicates upgrade installed Python modules if needed
indicates do not upgrade installed Python modules
.TP
\f[B]-y\f[R]
indicates answer \[aq]yes\[aq] to all and proceed
Expand Down
36 changes: 36 additions & 0 deletions markdown/mpcpluskeys.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,42 @@ date: March 24, 2022
This man page describes the key bindings used to control
the **mpcplus** music player client.

# KEYS - CUSTOM

MusicPlayerPlus provides the following custom *mpcplus* key bindings:

- `[ Alt-c ]` - Display album cover art for currently playing song
- `[ Alt-f ]` - Open the fuzzy finder to search/select media
- `[ Alt-r ]` - Raise/lower the spectrum visualizer window
- `[ Ctrl-a ]` - Add item to playlist
- `[ Ctrl-b ]` - Page up
- `[ Ctrl-f ]` - Page down
- `[ Ctrl-e ]` - Move to end
- `[ Shift-up ]` - Move selected items up
- `[ Shift-down ]` - Move selected items down
- `[ j ]` - Scroll down
- `[ k ]` - Scroll up
- `[ down ]` - Scroll down
- `[ up ]` - Scroll up
- `[ d ]` - Page down
- `[ u ]` - Page up
- `[ n ]` - Next
- `[ P ]` - Previous
- `[ space ]` - Next
- `[ backspace ]` - Previous
- `[ h ]` - Jump to parent directory
- `[ h ]` - Previous column
- `[ l ]` - Enter directory
- `[ l ]` - Play item
- `[ l ]` - Next column
- `[ l ]` - Run action
- `[ J ]` - Select item
- `[ K ]` - Select item
- `[ t ]` - Move home
- `[ N ]` - Move sort order down
- `[ C ]` - Toggle playing song centering
- `[ * ]` - Toggle visualization type

# KEYS - MOVEMENT

- `[ Up k ]` - Move cursor up
Expand Down
2 changes: 1 addition & 1 deletion markdown/mppinit.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ library location across all configuration files.
: indicates quiet execution, no status messages

**-U**
: indicates upgrade installed Python modules if needed
: indicates do not upgrade installed Python modules

**-y**
: indicates answer 'yes' to all and proceed
Expand Down
2 changes: 2 additions & 0 deletions mpcplus/doc/bindings
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,8 @@
#
## MusicPlayerPlus custom mpcplus key bindings
#
def_key "alt-c"
run_external_command "/usr/bin/mppcover"
def_key "alt-f"
run_external_command "/usr/bin/mppfzmp"
def_key "alt-r"
Expand Down
14 changes: 7 additions & 7 deletions mpcplus/doc/config
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,20 @@ mpd_music_dir = ~/Music
## visualizer.
##
#
visualizer_data_source = ~/.config/mpd/mpd.fifo
#visualizer_data_source = ~/.config/mpd/mpd.fifo
#
##
## Note: Below parameter is needed for mpcplus to determine which output
## provides data for visualizer and reset it at the beginning of visualization
## to synchronize with audio.
##
#
visualizer_output_name = Visualizer feed
#visualizer_output_name = Visualizer feed
#
##
## If you set format to 44100:16:2, make it 'yes'.
##
visualizer_in_stereo = yes
#visualizer_in_stereo = yes
#
##
## Note: To enable spectrum frequency visualization you need to compile mpcplus
Expand All @@ -94,21 +94,21 @@ visualizer_in_stereo = yes
#
## Available values: spectrum, wave, wave_filled, ellipse.
##
visualizer_type = spectrum
#visualizer_type = spectrum
#
#visualizer_fps = 60
#
#visualizer_autoscale = no
#
#visualizer_look = ●▮
#visualizer_look = "||"
visualizer_look = "+|"
#visualizer_look = "+|"
#
#visualizer_color = blue, cyan, green, yellow, magenta, red
#
## Alternative subset of 256 colors for terminals that support it.
##
visualizer_color = 47, 83, 119, 155, 191, 227, 221, 215, 209, 203, 197, 161
#visualizer_color = 47, 83, 119, 155, 191, 227, 221, 215, 209, 203, 197, 161
#
##
## Note: The next few visualization options apply to the spectrum visualizer.
Expand All @@ -119,7 +119,7 @@ visualizer_color = 47, 83, 119, 155, 191, 227, 221, 215, 209, 203, 197, 161
## and visualizer_in_stereo set, artifacts may be visible on the bottom half of
## the visualization.
#
visualizer_spectrum_smooth_look = no
#visualizer_spectrum_smooth_look = no
#
## A value between 1 and 5 inclusive. Specifying a larger value makes the
## visualizer look at a larger slice of time, which results in less jumpy
Expand Down

0 comments on commit bb9c1b6

Please sign in to comment.