summaryrefslogtreecommitdiff
path: root/src/midimapparser.cc
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2015-05-16 08:35:39 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2015-05-16 08:35:39 +0200
commit0adc05286d97536637d01ed0a295d45f7bb60c1d (patch)
tree7f06e82a515d4ab47f5c944eaec98c2b43b8c146 /src/midimapparser.cc
parentc91ae2624f3d3c003c6b2065f3cc128b1b039801 (diff)
parentceda77eb38f0b0824f03348f5291e3a42d8f7306 (diff)
Merge remote-tracking branch 'origin' into diskstreaming
Conflicts: src/Makefile.am.drumgizmo src/drumgizmo.h
Diffstat (limited to 'src/midimapparser.cc')
-rw-r--r--src/midimapparser.cc17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/midimapparser.cc b/src/midimapparser.cc
index 07210a5..9d30a05 100644
--- a/src/midimapparser.cc
+++ b/src/midimapparser.cc
@@ -50,20 +50,3 @@ int MidiMapParser::readData(char *data, size_t size)
if(!fd) return -1;
return fread(data, 1, size, fd);
}
-
-#ifdef TEST_MIDIMAPPARSER
-//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_MIDIMAPPARSER*/