Use jack_default_audio_sample_t instead of float consistently, fix ticket #201.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4182 0c269be4-1314-0410-8aa9-9f06e86f4224

1 files changed, 18 insertions, 18 deletions

diff --git a/common/JackResampler.cpp b/common/JackResampler.cpp
index fb1793d4..57220295 100644
--- a/common/JackResampler.cpp
+++ b/common/JackResampler.cpp
@@ -26,8 +26,8 @@ namespace Jack
 JackResampler::JackResampler()
     :fRatio(1),fRingBufferSize(DEFAULT_RB_SIZE)
 {
-    fRingBuffer = jack_ringbuffer_create(sizeof(float) * fRingBufferSize);
-    jack_ringbuffer_read_advance(fRingBuffer, (sizeof(float) * fRingBufferSize) / 2);
+    fRingBuffer = jack_ringbuffer_create(sizeof(jack_default_audio_sample_t) * fRingBufferSize);
+    jack_ringbuffer_read_advance(fRingBuffer, (sizeof(jack_default_audio_sample_t) * fRingBufferSize) / 2);
 }
 
 JackResampler::~JackResampler()
@@ -39,54 +39,54 @@ JackResampler::~JackResampler()
 void JackResampler::Reset(unsigned int new_size)
 {
     fRingBufferSize = new_size;
-    jack_ringbuffer_reset_size(fRingBuffer, sizeof(float) * fRingBufferSize);
-    jack_ringbuffer_read_advance(fRingBuffer, (sizeof(float) * fRingBufferSize / 2));
+    jack_ringbuffer_reset_size(fRingBuffer, sizeof(jack_default_audio_sample_t) * fRingBufferSize);
+    jack_ringbuffer_read_advance(fRingBuffer, (sizeof(jack_default_audio_sample_t) * fRingBufferSize / 2));
 }
 
 unsigned int JackResampler::ReadSpace()
 {
-    return (jack_ringbuffer_read_space(fRingBuffer) / sizeof(float));
+    return (jack_ringbuffer_read_space(fRingBuffer) / sizeof(jack_default_audio_sample_t));
 }
 
 unsigned int JackResampler::WriteSpace()
 {
-    return (jack_ringbuffer_write_space(fRingBuffer) / sizeof(float));
+    return (jack_ringbuffer_write_space(fRingBuffer) / sizeof(jack_default_audio_sample_t));
 }
 
-unsigned int JackResampler::Read(float* buffer, unsigned int frames)
+unsigned int JackResampler::Read(jack_default_audio_sample_t* buffer, unsigned int frames)
 {
     size_t len = jack_ringbuffer_read_space(fRingBuffer);
-    jack_log("JackResampler::Read input available = %ld", len / sizeof(float));
-        
-    if (len < frames * sizeof(float)) {
+    jack_log("JackResampler::Read input available = %ld", len / sizeof(jack_default_audio_sample_t));
+
+    if (len < frames * sizeof(jack_default_audio_sample_t)) {
         jack_error("JackResampler::Read : producer too slow, missing frames = %d", frames);
         return 0;
     } else {
-        jack_ringbuffer_read(fRingBuffer, (char*)buffer, frames * sizeof(float));
+        jack_ringbuffer_read(fRingBuffer, (char*)buffer, frames * sizeof(jack_default_audio_sample_t));
         return frames;
     }
 }
 
-unsigned int JackResampler::Write(float* buffer, unsigned int frames)
+unsigned int JackResampler::Write(jack_default_audio_sample_t* buffer, unsigned int frames)
 {
     size_t len = jack_ringbuffer_write_space(fRingBuffer);
-    jack_log("JackResampler::Write output available = %ld", len / sizeof(float));
-        
-    if (len < frames * sizeof(float)) {
+    jack_log("JackResampler::Write output available = %ld", len / sizeof(jack_default_audio_sample_t));
+
+    if (len < frames * sizeof(jack_default_audio_sample_t)) {
         jack_error("JackResampler::Write : consumer too slow, skip frames = %d", frames);
         return 0;
     } else {
-        jack_ringbuffer_write(fRingBuffer, (char*)buffer, frames * sizeof(float));
+        jack_ringbuffer_write(fRingBuffer, (char*)buffer, frames * sizeof(jack_default_audio_sample_t));
         return frames;
     }
 }
 
-unsigned int JackResampler::ReadResample(float* buffer, unsigned int frames)
+unsigned int JackResampler::ReadResample(jack_default_audio_sample_t* buffer, unsigned int frames)
 {
     return Read(buffer, frames);
 }
 
-unsigned int JackResampler::WriteResample(float* buffer, unsigned int frames)
+unsigned int JackResampler::WriteResample(jack_default_audio_sample_t* buffer, unsigned int frames)
 {
     return Write(buffer, frames);
 }