diff options
-rw-r--r-- | .config/mpd/mpd.conf | 25 | ||||
-rwxr-xr-x | .local/bin/conky/cover.sh | 11 |
2 files changed, 19 insertions, 17 deletions
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 667ab82..7ab1830 100644 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -83,8 +83,7 @@ group "r_bousset" # # For network # bind_to_address "any" -bind_to_address "localhost" -# bind_to_address "192.168.1.79" +bind_to_address "127.0.0.1" # # And for Unix Socket bind_to_address "~/.local/share/mpd/socket" @@ -128,7 +127,7 @@ auto_update "yes" # Limit the depth of the directories being watched, 0 means only watch # the music directory itself. There is no limit by default. # -auto_update_depth "5" +auto_update_depth "10" # ############################################################################### @@ -220,14 +219,14 @@ auto_update_depth "5" # # An example of an OSS output: # -audio_output { - type "oss" - name "My OSS Device" - #device "/dev/dsp" # optional - mixer_type "software" # optional - #mixer_device "/dev/mixer" # optional - #mixer_control "vol" # optional -} +# audio_output { +# type "oss" +# name "My OSS Device" +# #device "/dev/dsp" # optional +# mixer_type "software" # optional +# #mixer_device "/dev/mixer" # optional +# #mixer_control "vol" # optional +# } #audio_output { # type "fifo" @@ -293,10 +292,12 @@ audio_output { # server "remote_server" # optional # sink "remote_server_sink" # optional } + # pipewire + audio_output { type "pipewire" - name "My Pulse Output" + name "My Pipewire Output" # server "remote_server" # optional # sink "remote_server_sink" # optional } diff --git a/.local/bin/conky/cover.sh b/.local/bin/conky/cover.sh index ffdd403..c9fba97 100755 --- a/.local/bin/conky/cover.sh +++ b/.local/bin/conky/cover.sh @@ -13,7 +13,7 @@ # API Key for Last.fm # APIKEY="b25b959554ed76058ac220b7b2e0a026" # Log file, only for debugging purposes -LOG=/tmp/conky-mpd.log +# LOG=/tmp/conky-mpd.log TMP=/tmp/conkympd.tmp # Check for vital commands @@ -24,17 +24,17 @@ TMP=/tmp/conkympd.tmp # [ ! -d "$CACHE" ] && mkdir -p "$CACHE" playing="$(mpc --format '%artist% - %album%' | head -1)" -filedir="$(dirname "$XDG_MUSIC_DIR/$(mpc --format %file% | head -n1)")" [ ! -f $TMP ] && touch $TMP -[ "$(cat $TMP)" == "$playing" ] && exit 0 -# [ "$(cat $TMP)" == "$playing" ] && echo "Same artist/album" >> $LOG && exit 0 +[ "$(cat $TMP)" = "$playing" ] && exit 0 +# [ "$(cat $TMP)" = "$playing" ] && echo "Same artist/album" >> $LOG && exit 0 # echo "Artist/album changed: $playing" >> $LOG #[ -f "/tmp/conkyCover.png" ] && rm "/tmp/conkyCover.png" -cp $HOME/.config/conky-mpd/nocover.png /tmp/conkyCover.png +cp "$HOME"/.config/conky-mpd/nocover.png /tmp/conkyCover.png # echo "NoCover" >> $LOG +filedir="$(dirname "$XDG_MUSIC_DIR/$(mpc --format %file% | head -n1)")" coverfile="$(find "$filedir" -maxdepth 1 -type f \( -iname 'cover.jpg' -o -iname 'cover.png' -o -iname 'folder.jpg' -o -iname 'folder.png' -o -iname '*.jpg' -o -iname '*.png' \) -print -quit)" #COVER="$CACHE/$ARTIST - $ALBUM.jpg" ## Is cover cached? @@ -60,6 +60,7 @@ coverfile="$(find "$filedir" -maxdepth 1 -type f \( -iname 'cover.jpg' -o -iname #convert /tmp/cover.png $HOME/.config/conky-mpd/case.png -composite /tmp/cover.png >> $LOG ## Resize for immediate use # convert /tmp/cover.png -resize 120 /tmp/conkyCover.png >> $LOG +echo "$coverfile" >/tmp/asd convert "$coverfile" -resize 100 /tmp/conkyCover.png # >> $LOG ## Set current artist echo "$playing" > $TMP |