diff options
author | Michał Cichoń <michcic@gmail.com> | 2017-05-18 18:25:59 +0200 |
---|---|---|
committer | Michał Cichoń <michcic@gmail.com> | 2017-05-18 18:25:59 +0200 |
commit | cd5c65097ecf03480f477e47e0bb706dbf705a21 (patch) | |
tree | 21f4419d9dceae3226286585b8b5ca87ea1934ce /contrib | |
parent | 6dee813dad2dd0b741025be046dfe3c7019bddb9 (diff) | |
parent | 593b2d6f18eb21309b82f7cad4a56f7bb1218180 (diff) | |
download | pianobar-windows-cd5c65097ecf03480f477e47e0bb706dbf705a21.tar.gz pianobar-windows-cd5c65097ecf03480f477e47e0bb706dbf705a21.tar.bz2 pianobar-windows-cd5c65097ecf03480f477e47e0bb706dbf705a21.zip |
Merge branch 'release/2017.05.18'2017.05.18
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/config-example | 2 | ||||
-rwxr-xr-x | contrib/eventcmd-examples/eventcmd.sh | 2 | ||||
-rw-r--r-- | contrib/pianobar.1 | 25 |
3 files changed, 22 insertions, 7 deletions
diff --git a/contrib/config-example b/contrib/config-example index 899ee39..0a69526 100644 --- a/contrib/config-example +++ b/contrib/config-example @@ -10,6 +10,7 @@ # Proxy (for those who are not living in the USA) #control_proxy = http://127.0.0.1:9090/ +#bind_to = if!tun0 # Keybindings #act_help = ? @@ -49,6 +50,7 @@ #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 diff --git a/contrib/eventcmd-examples/eventcmd.sh b/contrib/eventcmd-examples/eventcmd.sh index 7e2872a..233b52e 100755 --- a/contrib/eventcmd-examples/eventcmd.sh +++ b/contrib/eventcmd-examples/eventcmd.sh @@ -11,7 +11,7 @@ case "$1" in # songstart) # echo 'naughty.notify({title = "pianobar", text = "Now playing: ' "$title" ' by ' "$artist" '"})' | awesome-client - -# echo "$title -- $artist" > $HOME/.config/pianobar/nowplaying +# echo "$title -- $artist" > "${XDG_HOME_CONFIG:-${HOME}/.config}/pianobar/nowplaying" # if [ "$rating" -eq 1 ] # then diff --git a/contrib/pianobar.1 b/contrib/pianobar.1 index ee09c41..bf385f6 100644 --- a/contrib/pianobar.1 +++ b/contrib/pianobar.1 @@ -200,9 +200,20 @@ or the key you defined in Icon for banned songs. .TP -.B ca_bundle +.B bind_to = {if!tunX,host!x.x.x.x,..} +This sets the interface name to use as outgoing network interface. The name can +be an interface name, an IP address, or a host name. (from CURLOPT_INTERFACE) + +It can be used as a replacement for +.B control_proxy +in conjunction with OpenVPN's +option +.B route-nopull. + +.TP +.B ca_bundle = /etc/ssl/certs/ca-certificates.crt Path to CA certifiate bundle, containing the root and intermediate certificates -required to validate Pandora’s SSL certificate. +required to validate Pandora's SSL certificate. .TP .B control_proxy = http://user:password@host:port/ @@ -299,6 +310,12 @@ Station name Station id .TP +.B gain_mul = 1.0 +Pandora sends a ReplayGain value with every song. This sets a multiplier so that the gain adjustment can be +reduced. 0.0 means no gain adjustment, 1.0 means full gain adjustment, values inbetween reduce the magnitude +of gain adjustment. + +.TP .B history = 5 Keep a history of the last n songs (5, by default). You can rate these songs. @@ -344,10 +361,6 @@ 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 tls_fingerprint = D9980BA2CC0F97BB03822C6211EAEA4A06EEF427 -Hex-encoded SHA1 fingerprint of Pandora's TLS certificate. - -.TP .B user = your@user.name Your pandora.com username. |