comparison layer/WaveformLayer.cpp @ 190:61681a2bc1e6

keep MIN and MAX compatibility (VC and linux compilation)

                                   v->getEndFrame());
             if (mergingChannels || mixingChannels) {
                 RangeSummarisableTimeValueModel::Range otherRange =
                     m_model->getRange(1, startFrame < 0 ? 0 : startFrame,
                                       v->getEndFrame());
-                range.max = max(range.max, otherRange.max);
-                range.min = min(range.min, otherRange.min);
-                range.absmean = min(range.absmean, otherRange.absmean);
+                range.max = MAX(range.max, otherRange.max);
+                range.min = MIN(range.min, otherRange.min);
+                range.absmean = MIN(range.absmean, otherRange.absmean);
             }
-            m_effectiveGains[ch] = 1.0 / max(fabsf(range.max),
+            m_effectiveGains[ch] = 1.0 / MAX(fabsf(range.max),
                                                   fabsf(range.min));
         }
 
         float gain = m_effectiveGains[ch];
 

 	    if (ranges && index < ranges->size()) {
 
 		range = (*ranges)[index];
 
 		if (maxIndex > index && maxIndex < ranges->size()) {
-		    range.max = max(range.max, (*ranges)[maxIndex].max);
-		    range.min = min(range.min, (*ranges)[maxIndex].min);
+		    range.max = MAX(range.max, (*ranges)[maxIndex].max);
+		    range.min = MIN(range.min, (*ranges)[maxIndex].min);
 		    range.absmean = (range.absmean +
 				     (*ranges)[maxIndex].absmean) / 2;
 		}
 
 	    } else {

 
 	    case dBScale:
                 if (!mergingChannels) {
                     int db0 = dBscale(range.min * gain, m);
                     int db1 = dBscale(range.max * gain, m);
-                    rangeTop    = max(db0, db1);
-                    meanTop     = min(db0, db1);
+                    rangeTop    = MAX(db0, db1);
+                    meanTop     = MIN(db0, db1);
                     if (mixingChannels) rangeBottom = meanTop;
                     else rangeBottom = dBscale(range.absmean * gain, m);
                     meanBottom  = rangeBottom;
                 } else {
                     rangeBottom = -dBscale(range.min * gain, m * greyLevels);

 
 	    case MeterScale:
                 if (!mergingChannels) {
                     int r0 = abs(AudioLevel::multiplier_to_preview(range.min * gain, m));
                     int r1 = abs(AudioLevel::multiplier_to_preview(range.max * gain, m));
-                    rangeTop    = max(r0, r1);
-                    meanTop     = min(r0, r1);
+                    rangeTop    = MAX(r0, r1);
+                    meanTop     = MIN(r0, r1);
                     if (mixingChannels) rangeBottom = meanTop;
                     else rangeBottom = AudioLevel::multiplier_to_preview(range.absmean * gain, m);
                     meanBottom  = rangeBottom;
                 } else {
                     rangeBottom =  AudioLevel::multiplier_to_preview(range.min * gain, m * greyLevels);