fixes for destructive track offsets of various kinds; move from jack_nframes_t -...

[ardour.git] / libs / ardour / ardour / mix.h

diff --git a/libs/ardour/ardour/mix.h b/libs/ardour/ardour/mix.h
index b351e3ef17cd694ea88940f1b8897158a6719553..653b61cb9517dc4b71c4c9273a916f6b761dadd8 100644 (file)
--- a/libs/ardour/ardour/mix.h
+++ b/libs/ardour/ardour/mix.h
@@ -28,47 +28,47 @@
 
 extern "C" {
 /* SSE functions */
-       float x86_sse_compute_peak                      (ARDOUR::Sample *buf, jack_nframes_t nsamples, float current);
+       float x86_sse_compute_peak                      (ARDOUR::Sample *buf, nframes_t nsamples, float current);
 
-       void  x86_sse_apply_gain_to_buffer      (ARDOUR::Sample *buf, jack_nframes_t nframes, float gain);
+       void  x86_sse_apply_gain_to_buffer      (ARDOUR::Sample *buf, nframes_t nframes, float gain);
 
-       void  x86_sse_mix_buffers_with_gain     (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nframes, float gain);
+       void  x86_sse_mix_buffers_with_gain     (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes, float gain);
 
-       void  x86_sse_mix_buffers_no_gain       (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nframes);
+       void  x86_sse_mix_buffers_no_gain       (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes);
 }
 
 /* debug wrappers for SSE functions */
 
-float debug_compute_peak                       (ARDOUR::Sample *buf, jack_nframes_t nsamples, float current);
+float debug_compute_peak                       (ARDOUR::Sample *buf, nframes_t nsamples, float current);
 
-void  debug_apply_gain_to_buffer       (ARDOUR::Sample *buf, jack_nframes_t nframes, float gain);
+void  debug_apply_gain_to_buffer       (ARDOUR::Sample *buf, nframes_t nframes, float gain);
 
-void  debug_mix_buffers_with_gain      (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nframes, float gain);
+void  debug_mix_buffers_with_gain      (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes, float gain);
 
-void  debug_mix_buffers_no_gain                (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nframes);
+void  debug_mix_buffers_no_gain                (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes);
 
 #endif
 
 #if defined (__APPLE__)
 
-float veclib_compute_peak              (ARDOUR::Sample *buf, jack_nframes_t nsamples, float current);
+float veclib_compute_peak              (ARDOUR::Sample *buf, nframes_t nsamples, float current);
 
-void  veclib_apply_gain_to_buffer      (ARDOUR::Sample *buf, jack_nframes_t nframes, float gain);
+void  veclib_apply_gain_to_buffer      (ARDOUR::Sample *buf, nframes_t nframes, float gain);
 
-void  veclib_mix_buffers_with_gain     (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nframes, float gain);
+void  veclib_mix_buffers_with_gain     (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes, float gain);
 
-void  veclib_mix_buffers_no_gain       (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nframes);
+void  veclib_mix_buffers_no_gain       (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes);
 
 #endif
 
 /* non-optimized functions */
 
-float compute_peak                     (ARDOUR::Sample *buf, jack_nframes_t nsamples, float current);
+float compute_peak                     (ARDOUR::Sample *buf, nframes_t nsamples, float current);
 
-void  apply_gain_to_buffer     (ARDOUR::Sample *buf, jack_nframes_t nframes, float gain);
+void  apply_gain_to_buffer     (ARDOUR::Sample *buf, nframes_t nframes, float gain);
 
-void  mix_buffers_with_gain    (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nframes, float gain);
+void  mix_buffers_with_gain    (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes, float gain);
 
-void  mix_buffers_no_gain      (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nframes);
+void  mix_buffers_no_gain      (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes);
 
 #endif /* __ardour_mix_h__ */