Towards MIDI:

- Converted vector<Sample*> to BufferList and numerous counts from int to ChanCount (and related changes)
- Added fancy type-generic iterators to BufferList, PortIterator (see IO::collect_input for a good example of the idea - the same code will work to read all input (of various types in a single IO, eg instruments) without modification no matter how many types we add)
- Fixed comparison operator bugs with ChanCount (screwed up metering among other things)
- Moved peak metering into it's own object, and moved most of the pan related code out of IO to panner (still a touch more to be done here for MIDI playback)

Not directly MIDI related fixes for problems in trunk:

- Fixed varispeed gain/pan automation to work properly (was reading the wrong range of automation data, probably causing nasty clicks?)
- Fixed crash on varispeed looping (possibly only a 64-bit problem).  It still doesn't work, but at least it doesn't die

Quite a few things broken, and the new classes are pretty filthy still, but I think the direction is a lot better than all my previous plans...


git-svn-id: svn://localhost/ardour2/branches/midi@795 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 11 insertions, 11 deletions

diff --git a/libs/ardour/curve.cc b/libs/ardour/curve.cc
index 977b6dfd7b..b0052c96fb 100644
--- a/libs/ardour/curve.cc
+++ b/libs/ardour/curve.cc
@@ -68,7 +68,7 @@ Curve::~Curve ()
 void
 Curve::solve ()
 {
-	uint32_t npoints;
+	size_t npoints;
 
 	if (!_dirty) {
 		return;
@@ -83,7 +83,7 @@ Curve::solve ()
 
 		double x[npoints];
 		double y[npoints];
-		uint32_t i;
+		size_t i;
 		AutomationEventList::iterator xx;
 
 		for (i = 0, xx = events.begin(); xx != events.end(); ++xx, ++i) {
@@ -202,7 +202,7 @@ Curve::solve ()
 }
 
 bool
-Curve::rt_safe_get_vector (double x0, double x1, float *vec, int32_t veclen)
+Curve::rt_safe_get_vector (double x0, double x1, float *vec, size_t veclen)
 {
 	Glib::Mutex::Lock lm (lock, Glib::TRY_LOCK);
 
@@ -215,19 +215,19 @@ Curve::rt_safe_get_vector (double x0, double x1, float *vec, int32_t veclen)
 }
 
 void
-Curve::get_vector (double x0, double x1, float *vec, int32_t veclen)
+Curve::get_vector (double x0, double x1, float *vec, size_t veclen)
 {
 	Glib::Mutex::Lock lm (lock);
 	_get_vector (x0, x1, vec, veclen);
 }
 
 void
-Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
+Curve::_get_vector (double x0, double x1, float *vec, size_t veclen)
 {
 	double rx, dx, lx, hx, max_x, min_x;
-	int32_t i;
-	int32_t original_veclen;
-	int32_t npoints;
+	size_t i;
+	size_t original_veclen;
+	size_t npoints;
 
         if ((npoints = events.size()) == 0) {
                  for (i = 0; i < veclen; ++i) {
@@ -258,7 +258,7 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
 		*/
 
 		double frac = (min_x - x0) / (x1 - x0);
-		int32_t subveclen = (int32_t) floor (veclen * frac);
+		size_t subveclen = (size_t) floor (veclen * frac);
 		
 		subveclen = min (subveclen, veclen);
 
@@ -276,7 +276,7 @@ Curve::_get_vector (double x0, double x1, float *vec, int32_t veclen)
 
 		double frac = (x1 - max_x) / (x1 - x0);
 
-		int32_t subveclen = (int32_t) floor (original_veclen * frac);
+		size_t subveclen = lrintf (original_veclen * frac);
 
 		float val;
 		
@@ -441,7 +441,7 @@ Curve::restore_state (StateManager::State& state)
 extern "C" {
 
 void 
-curve_get_vector_from_c (void *arg, double x0, double x1, float* vec, int32_t vecsize)
+curve_get_vector_from_c (void *arg, double x0, double x1, float* vec, size_t vecsize)
 {
 	static_cast<Curve*>(arg)->get_vector (x0, x1, vec, vecsize);
 }