From 180d70312335d7274eff605e3ec4c1af5879daa4 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Sat, 20 Apr 2013 19:19:53 +0200
Subject: Add libao dependency check. Fix redeclaration compile error.

---
 dgedit/Makefile.am     |  5 +++--
 dgedit/samplesorter.cc | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'dgedit')

diff --git a/dgedit/Makefile.am b/dgedit/Makefile.am
index 1df3c7c..2ebd304 100644
--- a/dgedit/Makefile.am
+++ b/dgedit/Makefile.am
@@ -2,9 +2,10 @@ if HAVE_EDITOR
 
 bin_PROGRAMS = dgedit
 
-dgedit_LDADD = $(SNDFILE_LIBS) $(QT_LIBS) $(shell ../tools/MocList o ) -lao
+dgedit_LDADD = $(SNDFILE_LIBS) $(QT_LIBS) $(shell ../tools/MocList o ) \
+	$(AO_LIBS)
 
-dgedit_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(QT_CFLAGS)
+dgedit_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(QT_CFLAGS) $(AO_CFLAGS)
 AM_CXXFLAGS = $(QT_CFLAGS)
 
 dgedit_SOURCES = $(shell ../tools/MocList cc ) \
diff --git a/dgedit/samplesorter.cc b/dgedit/samplesorter.cc
index 0338bd7..5958354 100644
--- a/dgedit/samplesorter.cc
+++ b/dgedit/samplesorter.cc
@@ -112,13 +112,13 @@ Levels SampleSorter::levels()
     if(i == threshold.size() - 1) next = 1.0;
     else next = threshold[i+1];
 
-    QMap<float, Selection>::iterator i = sorted.begin();
-    while(i != sorted.end()) {
-      float val = (i.key()/max);
+    QMap<float, Selection>::iterator si = sorted.begin();
+    while(si != sorted.end()) {
+      float val = (si.key()/max);
       if(val >= lvl.velocity && val <= next) {
-        lvl.selections[i.key()] = i.value();
+        lvl.selections[si.key()] = si.value();
       }
-      i++;
+      si++;
     }
 
     lvls.push_back(lvl);
-- 
cgit v1.2.3