summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2012-02-21 05:05:00 -0500
committerMichael Sevakis <jethead71@rockbox.org>2012-02-21 05:05:00 -0500
commit72c41a3e723a37cd665a291678241b2c0a673c0f (patch)
treec349225ec1c77e4c6a2cd6bc11047cc7ac0fe580
parent1a4da5961ed5f7d4699ce6a5712bea1ab43da203 (diff)
downloadrockbox-72c41a3e723a37cd665a291678241b2c0a673c0f.tar.gz
rockbox-72c41a3e723a37cd665a291678241b2c0a673c0f.zip
crosfade_mix_fade should be returning size_t, not int.
'Twas a leftover from trying out counts instead of bytes when converting to timestamping that should have been reverted. Change-Id: I658c1a19e283025d991b7600378f97c6fc37db34
-rw-r--r--apps/pcmbuf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index 55a364b1be..e0bfa1f62a 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -831,8 +831,9 @@ static size_t crossfade_find_buftail(size_t buffer_rem, size_t buffer_need)
831} 831}
832 832
833/* Returns the number of bytes _NOT_ mixed/faded */ 833/* Returns the number of bytes _NOT_ mixed/faded */
834static int crossfade_mix_fade(int factor, size_t size, void *buf, size_t *out_index, 834static size_t crossfade_mix_fade(int factor, size_t size, void *buf,
835 unsigned long elapsed, off_t offset) 835 size_t *out_index, unsigned long elapsed,
836 off_t offset)
836{ 837{
837 if (size == 0) 838 if (size == 0)
838 return 0; 839 return 0;