WIP

1 files changed, 16 insertions, 6 deletions

diff --git a/src/instrumentwidget.h b/src/instrumentwidget.h
index 721b829..d3678d2 100644
--- a/src/instrumentwidget.h
+++ b/src/instrumentwidget.h
@@ -38,10 +38,11 @@
 #include "audioextractor.h"
 #include "samplesorter.h"
 #include "filelist.h"
-#include "canvastoolselections.h"
+#include "canvastoolranges.h"
+#include "canvastoolposition.h"
 #include "canvastoolthreshold.h"
 #include "canvastoollisten.h"
-#include "selection.h"
+#include "range.h"
 #include "player.h"
 #include "zoomslider.h"
 #include "canvaswidget.h"
@@ -70,11 +71,12 @@ public:
 public slots:
 	void doExport();
 	void loadFile(QString filename);
+	void recalcPositions();
 	void playSamples();
 	void browse();
 	void tabChanged(int tabid);
 	void generateSlidersChanged();
-	void selectionChanged();
+	void rangeChanged();
 	void prefixChanged();
 	void exportPathChanged();
 
@@ -87,8 +89,10 @@ private:
 	int generateTabId;
 
 	SampleSorter* sorter;
-	CanvasToolSelections* tool_selections;
+	CanvasToolRanges* tool_ranges;
+	CanvasToolPosition* tool_position;
 	CanvasToolThreshold* threshold;
+	CanvasToolThreshold* pos_threshold;
 	CanvasToolListen* listen;
 	AudioExtractor* extractor;
 	FileList* filelist;
@@ -108,10 +112,16 @@ private:
 	QTabWidget* tabs;
 
 	// Session state information:
-	Selections selections;
-	Selections selections_preview;
+	Ranges ranges;
+	Ranges ranges_preview;
 	Player player;
 
 	Settings& settings;
 	Instrument& instrument;
+
+	// TODO: These should not be stored here...
+	float* positionData1{nullptr};
+	size_t positionSize1{0};
+	float* positionData2{nullptr};
+	size_t positionSize2{0};
 };