diff options
| author | Michał Cichoń <michcic@gmail.com> | 2018-10-30 13:12:47 +0100 |
|---|---|---|
| committer | Michał Cichoń <michcic@gmail.com> | 2018-10-30 13:12:47 +0100 |
| commit | cb6789b17f81d29c6884c27715c705083e09a5db (patch) | |
| tree | d6a47c38ff7dcb937992b15dc3c2d051bb877ac8 /contrib | |
| parent | cd5c65097ecf03480f477e47e0bb706dbf705a21 (diff) | |
| parent | 82a13ad77bfcf2c6dc37fe0d1d55f93372db6509 (diff) | |
| download | pianobar-windows-master.tar.gz pianobar-windows-master.tar.bz2 pianobar-windows-master.zip | |
Merge branch 'release/2018.10.30'HEAD2018.10.30master
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/config-example | 10 | ||||
| -rwxr-xr-x | contrib/eventcmd-examples/multi.sh | 14 | ||||
| -rw-r--r-- | contrib/pianobar.1 | 29 |
3 files changed, 41 insertions, 12 deletions
diff --git a/contrib/config-example b/contrib/config-example index 0a69526..0229595 100644 --- a/contrib/config-example +++ b/contrib/config-example @@ -46,19 +46,19 @@ #event_command = /home/user/.config/pianobar/eventcmd #fifo = /tmp/pianobar #sort = quickmix_10_name_az -#love_icon = [+] -#ban_icon = [-] #volume = 0 #ca_bundle = /etc/ssl/certs/ca-certificates.crt #gain_mul = 1.0 # Format strings #format_nowplaying_song = [32m%t[0m by [34m%a[0m on %l[31m%r[0m%@%s +#format_nowplaying_song = [32m%t[0m by [34m%a[0m on %l%r%@%s +#ban_icon = [32m</3[0m +#love_icon = [31m<3[0m +#tired_icon = [33mzZ[0m #format_nowplaying_station = Station [35m%n[0m -#format_list_song = %i) %a - %t%r +#format_list_song = %i) %a - %t%r (%d)%@%s -# high-quality audio (192k mp3, for Pandora One subscribers only!) -#audio_quality = high #rpc_host = internal-tuner.pandora.com #partner_user = pandora one #partner_password = TVCKIBGS9AO9TSYLNNFUML0743LH82D diff --git a/contrib/eventcmd-examples/multi.sh b/contrib/eventcmd-examples/multi.sh index 4aa66a8..32d62b8 100755 --- a/contrib/eventcmd-examples/multi.sh +++ b/contrib/eventcmd-examples/multi.sh @@ -1,7 +1,17 @@ #!/bin/bash # -# Executes all scripts located in ~/.config/pianobar/eventcmd.d/ as if they -# were called by pianobar directly +# Usage +# ===== +# +# Set +# +# event_command = /path/to/multi.sh +# +# in pianobar’s config file. Then create the directory +# ~/.config/pianobar/eventcmd.d/, move your eventcmd scripts there and make +# them executable (chmod +x). They will be run in an unspecified order the same +# way the would have been run if pianobar called them directly (i.e. using +# event_command). STDIN=`mktemp ${TMPDIR:-/tmp}/pianobar.XXXXXX` cat >> $STDIN diff --git a/contrib/pianobar.1 b/contrib/pianobar.1 index bf385f6..9219a99 100644 --- a/contrib/pianobar.1 +++ b/contrib/pianobar.1 @@ -196,7 +196,7 @@ or the key you defined in .B act_songinfo. .TP -.B ban_icon = </3 +.B ban_icon = </3 Icon for banned songs. .TP @@ -255,6 +255,17 @@ Song title .B %r Rating icon +.B %d +Song duration + +.B %@ + +The at_icon + +.B %s + +Song’s station, if not the current station. + .TP .B format_msg_none = %s .TQ @@ -287,7 +298,7 @@ Song artist Album name .B %r -Rating icon (only love icon) +Rating icon .B %@ .B at_icon @@ -320,12 +331,12 @@ of gain adjustment. Keep a history of the last n songs (5, by default). You can rate these songs. .TP -.B love_icon = <3 +.B love_icon = <3 Icon for loved songs. .TP -.B max_player_errors = 5 -Amount of song download errors in a row after pianobar stops playback. +.B max_retry = 3 +Max failures for several actions before giving up. .TP .B partner_password = AC7IBG09A3DTSYM4R41UJWL07VLN8JI7 @@ -361,6 +372,14 @@ sorts by name from a to z, quickmix_01_name_za by type (quickmix at the bottom) and name from z to a. .TP +.B timeout = 30 +Network operation timeout. + +.TP +.B tired_icon = zZ +Icon for temporarily suspended songs. + +.TP .B user = your@user.name Your pandora.com username. |