Merge branch 'mk/cleanups'

* mk/cleanups: (60 commits)
  pass constant pointers
  const pointers
  unsigned integers and size_t
  oggflac: fix GCC warnings
  include cleanup
  protect locate.h from double inclusion
  playlist: eliminate unused fd parameters
  jack: made "sample_size" static const
  moved jack configuration to the JackData struct
  jack: removed unused macros
  jack: don't set audioOutput->data=NULL
  jack: initialize JackData in jack_initDriver()
  jack: added freeJackClient()
  jack: initialize jd->client after !jd check
  jack: eliminate superfluous freeJackData() calls
  mp3: converted the MUTEFRAME_ macros to an enum
  mp3: converted the DECODE_ constants to an enum
  wavpack: don't use "isp" before initialization
  wavpack: moved code to wavpack_open_wvc()
  simplified code in the ogg decoder plugin
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/src/outputBuffer_xfade.h b/src/outputBuffer_xfade.h
index 336a7adc2..70e490c65 100644
--- a/src/outputBuffer_xfade.h
+++ b/src/outputBuffer_xfade.h
@@ -5,8 +5,8 @@
 #include "audio.h"
 #include "pcm_utils.h"
 
-static struct ob_chunk *get_chunk(struct iovec vec[2], size_t i);
-static size_t calculate_xfade_chunks(struct iovec vec[2])
+static struct ob_chunk *get_chunk(struct rbvec vec[2], size_t i);
+static size_t calculate_xfade_chunks(struct rbvec vec[2])
 {
 	float xfade_time = ob.xfade_time; /* prevent race conditions */
 	size_t chunks;
@@ -29,7 +29,7 @@ static size_t calculate_xfade_chunks(struct iovec vec[2])
 	assert(af->channels > 0);
 	assert(af->sampleRate > 0);
 
-	chunks = af->sampleRate * af->bits * af->channels / 8.0 / CHUNK_SIZE;
+	chunks = audio_format_time_to_size(af) / CHUNK_SIZE;
 	chunks = chunks * (xfade_time + 0.5);
 	assert(chunks);
 
@@ -37,7 +37,7 @@ static size_t calculate_xfade_chunks(struct iovec vec[2])
 	if (chunks > (ob.index->size - ob.bpp_cur))
 		chunks = ob.index->size - ob.bpp_cur;
 	DEBUG("calculated xfade chunks: %d\n", chunks);
-	nr = vec[0].iov_len + vec[1].iov_len;
+	nr = vec[0].len + vec[1].len;
 
 	if (chunks <= nr) {
 		c = get_chunk(vec, chunks);
@@ -64,7 +64,7 @@ static size_t calculate_xfade_chunks(struct iovec vec[2])
 	return chunks;
 }
 
-static size_t xfade_chunks_needed(struct iovec vec[2])
+static size_t xfade_chunks_needed(struct rbvec vec[2])
 {
 	assert(pthread_equal(ob.thread, pthread_self()));