From 324502145b2a5fec38928509c8b3d9f8eb8bf47d Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Wed, 23 Mar 2016 22:38:44 +0100
Subject: Settings.

---
 src/instrument.h | 50 +++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

(limited to 'src/instrument.h')

diff --git a/src/instrument.h b/src/instrument.h
index e880d8d..549a5a4 100644
--- a/src/instrument.h
+++ b/src/instrument.h
@@ -36,46 +36,50 @@
 #include "sample.h"
 #include "versionstr.h"
 
+#include "settings.h"
+
 class InstrumentParser;
 class Instrument {
-  friend class InstrumentParser;
+	friend class InstrumentParser;
 public:
-  Instrument();
-  ~Instrument();
+	Instrument(Settings& settings);
+	~Instrument();
 
-  Sample *sample(level_t level, size_t pos);
+	Sample *sample(level_t level, size_t pos);
 
-  std::string name();
-  std::string description();
-  std::string group();
+	std::string name();
+	std::string description();
+	std::string group();
 
-  void setGroup(std::string group);
+	void setGroup(std::string group);
 
-  //  std::map<std::string, std::string> channelmap;
+	//  std::map<std::string, std::string> channelmap;
 
-  std::vector<AudioFile*> audiofiles;
+	std::vector<AudioFile*> audiofiles;
 
-  bool isValid();
+	bool isValid();
 
 private:
-  void *magic;
+	void *magic;
+
+	std::string _group;
+	std::string _name;
+	std::string _description;
 
-  std::string _group;
-  std::string _name;
-  std::string _description;
+	VersionStr version;
 
-  VersionStr version;
+	RangeMap<level_t, Sample*> samples;
+	PowerList powerlist;
 
-  RangeMap<level_t, Sample*> samples;
-  PowerList powerlist;
+	void addSample(level_t a, level_t b, Sample *s);
+	void finalise(); ///< Signal instrument that no more samples will be added.
 
-  void addSample(level_t a, level_t b, Sample *s);
-  void finalise(); ///< Signal instrument that no more samples will be added.
+	std::vector<Sample*> samplelist;
 
-  std::vector<Sample*> samplelist;
+	size_t lastpos;
+	float mod;
 
-  size_t lastpos;
-  float mod;
+	Settings& settings;
 };
 
 //typedef std::map< std::string, Instrument > Instruments;
-- 
cgit v1.2.3