summaryrefslogtreecommitdiff
path: root/src/drumkit.h
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2016-03-23 21:57:41 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2016-03-23 21:57:41 +0100
commit91b3683ad0b6228bf85eefdb32e2ac3f717bd41c (patch)
tree8bdfae1492f2a658992d79faf85fab95a645c8bc /src/drumkit.h
parent5c04b951ffe53e1a31182bb0814908af8d7f0a6f (diff)
More cleanup.
Diffstat (limited to 'src/drumkit.h')
-rw-r--r--src/drumkit.h43
1 files changed, 20 insertions, 23 deletions
diff --git a/src/drumkit.h b/src/drumkit.h
index aa06969..2b1886a 100644
--- a/src/drumkit.h
+++ b/src/drumkit.h
@@ -24,8 +24,7 @@
* along with DrumGizmo; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#ifndef __DRUMGIZMO_DRUMKIT_H__
-#define __DRUMGIZMO_DRUMKIT_H__
+#pragma once
#include <map>
#include <string>
@@ -34,37 +33,35 @@
#include "instrument.h"
#include "versionstr.h"
-class DrumKitParser;
-class DrumKit {
- friend class DrumKitParser;
+class DrumKit
+{
+ friend class DrumKitParser;
public:
- DrumKit();
- ~DrumKit();
+ DrumKit();
+ ~DrumKit();
- std::string file();
+ std::string file();
- std::string name();
- std::string description();
-
- Instruments instruments;
- Channels channels;
-
- void clear();
+ std::string name();
+ std::string description();
- bool isValid();
+ Instruments instruments;
+ Channels channels;
- size_t samplerate();
+ void clear();
+
+ bool isValid();
+
+ size_t samplerate();
private:
void *magic{nullptr};
- std::string _file;
+ std::string _file;
- std::string _name;
- std::string _description;
+ std::string _name;
+ std::string _description;
size_t _samplerate{0};
- VersionStr _version;
+ VersionStr _version;
};
-
-#endif/*__DRUMGIZMO_DRUMKIT_H__*/