summaryrefslogtreecommitdiff
path: root/libs/evoral
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-02-14 17:28:57 +0000
committerDavid Robillard <d@drobilla.net>2009-02-14 17:28:57 +0000
commit6314c699710a4cb8ccd2b853f895c8c2a26eecf9 (patch)
treead8978cedf344f211a98123f257b4b734fe57562 /libs/evoral
parent50d7d196146769a42fb7261b8f1bb81cc1dec17a (diff)
SMF -> OldSMF
git-svn-id: svn://localhost/ardour2/branches/3.0@4551 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral')
-rw-r--r--libs/evoral/SConscript3
-rw-r--r--libs/evoral/evoral/OldSMF.hpp (renamed from libs/evoral/evoral/SMF.hpp)0
-rw-r--r--libs/evoral/src/OldSMF.cpp (renamed from libs/evoral/src/SMF.cpp)2
-rw-r--r--libs/evoral/wscript4
4 files changed, 3 insertions, 6 deletions
diff --git a/libs/evoral/SConscript b/libs/evoral/SConscript
index bf3f54c1db..f07c2052b2 100644
--- a/libs/evoral/SConscript
+++ b/libs/evoral/SConscript
@@ -31,10 +31,9 @@ src/ControlList.cpp
src/ControlSet.cpp
src/Curve.cpp
src/Event.cpp
+src/LibSMF.cpp
src/MIDIEvent.cpp
src/Note.cpp
-src/SMF.cpp
-src/LibSMF.cpp
src/SMFReader.cpp
src/Sequence.cpp
""")
diff --git a/libs/evoral/evoral/SMF.hpp b/libs/evoral/evoral/OldSMF.hpp
index e9f2f47bfe..e9f2f47bfe 100644
--- a/libs/evoral/evoral/SMF.hpp
+++ b/libs/evoral/evoral/OldSMF.hpp
diff --git a/libs/evoral/src/SMF.cpp b/libs/evoral/src/OldSMF.cpp
index 5d129ce7e7..3e396cff96 100644
--- a/libs/evoral/src/SMF.cpp
+++ b/libs/evoral/src/OldSMF.cpp
@@ -24,7 +24,7 @@
#include <iostream>
#include <glibmm/miscutils.h>
#include "evoral/midi_util.h"
-#include "evoral/SMF.hpp"
+#include "evoral/OldSMF.hpp"
#include "evoral/SMFReader.hpp"
#include "evoral/Event.hpp"
diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index baa773cc8b..1e0df3e655 100644
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -67,11 +67,9 @@ def build(bld):
src/ControlSet.cpp
src/Curve.cpp
src/Event.cpp
+ src/LibSMF.cpp
src/MIDIEvent.cpp
src/Note.cpp
- src/SMF.cpp
- src/SMFReader.cpp
- src/LibSMF.cpp
src/Sequence.cpp
'''
obj.export_incdirs = ['.']