diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-05-16 08:35:39 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-05-16 08:35:39 +0200 |
| commit | 0adc05286d97536637d01ed0a295d45f7bb60c1d (patch) | |
| tree | 7f06e82a515d4ab47f5c944eaec98c2b43b8c146 /src/drumkitparser.h | |
| parent | c91ae2624f3d3c003c6b2065f3cc128b1b039801 (diff) | |
| parent | ceda77eb38f0b0824f03348f5291e3a42d8f7306 (diff) | |
Merge remote-tracking branch 'origin' into diskstreaming
Conflicts:
src/Makefile.am.drumgizmo
src/drumgizmo.h
Diffstat (limited to 'src/drumkitparser.h')
| -rw-r--r-- | src/drumkitparser.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/drumkitparser.h b/src/drumkitparser.h index 907b09d..6311609 100644 --- a/src/drumkitparser.h +++ b/src/drumkitparser.h @@ -29,6 +29,7 @@ #include "saxparser.h" #include "drumkit.h" +#include "configfile.h" class DrumKitParser : public SAXParser { public: @@ -52,6 +53,8 @@ private: std::string instr_file; std::string instr_name; std::string instr_group; + + ConfigFile refs; }; #endif/*__DRUMGIZMO_DRUMKITPARSER_H__*/ |