summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLars-Dominik Braun <PromyLOPh@lavabit.com>2009-07-08 20:51:10 +0200
committerLars-Dominik Braun <PromyLOPh@lavabit.com>2009-07-08 20:51:48 +0200
commita195a94be7aa14d839c77275814a52d2ee6b8b6f (patch)
tree912ab804af1ce4db4717c75ea980476f52849255 /src
parent82b49378dfa407673118a8ce2f1c85122ab349d5 (diff)
downloadpianobar-windows-a195a94be7aa14d839c77275814a52d2ee6b8b6f.tar.gz
pianobar-windows-a195a94be7aa14d839c77275814a52d2ee6b8b6f.tar.bz2
pianobar-windows-a195a94be7aa14d839c77275814a52d2ee6b8b6f.zip
Initial pandora one support (higher mp3 bitrates)
Time display should be fixed. I need feedback!
Diffstat (limited to 'src')
-rw-r--r--src/pianobar.18
-rw-r--r--src/settings.c2
2 files changed, 4 insertions, 6 deletions
diff --git a/src/pianobar.1 b/src/pianobar.1
index fdc3b88..434233d 100644
--- a/src/pianobar.1
+++ b/src/pianobar.1
@@ -109,9 +109,9 @@ Show next songs in playlist.
Select quickmix stations.
.TP
-.B audio_format = {aacplus,mp3}
+.B audio_format = {aacplus,mp3,mp3-hifi}
Select audio format. aacplus is default if both libraries (faad, mad) are
-available.
+available. mp3-hifi is available for Pandora One customers only.
.TP
.B autostart_station = stationid
@@ -170,10 +170,6 @@ is the keybinding for "next song". If you customized your keybindings you have t
.B pianobar.
.I This behaviour may change in the future!
-Please note: Commands like "select station" or "delete station" don't make
-sense at the moment, because the expected input is read from stdin, but not
-from the fifo.
-
Another example:
while true; do;
diff --git a/src/settings.c b/src/settings.c
index dfff76b..077be60 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -224,6 +224,8 @@ void BarSettingsRead (BarSettings_t *settings) {
settings->audioFormat = PIANO_AF_AACPLUS;
} else if (strcmp (val, "mp3") == 0) {
settings->audioFormat = PIANO_AF_MP3;
+ } else if (strcmp (val, "mp3-hifi") == 0) {
+ settings->audioFormat = PIANO_AF_MP3_HI;
}
} else if (strcmp ("autostart_station", key) == 0) {
settings->autostartStation = strdup (val);