From e190d38057892b69246391841b234a368bc2b4ad Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Tue, 1 Mar 2011 19:19:02 +0000
Subject: MAJOR rewrite of the internals. New input/output 'plugin' system.
 Still a lot missing.

---
 src/instrument.h | 59 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 12 deletions(-)

(limited to 'src/instrument.h')

diff --git a/src/instrument.h b/src/instrument.h
index 96fc6ba..b01379f 100644
--- a/src/instrument.h
+++ b/src/instrument.h
@@ -30,25 +30,60 @@
 #include <string>
 #include <vector>
 
-#include <jack/jack.h>
-
-#include "velocity.h"
+#include "rangemap.h"
+#include "sample.h"
 
 class Instrument {
 public:
-  Instrument(std::string name, unsigned int midimap);
-
-  void addVelocity(Velocity *velocity);
-  Velocity *getVelocity(unsigned int velocity);
+  Instrument(std::string name);
 
-  std::string name;
-  unsigned int midimap;
+  Sample *sample(level_t level);
 
-  jack_port_t *port;
+  void addSample(level_t a, level_t b, Sample *s);
 
 private:
-  typedef std::vector< Velocity * > Velocities;
-  Velocities velocities;
+  std::string name;
+  RangeMap<level_t, Sample*> samples;
 };
 
+typedef std::map< std::string, Instrument > Instruments;
+
+/*
+ * <?xml version='1.0' encoding='UTF-8'?>
+ * <instrument name="kick-r">
+ *  <samples>
+ *   <sample name="kick-r-1">
+ *    <audiofile channel="Alesis-3" file="samples/1-kick-r-Alesis-3.wav"/>
+ *    <audiofile channel="Amb L-3" file="samples/1-kick-r-Amb L-3.wav"/>
+ *    <audiofile channel="Amb R-3" file="samples/1-kick-r-Amb R-3.wav"/>
+ *    <audiofile channel="Kick L-3" file="samples/1-kick-r-Kick L-3.wav"/>
+ *    <audiofile channel="Kick R-3" file="samples/1-kick-r-Kick R-3.wav"/>
+ *   </sample>
+ *   <sample name="kick-r-2">
+ *    <audiofile channel="Alesis-3" file="samples/2-kick-r-Alesis-3.wav"/>
+ *    <audiofile channel="Amb L-3" file="samples/2-kick-r-Amb L-3.wav"/>
+ *    <audiofile channel="Amb R-3" file="samples/2-kick-r-Amb R-3.wav"/>
+ *    <audiofile channel="Kick L-3" file="samples/2-kick-r-Kick L-3.wav"/>
+ *    <audiofile channel="Kick R-3" file="samples/2-kick-r-Kick R-3.wav"/>
+ *   </sample>
+ *   <sample name="kick-r-3">
+ *    <audiofile channel="Alesis-3" file="samples/3-kick-r-Alesis-3.wav"/>
+ *    <audiofile channel="Amb L-3" file="samples/3-kick-r-Amb L-3.wav"/>
+ *    <audiofile channel="Amb R-3" file="samples/3-kick-r-Amb R-3.wav"/>
+ *    <audiofile channel="Kick L-3" file="samples/3-kick-r-Kick L-3.wav"/>
+ *    <audiofile channel="Kick R-3" file="samples/3-kick-r-Kick R-3.wav"/>
+ *   </sample>
+ *  </samples>
+ *  <velocities>
+ *   <velocity lower="0" upper="99">
+ *    <sampleref name="kick-r-1"/>
+ *    <sampleref name="kick-r-2"/>
+ *   </velocity>
+ *   <velocity lower="100" upper="127">
+ *    <sampleref name="kick-r-3"/>
+ *   </velocity>
+ *  </velocities>
+ * </instrument>
+ */
+
 #endif/*__DRUMGIZMO_INSTRUMENT_H__*/
-- 
cgit v1.2.3