WIP

1 files changed, 13 insertions, 11 deletions

diff --git a/src/audioextractor.cc b/src/audioextractor.cc
index 95fe6b2..681edaf 100644
--- a/src/audioextractor.cc
+++ b/src/audioextractor.cc
@@ -50,14 +50,14 @@ AudioExtractor::AudioExtractor(Instrument& instrument, QObject *parent)
 {
 }
 
-bool AudioExtractor::exportSelections()
+bool AudioExtractor::exportRanges()
 {
-	auto selections = instrument.getSelections();
+	auto ranges = instrument.getRanges();
 	auto exportpath = instrument.getProject().getExportPath();
 	auto prefix = instrument.getPrefix();
 
 	int samplerate = -1;
-	emit setMaximumProgress(selections.ids().size() + 1/* for xml writing*/);
+	emit setMaximumProgress(ranges.ids().size() + 1/* for xml writing*/);
 	int progress = 0;
 	emit progressUpdate(progress++);
 	qApp->processEvents();
@@ -92,15 +92,16 @@ bool AudioExtractor::exportSelections()
 	}
 
 	idx = 1;
-	QVector<sel_id_t> sels = selections.ids();
+	QVector<sel_id_t> sels = ranges.ids();
 
-	// Sort selections by velocity
+/*
+	// Sort ranges by velocity
 	for(int v1 = 0; v1 < sels.size(); v1++)
 	{
 		for(int v2 = 0; v2 < sels.size(); v2++)
 		{
-			Selection sel1 = selections.get(sels[v1]);
-			Selection sel2 = selections.get(sels[v2]);
+			Range sel1 = ranges.get(sels[v1]);
+			Range sel2 = ranges.get(sels[v2]);
 
 			if(sel1.energy < sel2.energy)
 			{
@@ -110,7 +111,7 @@ bool AudioExtractor::exportSelections()
 			}
 		}
 	}
-
+*/
 	if(samplerate == -1)
 	{
 		// For some reason we never got a samplerate. Set it to 44k1Hz
@@ -121,7 +122,7 @@ bool AudioExtractor::exportSelections()
 	QVector<sel_id_t>::iterator si = sels.begin();
 	while(si != sels.end())
 	{
-		Selection sel = selections.get(*si);
+		Range sel = ranges.get(*si);
 		size_t offset = sel.from;
 		size_t size = sel.to - sel.from;
 		size_t fadein = sel.fadein;
@@ -241,15 +242,16 @@ bool AudioExtractor::exportSelections()
 		{
 			index++;
 
-			Selection i = selections.get(*si);
+			Range i = ranges.get(*si);
 			i.name = prefix + "-" + QString::number(index);
 
 			QDomElement sample = doc.createElement("sample");
 			sample.setAttribute("name", i.name);
 			sample.setAttribute("power", QString::number(i.energy));
+			sample.setAttribute("position", QString::number(i.position));
 			samples.appendChild(sample);
 
-			selections.update(*si, i);
+			ranges.update(*si, i);
 
 			int channelnum = 1; // Filechannel numbers are 1-based.