diff options
| author | Max Kellermann <max@duempel.org> | 2008-04-12 04:07:01 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-04-12 04:07:01 +0000 |
| commit | 1b6cf29937514d8d90c7e45b64664d1eb518fcc9 (patch) | |
| tree | 391b19f59e58d4f287655ce90476b449f8d220bf | |
| parent | c069b89d86f9cc1f45b8917fbad77e5a860e938f (diff) | |
| download | mpd-1b6cf29937514d8d90c7e45b64664d1eb518fcc9.tar.gz mpd-1b6cf29937514d8d90c7e45b64664d1eb518fcc9.tar.xz mpd-1b6cf29937514d8d90c7e45b64664d1eb518fcc9.zip | |
unsigned integers in playerData.[ch]
The number of buffered chunks can obviously not become negative. The
"buffered_before_play<0" therefore cannot be useful, so let's remove
it, too.
git-svn-id: https://svn.musicpd.org/mpd/trunk@7232 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | src/playerData.c | 7 | ||||
| -rw-r--r-- | src/playerData.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/playerData.c b/src/playerData.c index 551582e45..3c92fde52 100644 --- a/src/playerData.c +++ b/src/playerData.c @@ -21,8 +21,8 @@ #include "log.h" #include "os_compat.h" -int buffered_before_play; -int buffered_chunks; +unsigned int buffered_before_play; +unsigned int buffered_chunks; #define DEFAULT_BUFFER_SIZE 2048 #define DEFAULT_BUFFER_BEFORE_PLAY 10 @@ -72,8 +72,7 @@ void initPlayerData(void) buffered_before_play = (perc / 100) * buffered_chunks; if (buffered_before_play > buffered_chunks) { buffered_before_play = buffered_chunks; - } else if (buffered_before_play < 0) - buffered_before_play = 0; + } allocationSize = buffered_chunks * CHUNK_SIZE; /*actual buffer */ allocationSize += buffered_chunks * sizeof(float); /*for times */ diff --git a/src/playerData.h b/src/playerData.h index 00e4040be..f49834491 100644 --- a/src/playerData.h +++ b/src/playerData.h @@ -30,8 +30,8 @@ /* pick 1020 since its devisible for 8,16,24, and 32-bit audio */ #define CHUNK_SIZE 1020 -extern int buffered_before_play; -extern int buffered_chunks; +extern unsigned int buffered_before_play; +extern unsigned int buffered_chunks; typedef struct _PlayerData { OutputBuffer buffer; |