summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Dominik Braun <PromyLOPh@lavabit.com>2009-02-01 13:40:54 +0100
committerLars-Dominik Braun <PromyLOPh@lavabit.com>2009-02-01 13:40:54 +0100
commit0e6ebd5dd953126ccf9d1afdf24059a4f9e90a25 (patch)
treef964ffe5068090d20a51a861757b6c69f7d5566c
parentc9e23f4e29f08fc53b2306311fa70b1cf4b78b0c (diff)
downloadpianobar-windows-0e6ebd5dd953126ccf9d1afdf24059a4f9e90a25.tar.gz
pianobar-windows-0e6ebd5dd953126ccf9d1afdf24059a4f9e90a25.tar.bz2
pianobar-windows-0e6ebd5dd953126ccf9d1afdf24059a4f9e90a25.zip
Update manpage
New configuration key: audio_format. Some linebreaks inserted.
-rw-r--r--src/pianobar.126
1 files changed, 19 insertions, 7 deletions
diff --git a/src/pianobar.1 b/src/pianobar.1
index 19c98e3..7ae7371 100644
--- a/src/pianobar.1
+++ b/src/pianobar.1
@@ -22,7 +22,8 @@ Per-user configuration file. See
.SH CONFIGURATION
The configuration file consists of simple
.B key = value
-lines. Each terminated with a newline (\\n) character. Keys and values are both case sensitive. act_*-keys control
+lines. Each terminated with a newline (\\n) character. Keys and values are both
+case sensitive. act_*-keys control
.B pianobar's
key-bindings.
@@ -36,15 +37,18 @@ Love currently played song.
.TP
.B act_songban = -
-Ban current track. It will not be played again and can only removed using the pandora.com web interface.
+Ban current track. It will not be played again and can only removed using the
+pandora.com web interface.
.TP
.B act_stationaddmusic = a
-Add more music to current station. You will be asked for a search string. Just follow the instructions.
+Add more music to current station. You will be asked for a search string. Just
+follow the instructions.
.TP
.B act_stationcreate = c
-Create new station. You have to enter a search string and select the song or artist of your choice.
+Create new station. You have to enter a search string and select the song or
+artist of your choice.
.TP
.B act_stationdelete = d
@@ -100,19 +104,27 @@ Show next songs in playlist.
Select quickmix stations.
.TP
+.B audio_format = {aacplus,mp3}
+Select audio format. aacplus is default if both libraries (faad, mad) are
+available.
+
+.TP
.B control_proxy = host:port
-Non-american users need a proxy to use pandora.com. Only the xmlrpc interface will use this proxy. The music is streamed directly.
+Non-american users need a proxy to use pandora.com. Only the xmlrpc interface
+will use this proxy. The music is streamed directly.
.TP
.B control_proxy_type = {http,socks4,socks4a,socks5}
-If you want to use a proxy you need to specify the proxy type you're going to use. Note that
+If you want to use a proxy you need to specify the proxy type you're going to
+use. Note that
.B socks5
needs an IP address specified in
.B control_proxy
.TP
.B disable_secure_login = {1,0}
-If you have problems when loggin in and you know your control proxy definitively works try setting this option to
+If you have problems when loggin in and you know your control proxy
+definitively works try setting this option to
.B 1.
It disables the SSL secured login. Beware!
.I Your password will be sent as plain-text!