From c9e23f4e29f08fc53b2306311fa70b1cf4b78b0c Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <PromyLOPh@lavabit.com>
Date: Sun, 1 Feb 2009 13:35:50 +0100
Subject: mp3 playback support

Now libfaad and/or libmad are used for playback. There's currently no
remaining time displayed for mp3 playback.
---
 src/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index b44330a..33ece10 100644
--- a/src/main.c
+++ b/src/main.c
@@ -52,7 +52,7 @@ inline float BarSamplesToSeconds (float samplerate, float channels,
 
 int main (int argc, char **argv) {
 	PianoHandle_t ph;
-	struct aacPlayer player;
+	static struct audioPlayer player;
 	BarSettings_t settings;
 	PianoSong_t *curSong = NULL;
 	PianoStation_t *curStation = NULL;
@@ -165,7 +165,7 @@ int main (int argc, char **argv) {
 					BarUiMsg ("Receiving new playlist... ");
 					PianoDestroyPlaylist (&ph);
 					if (BarUiPrintPianoStatus (PianoGetPlaylist (&ph,
-							curStation->id, PIANO_AF_AACPLUS)) !=
+							curStation->id, settings.audioFormat)) !=
 							PIANO_RET_OK) {
 						curStation = NULL;
 					} else {
@@ -198,6 +198,7 @@ int main (int argc, char **argv) {
 					memset (&player, 0, sizeof (player));
 					player.url = strdup (curSong->audioUrl);
 					player.gain = curSong->fileGain;
+					player.audioFormat = curSong->audioFormat;
 		
 					/* start player */
 					pthread_create (&playerThread, NULL, BarPlayerThread,
-- 
cgit v1.2.3