From 5dd5ce54267d6d29704b05e23f05d2e3bcfc9c30 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 25 Oct 2008 15:28:50 +0200 Subject: Use own byteswap implementation pianobar can be compiled on NetBSD (and maybe others) now. --- src/player.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/player.c') diff --git a/src/player.c b/src/player.c index 57fc443..d543547 100644 --- a/src/player.c +++ b/src/player.c @@ -26,11 +26,13 @@ THE SOFTWARE. #include #include #include -#include #include "player.h" #include "config.h" +#define byteswap32(x) (((x >> 24) & 0x000000ff) | ((x >> 8) & 0x0000ff00) | \ + ((x << 8) & 0x00ff0000) | ((x << 24) & 0xff000000)) + /* FIXME: not the best solution to poll every second, but the easiest * one I know... (pthread's conditions could be another solution) */ #define QUIT_PAUSE_CHECK \ @@ -180,7 +182,8 @@ size_t BarPlayerCurlCb (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 = bswap_32 (*((int *) (player->buffer + + player->sampleSizeN = + byteswap32 (*((int *) (player->buffer + player->bufferRead))); player->sampleSize = calloc (player->sampleSizeN, sizeof (player->sampleSizeN)); @@ -189,7 +192,7 @@ size_t BarPlayerCurlCb (void *ptr, size_t size, size_t nmemb, void *stream) { break; } else { player->sampleSize[player->sampleSizeCurr] = - bswap_32 (*((int *) (player->buffer + + byteswap32 (*((int *) (player->buffer + player->bufferRead))); player->sampleSizeCurr++; player->bufferRead += 4; -- cgit v1.2.3