diff options
author | Lars-Dominik Braun <PromyLOPh@gmail.com> | 2008-06-21 15:49:37 +0200 |
---|---|---|
committer | Lars-Dominik Braun <PromyLOPh@gmail.com> | 2008-06-21 15:49:37 +0200 |
commit | 010a7e653489ddbd4be190547c3f176639381ed9 (patch) | |
tree | f208db33c8e725ff54a41f3364b2ba52f342f091 /src | |
parent | a6ac279068bbe315b5f768d43e61e8ce06b5304c (diff) | |
download | pianobar-010a7e653489ddbd4be190547c3f176639381ed9.tar.gz pianobar-010a7e653489ddbd4be190547c3f176639381ed9.tar.bz2 pianobar-010a7e653489ddbd4be190547c3f176639381ed9.zip |
client: Some cleanup
Now unneeded header, linebreaks
Diffstat (limited to 'src')
-rw-r--r-- | src/main.c | 1 | ||||
-rw-r--r-- | src/player.c | 7 | ||||
-rw-r--r-- | src/player.h | 1 |
3 files changed, 5 insertions, 4 deletions
@@ -27,7 +27,6 @@ THE SOFTWARE. #include <stdlib.h> #include <string.h> #include <stdio.h> -#include <neaacdec.h> #include <pthread.h> #include <unistd.h> #include <poll.h> diff --git a/src/player.c b/src/player.c index 3a7aa25..a969245 100644 --- a/src/player.c +++ b/src/player.c @@ -123,8 +123,8 @@ size_t playCurlCb (void *ptr, size_t size, size_t nmemb, void *stream) { &player->channels); player->bufferRead += 5; if (err != 0) { - printf ("Error while initializing audio decoder (%i)\n", - err); + printf ("Error while initializing audio decoder" + "(%i)\n", err); return 1; } audioOutDriver = ao_default_driver_id(); @@ -159,7 +159,8 @@ size_t playCurlCb (void *ptr, size_t size, size_t nmemb, void *stream) { /* how many frames do we have? */ if (player->sampleSizeN == 0) { /* mp4 uses big endian, convert */ - player->sampleSizeN = changeByteorderUI32 (player->buffer + + player->sampleSizeN = + changeByteorderUI32 (player->buffer + player->bufferRead); player->sampleSize = calloc (player->sampleSizeN, sizeof (player->sampleSizeN)); diff --git a/src/player.h b/src/player.h index 2e36c11..04275a9 100644 --- a/src/player.h +++ b/src/player.h @@ -49,3 +49,4 @@ struct aacPlayer { }; void *threadPlayUrl (void *data); + |