From b58bd2842d411c60c574e8ac72be520f48a8cd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Gl=C3=B6ckner?= <cgloeckner@freenet.de>
Date: Tue, 29 Mar 2016 16:53:03 +0200
Subject: Reformatted MidiMapper
---
src/midimapper.cc | 18 ++++++++++++------
src/midimapper.h | 16 +++++++---------
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/src/midimapper.cc b/src/midimapper.cc
index 8df5901..05f69e5 100644
--- a/src/midimapper.cc
+++ b/src/midimapper.cc
@@ -28,14 +28,20 @@
int MidiMapper::lookup(int note)
{
- if(midimap.find(note) == midimap.end()) return -1;
- std::string instr = midimap[note];
- if(instrmap.find(instr) == instrmap.end()) return -1;
- return instrmap[instr];
+ if(midimap.find(note) == midimap.end())
+ {
+ return -1;
+ }
+ std::string instr = midimap[note];
+ if(instrmap.find(instr) == instrmap.end())
+ {
+ return -1;
+ }
+ return instrmap[instr];
}
void MidiMapper::clear()
{
- midimap.clear();
- instrmap.clear();
+ midimap.clear();
+ instrmap.clear();
}
diff --git a/src/midimapper.h b/src/midimapper.h
index e8f7ab3..1887013 100644
--- a/src/midimapper.h
+++ b/src/midimapper.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_MIDIMAPPER_H__
-#define __DRUMGIZMO_MIDIMAPPER_H__
+#pragma once
#include <map>
#include <string>
@@ -33,14 +32,13 @@
typedef std::map<int, std::string> midimap_t;
typedef std::map<std::string, int> instrmap_t;
-class MidiMapper {
+class MidiMapper
+{
public:
- void clear();
+ void clear();
- int lookup(int note);
+ int lookup(int note);
- instrmap_t instrmap;
- midimap_t midimap;
+ instrmap_t instrmap;
+ midimap_t midimap;
};
-
-#endif/*__DRUMGIZMO_MIDIMAPPER_H__*/
--
cgit v1.2.3