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/drumkit.cc | |
| parent | ef68248bf70a027595803b08433a7a2c74e20fd0 (diff) | |
| parent | 35e804b984c28131fe13d229c5a0867762c6e8cf (diff) | |
Merge branch 'settings'
Diffstat (limited to 'src/drumkit.cc')
| -rw-r--r-- | src/drumkit.cc | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/drumkit.cc b/src/drumkit.cc index 1b95c87..f25a6ea 100644 --- a/src/drumkit.cc +++ b/src/drumkit.cc @@ -39,12 +39,11 @@ DrumKit::~DrumKit() void DrumKit::clear() { - Instruments::iterator i = instruments.begin(); - while(i != instruments.end()) + for(auto& instrument : instruments) { - delete *i; - i++; + delete instrument; } + instruments.clear(); channels.clear(); @@ -78,20 +77,3 @@ size_t DrumKit::getSamplerate() const { return _samplerate; } - -#ifdef TEST_DRUMKIT -// Additional dependency files -// deps: -// Required cflags (autoconf vars may be used) -// cflags: -// Required link options (autoconf vars may be used) -// libs: -#include "test.h" - -TEST_BEGIN; - -// TODO: Put some testcode here (see test.h for usable macros). - -TEST_END; - -#endif /*TEST_DRUMKIT*/ |