Mercurial > hg > easaier-soundaccess

changeset 190:61681a2bc1e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keep MIN and MAX compatibility (VC and linux compilation)
author lbajardsilogic
date Tue, 27 Nov 2007 13:26:04 +0000
parents 6a31322cd9ed
children be6d31baecb9
files data/fileio/MatrixFile.cpp data/model/IntervalModel.cpp data/model/WaveFileModel.cpp layer/SpectrogramLayer.cpp layer/WaveformLayer.cpp plugin/LADSPAPluginFactory.cpp sv/audioio/PhaseVocoderTimeStretcher.cpp system/System.h view/Pane.cpp
diffstat 9 files changed, 51 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/data/fileio/MatrixFile.cpp	Tue Nov 27 13:11:44 2007 +0000
+++ b/data/fileio/MatrixFile.cpp	Tue Nov 27 13:26:04 2007 +0000
@@ -533,7 +533,7 @@
         }
 #endif
 
-        rw = min(rw, ti);
+        rw = MIN(rw, ti);
         if (rw < 10 || rx + rw <= x) return;
     }
 
--- a/data/model/IntervalModel.cpp	Tue Nov 27 13:11:44 2007 +0000
+++ b/data/model/IntervalModel.cpp	Tue Nov 27 13:26:04 2007 +0000
@@ -197,8 +197,8 @@
 IntervalModel::changeInterval(TimeIntervalPtr ti, long start, long end, float value, const QString& label)
 {
 
-	long startMin = min(start, ti->start());
-	long endMax   = max(end, ti->end());
+	long startMin = MIN(start, ti->start());
+	long endMax   = MAX(end, ti->end());
 
 	{
 		QMutexLocker locker(&m_mutex);
--- a/data/model/WaveFileModel.cpp	Tue Nov 27 13:11:44 2007 +0000
+++ b/data/model/WaveFileModel.cpp	Tue Nov 27 13:26:04 2007 +0000
@@ -380,16 +380,16 @@
 
     if (blockStart > start) {
         Range startRange = getRange(channel, start, blockStart);
-        range.min = min(range.min, startRange.min);
-        range.max = max(range.max, startRange.max);
-        range.absmean = min(range.absmean, startRange.absmean);
+        range.min = MIN(range.min, startRange.min);
+        range.max = MAX(range.max, startRange.max);
+        range.absmean = MIN(range.absmean, startRange.absmean);
     }
 
     if (blockEnd < end) {
         Range endRange = getRange(channel, blockEnd, end);
-        range.min = min(range.min, endRange.min);
-        range.max = max(range.max, endRange.max);
-        range.absmean = min(range.absmean, endRange.absmean);
+        range.min = MIN(range.min, endRange.min);
+        range.max = MAX(range.max, endRange.max);
+        range.absmean = MIN(range.absmean, endRange.absmean);
     }
 
     return range;
--- a/layer/SpectrogramLayer.cpp	Tue Nov 27 13:11:44 2007 +0000
+++ b/layer/SpectrogramLayer.cpp	Tue Nov 27 13:26:04 2007 +0000
@@ -1666,8 +1666,8 @@
         s10 = s11 = m_model->getEndFrame() / getWindowIncrement();
     }
 
-    int s0 = int(min(s00, s10) + 0.0001);
-    int s1 = int(max(s01, s11) + 0.0001);
+    int s0 = int(MIN(s00, s10) + 0.0001);
+    int s1 = int(MAX(s01, s11) + 0.0001);
 
 //    std::cerr << "SpectrogramLayer::updateViewMagnitudes: x0 = " << x0 << ", x1 = " << x1 << ", s00 = " << s00 << ", s11 = " << s11 << " s0 = " << s0 << ", s1 = " << s1 << std::endl;
 
@@ -1948,9 +1948,9 @@
         }
             
         cache.validArea = QRect
-            (min(vx0, x0), cache.validArea.y(),
-             max(vx1 - min(vx0, x0),
-                      x1 - min(vx0, x0)),
+            (MIN(vx0, x0), cache.validArea.y(),
+             MAX(vx1 - MIN(vx0, x0),
+                      x1 - MIN(vx0, x0)),
              cache.validArea.height());
             
     } else {
--- a/layer/WaveformLayer.cpp	Tue Nov 27 13:11:44 2007 +0000
+++ b/layer/WaveformLayer.cpp	Tue Nov 27 13:26:04 2007 +0000
@@ -581,11 +581,11 @@
                 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));
         }
 
@@ -712,8 +712,8 @@
 		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;
 		}
@@ -767,8 +767,8 @@
                 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;
@@ -784,8 +784,8 @@
                 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;
--- a/plugin/LADSPAPluginFactory.cpp	Tue Nov 27 13:11:44 2007 +0000
+++ b/plugin/LADSPAPluginFactory.cpp	Tue Nov 27 13:26:04 2007 +0000
@@ -154,7 +154,7 @@
 	minimum = lb;
     } else if (LADSPA_IS_HINT_BOUNDED_ABOVE(d)) {
 	float ub = descriptor->PortRangeHints[port].UpperBound;
-	minimum = min(0.0, ub - 1.0);
+	minimum = MIN(0.0, ub - 1.0);
     }
     
     if (LADSPA_IS_HINT_SAMPLE_RATE(d)) {
--- a/sv/audioio/PhaseVocoderTimeStretcher.cpp	Tue Nov 27 13:11:44 2007 +0000
+++ b/sv/audioio/PhaseVocoderTimeStretcher.cpp	Tue Nov 27 13:26:04 2007 +0000
@@ -255,7 +255,7 @@
 
             if (ready > 0) {
 
-                size_t copy = min(ready, newSize);
+                size_t copy = MIN(ready, newSize);
                 float *tmp = new float[ready];
 
                 for (size_t c = 0; c < m_channels; ++c) {
@@ -321,7 +321,7 @@
     while (consumed < samples) {
 
 	size_t writable = m_inbuf[0]->getWriteSpace();
-	writable = min(writable, samples - consumed);
+	writable = MIN(writable, samples - consumed);
 
 	if (writable == 0) {
 #ifdef DEBUG_PHASE_VOCODER_TIME_STRETCHER
--- a/system/System.h	Tue Nov 27 13:11:44 2007 +0000
+++ b/system/System.h	Tue Nov 27 13:26:04 2007 +0000
@@ -30,6 +30,22 @@
 #include <math.h>
 #include <float.h>
 
+#ifndef MIN  
+#define  MIN(x, y)  min(x, y) 
+#endif
+
+#ifndef MAX
+#define  MAX(x, y)  max(x, y) 
+#endif
+
+#ifndef ISNAN  
+#define  ISNAN(x)  isnan((x)) 
+#endif
+
+#ifndef ISINF  
+#define  ISINF(x)  isinf((x)) 
+#endif
+
 typedef int WINBOOL;
 
 typedef signed char int8_t;
@@ -197,12 +213,12 @@
 #define  MAX(x, y)  std::max(x, y) 
 #endif
 
-#ifndef isnan  
-#define  isnan(x)  std::isnan((x)) 
+#ifndef ISNAN  
+#define  ISNAN(x)  std::isnan((x)) 
 #endif
 
-#ifndef isinf  
-#define  isinf(x)  std::isinf((x)) 
+#ifndef ISINF  
+#define  ISINF(x)  std::isinf((x)) 
 #endif
 
 #endif /* __GNUC__ */
--- a/view/Pane.cpp	Tue Nov 27 13:11:44 2007 +0000
+++ b/view/Pane.cpp	Tue Nov 27 13:26:04 2007 +0000
@@ -997,11 +997,11 @@
 
 	if (m_shiftPressed) {
 
-	    int x0 = min(m_clickPos.x(), m_mousePos.x());
-	    int x1 = max(m_clickPos.x(), m_mousePos.x());
+	    int x0 = MIN(m_clickPos.x(), m_mousePos.x());
+	    int x1 = MAX(m_clickPos.x(), m_mousePos.x());
 
-	    int y0 = min(m_clickPos.y(), m_mousePos.y());
-	    int y1 = max(m_clickPos.y(), m_mousePos.y());
+	    int y0 = MIN(m_clickPos.y(), m_mousePos.y());
+	    int y1 = MAX(m_clickPos.y(), m_mousePos.y());
 
             zoomToRegion(x0, y0, x1, y1);
 	}