diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/FindFaad.cmake | 6 | ||||
| -rw-r--r-- | src/FindLibAo.cmake | 8 | ||||
| -rw-r--r-- | src/FindMad.cmake | 6 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/player.c | 11 |
5 files changed, 15 insertions, 18 deletions
diff --git a/src/FindFaad.cmake b/src/FindFaad.cmake index 9a8fc57..724b82f 100644 --- a/src/FindFaad.cmake +++ b/src/FindFaad.cmake @@ -1,6 +1,6 @@ -# FAAD_INCLUDE_DIRS - where to find curl/curl.h, etc. -# FAAD_LIBRARIES - List of libraries when using curl. -# FAAD_FOUND - True if curl found. +# FAAD_INCLUDE_DIRS - where to find faad.h, etc. +# FAAD_LIBRARIES - List of libraries when using libfaad. +# FAAD_FOUND - True if libfaad found. # Look for the header file. FIND_PATH(FAAD_INCLUDE_DIR NAMES faad.h) diff --git a/src/FindLibAo.cmake b/src/FindLibAo.cmake index be15975..f026548 100644 --- a/src/FindLibAo.cmake +++ b/src/FindLibAo.cmake @@ -1,8 +1,8 @@ -# - Find readline +# - Find libao # -# LIBAO_INCLUDE_DIRS - where to find curl/curl.h, etc. -# LIBAO_LIBRARIES - List of libraries when using curl. -# LIBAO_FOUND - True if curl found. +# LIBAO_INCLUDE_DIRS - where to find ao/ao.h, etc. +# LIBAO_LIBRARIES - List of libraries when using libao. +# LIBAO_FOUND - True if libao found. # Look for the header file. FIND_PATH(LIBAO_INCLUDE_DIR NAMES ao/ao.h) diff --git a/src/FindMad.cmake b/src/FindMad.cmake index f05f469..1917cd4 100644 --- a/src/FindMad.cmake +++ b/src/FindMad.cmake @@ -1,6 +1,6 @@ -# MAD_INCLUDE_DIRS - where to find curl/curl.h, etc. -# MAD_LIBRARIES - List of libraries when using curl. -# MAD_FOUND - True if curl found. +# MAD_INCLUDE_DIRS - where to find mad.h, etc. +# MAD_LIBRARIES - List of libraries when using libmad. +# MAD_FOUND - True if libmad found. # Look for the header file. FIND_PATH(MAD_INCLUDE_DIR NAMES mad.h) @@ -39,8 +39,6 @@ THE SOFTWARE. /* last.fm scrobbling library */ #include <wardrobe.h> -#include <curl/curl.h> - #include <libxml/parser.h> #include <libxml/tree.h> diff --git a/src/player.c b/src/player.c index 4768ecc..beccc37 100644 --- a/src/player.c +++ b/src/player.c @@ -116,12 +116,11 @@ inline void BarPlayerBufferMove (struct audioPlayer *player) { /* play aac stream * @param streamed data - * @param block size - * @param received blocks + * @param received bytes * @param extra data (player data) * @return received bytes or less on error */ -char BarPlayerAACCurlCb (void *ptr, size_t size, void *stream) { +char BarPlayerAACCb (void *ptr, size_t size, void *stream) { char *data = ptr; struct audioPlayer *player = stream; @@ -300,7 +299,7 @@ inline signed short int BarPlayerMadToShort (mad_fixed_t fixed) { return (signed short int) (fixed >> (MAD_F_FRACBITS - 15)); } -char BarPlayerMp3CurlCb (void *ptr, size_t size, void *stream) { +char BarPlayerMp3Cb (void *ptr, size_t size, void *stream) { char *data = ptr; struct audioPlayer *player = stream; size_t i; @@ -421,7 +420,7 @@ void *BarPlayerThread (void *data) { conf->downMatrix = 1; NeAACDecSetConfiguration(player->aacHandle, conf); - player->waith.callback = BarPlayerAACCurlCb; + player->waith.callback = BarPlayerAACCb; break; #endif /* ENABLE_FAAD */ @@ -431,7 +430,7 @@ void *BarPlayerThread (void *data) { mad_frame_init (&player->mp3Frame); mad_synth_init (&player->mp3Synth); - player->waith.callback = BarPlayerMp3CurlCb; + player->waith.callback = BarPlayerMp3Cb; break; #endif /* ENABLE_MAD */ |