From 524abb97453f2140fcd3a7fa66d9d43851af19e1 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 6 Jun 2012 21:13:43 +0200 Subject: piano: Select quality instead of audio format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pandora limited the audio formats we can request explicitly. Don’t rely on this and use the formats available with the given partner credentials. Closes #271. --- src/settings.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'src/settings.c') diff --git a/src/settings.c b/src/settings.c index 3541e28..058c3a7 100644 --- a/src/settings.c +++ b/src/settings.c @@ -121,13 +121,7 @@ void BarSettingsRead (BarSettings_t *settings) { sizeof (dispatchActions) / sizeof (*dispatchActions)); /* apply defaults */ - #ifdef ENABLE_FAAD - settings->audioFormat = PIANO_AF_AACPLUS; - #else - #ifdef ENABLE_MAD - settings->audioFormat = PIANO_AF_MP3; - #endif - #endif + settings->audioQuality = PIANO_AQ_HIGH; settings->autoselect = true; settings->history = 5; settings->volume = 0; @@ -226,15 +220,13 @@ void BarSettingsRead (BarSettings_t *settings) { break; } } - } else if (streq ("audio_format", key)) { - if (streq (val, "aacplus")) { - settings->audioFormat = PIANO_AF_AACPLUS; - } else if (streq (val, "aacplus-lofi")) { - settings->audioFormat = PIANO_AF_AACPLUS_LO; - } else if (streq (val, "mp3")) { - settings->audioFormat = PIANO_AF_MP3; - } else if (streq (val, "mp3-hifi")) { - settings->audioFormat = PIANO_AF_MP3_HI; + } else if (streq ("audio_quality", key)) { + if (streq (val, "low")) { + settings->audioQuality = PIANO_AQ_LOW; + } else if (streq (val, "medium")) { + settings->audioQuality = PIANO_AQ_MEDIUM; + } else if (streq (val, "high")) { + settings->audioQuality = PIANO_AQ_HIGH; } } else if (streq ("autostart_station", key)) { settings->autostartStation = strdup (val); -- cgit v1.2.3