diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-04-16 13:33:53 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-04-16 13:33:53 +0200 |
| commit | 4eb252df04ab237c8638d45bcbf028859dc6a110 (patch) | |
| tree | 8bffddf62b4271336a6e0121fef8133327654000 /src/sample.h | |
| parent | ef68248bf70a027595803b08433a7a2c74e20fd0 (diff) | |
| parent | 35e804b984c28131fe13d229c5a0867762c6e8cf (diff) | |
Merge branch 'settings'
Diffstat (limited to 'src/sample.h')
| -rw-r--r-- | src/sample.h | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/sample.h b/src/sample.h index 5b4f3b5..f00db13 100644 --- a/src/sample.h +++ b/src/sample.h @@ -32,34 +32,22 @@ #include "channel.h" #include "audiofile.h" -typedef std::map<Channel*, AudioFile*> AudioFiles; +using AudioFiles = std::map<Channel*, AudioFile*>; -class InstrumentParser; -class Sample -{ +class Sample { friend class InstrumentParser; friend class PowerList; - public: Sample(const std::string& name, float power); ~Sample(); - AudioFile* getAudioFile(InstrumentChannel* c); + AudioFile* getAudioFile(InstrumentChannel *instrument_channel); private: - void addAudioFile(InstrumentChannel* c, AudioFile* a); + void addAudioFile(InstrumentChannel* instrument_channel, + AudioFile* audio_file); std::string name; float power; AudioFiles audiofiles; }; - -/* - * <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> - */ |