diff options
Diffstat (limited to 'libs/evoral')
-rw-r--r-- | libs/evoral/evoral/Control.h (renamed from libs/evoral/evoral/Control.hpp) | 4 | ||||
-rw-r--r-- | libs/evoral/evoral/ControlList.h (renamed from libs/evoral/evoral/ControlList.hpp) | 6 | ||||
-rw-r--r-- | libs/evoral/evoral/ControlSet.h (renamed from libs/evoral/evoral/ControlSet.hpp) | 4 | ||||
-rw-r--r-- | libs/evoral/evoral/Curve.h (renamed from libs/evoral/evoral/Curve.hpp) | 0 | ||||
-rw-r--r-- | libs/evoral/evoral/Event.h (renamed from libs/evoral/evoral/Event.hpp) | 2 | ||||
-rw-r--r-- | libs/evoral/evoral/EventList.h (renamed from libs/evoral/evoral/EventList.hpp) | 4 | ||||
-rw-r--r-- | libs/evoral/evoral/EventSink.h (renamed from libs/evoral/evoral/EventSink.hpp) | 2 | ||||
-rw-r--r-- | libs/evoral/evoral/MIDIXML.h (renamed from libs/evoral/evoral/MIDIXML.hpp) | 2 | ||||
-rw-r--r-- | libs/evoral/evoral/Note.h (renamed from libs/evoral/evoral/Note.hpp) | 2 | ||||
-rw-r--r-- | libs/evoral/evoral/Parameter.h (renamed from libs/evoral/evoral/Parameter.hpp) | 2 | ||||
-rw-r--r-- | libs/evoral/evoral/ParameterDescriptor.h (renamed from libs/evoral/evoral/ParameterDescriptor.hpp) | 0 | ||||
-rw-r--r-- | libs/evoral/evoral/PatchChange.h (renamed from libs/evoral/evoral/PatchChange.hpp) | 4 | ||||
-rw-r--r-- | libs/evoral/evoral/Range.h (renamed from libs/evoral/evoral/Range.hpp) | 0 | ||||
-rw-r--r-- | libs/evoral/evoral/SMF.h (renamed from libs/evoral/evoral/SMF.hpp) | 2 | ||||
-rw-r--r-- | libs/evoral/evoral/SMFReader.h (renamed from libs/evoral/evoral/SMFReader.hpp) | 0 | ||||
-rw-r--r-- | libs/evoral/evoral/Sequence.h (renamed from libs/evoral/evoral/Sequence.hpp) | 8 | ||||
-rw-r--r-- | libs/evoral/evoral/TimeConverter.h (renamed from libs/evoral/evoral/TimeConverter.hpp) | 0 | ||||
-rw-r--r-- | libs/evoral/evoral/TypeMap.h (renamed from libs/evoral/evoral/TypeMap.hpp) | 2 | ||||
-rw-r--r-- | libs/evoral/evoral/types.h (renamed from libs/evoral/evoral/types.hpp) | 0 | ||||
-rw-r--r-- | libs/evoral/src/Control.cc (renamed from libs/evoral/src/Control.cpp) | 8 | ||||
-rw-r--r-- | libs/evoral/src/ControlList.cc (renamed from libs/evoral/src/ControlList.cpp) | 10 | ||||
-rw-r--r-- | libs/evoral/src/ControlSet.cc (renamed from libs/evoral/src/ControlSet.cpp) | 8 | ||||
-rw-r--r-- | libs/evoral/src/Curve.cc (renamed from libs/evoral/src/Curve.cpp) | 4 | ||||
-rw-r--r-- | libs/evoral/src/Event.cc (renamed from libs/evoral/src/Event.cpp) | 2 | ||||
-rw-r--r-- | libs/evoral/src/Note.cc (renamed from libs/evoral/src/Note.cpp) | 2 | ||||
-rw-r--r-- | libs/evoral/src/SMF.cc (renamed from libs/evoral/src/SMF.cpp) | 4 | ||||
-rw-r--r-- | libs/evoral/src/SMFReader.cc (renamed from libs/evoral/src/SMFReader.cpp) | 2 | ||||
-rw-r--r-- | libs/evoral/src/Sequence.cc (renamed from libs/evoral/src/Sequence.cpp) | 16 | ||||
-rw-r--r-- | libs/evoral/src/TimeConverter.cc (renamed from libs/evoral/src/TimeConverter.cpp) | 4 | ||||
-rw-r--r-- | libs/evoral/src/debug.cc (renamed from libs/evoral/src/debug.cpp) | 2 | ||||
-rw-r--r-- | libs/evoral/test/BeatsTest.cc (renamed from libs/evoral/test/BeatsTest.cpp) | 0 | ||||
-rw-r--r-- | libs/evoral/test/BeatsTest.h (renamed from libs/evoral/test/BeatsTest.hpp) | 0 | ||||
-rw-r--r-- | libs/evoral/test/CurveTest.cc (renamed from libs/evoral/test/CurveTest.cpp) | 4 | ||||
-rw-r--r-- | libs/evoral/test/CurveTest.h (renamed from libs/evoral/test/CurveTest.hpp) | 2 | ||||
-rw-r--r-- | libs/evoral/test/NoteTest.cc (renamed from libs/evoral/test/NoteTest.cpp) | 2 | ||||
-rw-r--r-- | libs/evoral/test/NoteTest.h (renamed from libs/evoral/test/NoteTest.hpp) | 0 | ||||
-rw-r--r-- | libs/evoral/test/RangeTest.cc (renamed from libs/evoral/test/RangeTest.cpp) | 2 | ||||
-rw-r--r-- | libs/evoral/test/RangeTest.h (renamed from libs/evoral/test/RangeTest.hpp) | 0 | ||||
-rw-r--r-- | libs/evoral/test/SMFTest.cc (renamed from libs/evoral/test/SMFTest.cpp) | 0 | ||||
-rw-r--r-- | libs/evoral/test/SMFTest.h (renamed from libs/evoral/test/SMFTest.hpp) | 2 | ||||
-rw-r--r-- | libs/evoral/test/SequenceTest.cc (renamed from libs/evoral/test/SequenceTest.cpp) | 0 | ||||
-rw-r--r-- | libs/evoral/test/SequenceTest.h (renamed from libs/evoral/test/SequenceTest.hpp) | 8 | ||||
-rw-r--r-- | libs/evoral/test/testrunner.cc (renamed from libs/evoral/test/testrunner.cpp) | 0 | ||||
-rw-r--r-- | libs/evoral/wscript | 34 |
44 files changed, 80 insertions, 80 deletions
diff --git a/libs/evoral/evoral/Control.hpp b/libs/evoral/evoral/Control.h index 25a313f9c3..fd1f5eaa46 100644 --- a/libs/evoral/evoral/Control.hpp +++ b/libs/evoral/evoral/Control.h @@ -27,8 +27,8 @@ #include "pbd/signals.h" #include "evoral/visibility.h" -#include "evoral/Parameter.hpp" -#include "evoral/ParameterDescriptor.hpp" +#include "evoral/Parameter.h" +#include "evoral/ParameterDescriptor.h" namespace Evoral { diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.h index a2cc446f4b..baa00dc1f6 100644 --- a/libs/evoral/evoral/ControlList.hpp +++ b/libs/evoral/evoral/ControlList.h @@ -35,9 +35,9 @@ #include "pbd/signals.h" #include "evoral/visibility.h" -#include "evoral/Range.hpp" -#include "evoral/Parameter.hpp" -#include "evoral/ParameterDescriptor.hpp" +#include "evoral/Range.h" +#include "evoral/Parameter.h" +#include "evoral/ParameterDescriptor.h" namespace Evoral { diff --git a/libs/evoral/evoral/ControlSet.hpp b/libs/evoral/evoral/ControlSet.h index ef7e8f319f..81d255859c 100644 --- a/libs/evoral/evoral/ControlSet.hpp +++ b/libs/evoral/evoral/ControlSet.h @@ -30,8 +30,8 @@ #include "pbd/signals.h" #include "evoral/visibility.h" -#include "evoral/Parameter.hpp" -#include "evoral/ControlList.hpp" +#include "evoral/Parameter.h" +#include "evoral/ControlList.h" namespace Evoral { diff --git a/libs/evoral/evoral/Curve.hpp b/libs/evoral/evoral/Curve.h index 33bcf1d72a..33bcf1d72a 100644 --- a/libs/evoral/evoral/Curve.hpp +++ b/libs/evoral/evoral/Curve.h diff --git a/libs/evoral/evoral/Event.hpp b/libs/evoral/evoral/Event.h index 662d7db934..6780b4e636 100644 --- a/libs/evoral/evoral/Event.hpp +++ b/libs/evoral/evoral/Event.h @@ -29,7 +29,7 @@ #include <stdint.h> #include "evoral/midi_events.h" -#include "evoral/types.hpp" +#include "evoral/types.h" #include "evoral/visibility.h" /** If this is not defined, all methods of MidiEvent are RT safe diff --git a/libs/evoral/evoral/EventList.hpp b/libs/evoral/evoral/EventList.h index a655380a0c..afa251f041 100644 --- a/libs/evoral/evoral/EventList.hpp +++ b/libs/evoral/evoral/EventList.h @@ -22,8 +22,8 @@ #include <list> -#include "evoral/Event.hpp" -#include "evoral/EventSink.hpp" +#include "evoral/Event.h" +#include "evoral/EventSink.h" #include "evoral/visibility.h" namespace Evoral { diff --git a/libs/evoral/evoral/EventSink.hpp b/libs/evoral/evoral/EventSink.h index 6e097ceb23..d3f8c7689c 100644 --- a/libs/evoral/evoral/EventSink.hpp +++ b/libs/evoral/evoral/EventSink.h @@ -21,7 +21,7 @@ #define EVORAL_EVENT_SINK_HPP #include "evoral/visibility.h" -#include "evoral/types.hpp" +#include "evoral/types.h" namespace Evoral { diff --git a/libs/evoral/evoral/MIDIXML.hpp b/libs/evoral/evoral/MIDIXML.h index 15483ae503..1cd6655ba3 100644 --- a/libs/evoral/evoral/MIDIXML.hpp +++ b/libs/evoral/evoral/MIDIXML.h @@ -19,7 +19,7 @@ #ifndef EVORAL_MIDI_XML_HPP #define EVORAL_MIDI_XML_HPP -#include "evoral/Event.hpp" +#include "evoral/Event.h" #include "pbd/xml++.h" namespace Evoral { diff --git a/libs/evoral/evoral/Note.hpp b/libs/evoral/evoral/Note.h index af88f29544..5929c33bbb 100644 --- a/libs/evoral/evoral/Note.hpp +++ b/libs/evoral/evoral/Note.h @@ -27,7 +27,7 @@ #include <stdint.h> #include "evoral/visibility.h" -#include "evoral/Event.hpp" +#include "evoral/Event.h" namespace Evoral { diff --git a/libs/evoral/evoral/Parameter.hpp b/libs/evoral/evoral/Parameter.h index 0874605315..672afec653 100644 --- a/libs/evoral/evoral/Parameter.hpp +++ b/libs/evoral/evoral/Parameter.h @@ -26,7 +26,7 @@ #include <boost/shared_ptr.hpp> #include "evoral/visibility.h" -#include "evoral/types.hpp" +#include "evoral/types.h" namespace Evoral { diff --git a/libs/evoral/evoral/ParameterDescriptor.hpp b/libs/evoral/evoral/ParameterDescriptor.h index 33fe4ce70e..33fe4ce70e 100644 --- a/libs/evoral/evoral/ParameterDescriptor.hpp +++ b/libs/evoral/evoral/ParameterDescriptor.h diff --git a/libs/evoral/evoral/PatchChange.hpp b/libs/evoral/evoral/PatchChange.h index 83f17a2836..1d7d752eea 100644 --- a/libs/evoral/evoral/PatchChange.hpp +++ b/libs/evoral/evoral/PatchChange.h @@ -22,8 +22,8 @@ #define EVORAL_PATCH_CHANGE_HPP #include "evoral/visibility.h" -#include "evoral/Event.hpp" -#include "evoral/Event.hpp" +#include "evoral/Event.h" +#include "evoral/Event.h" namespace Evoral { diff --git a/libs/evoral/evoral/Range.hpp b/libs/evoral/evoral/Range.h index 71e02bef01..71e02bef01 100644 --- a/libs/evoral/evoral/Range.hpp +++ b/libs/evoral/evoral/Range.h diff --git a/libs/evoral/evoral/SMF.hpp b/libs/evoral/evoral/SMF.h index 4888ba6a60..9ef03f552d 100644 --- a/libs/evoral/evoral/SMF.hpp +++ b/libs/evoral/evoral/SMF.h @@ -26,7 +26,7 @@ #include <set> #include "evoral/visibility.h" -#include "evoral/types.hpp" +#include "evoral/types.h" struct smf_struct; struct smf_track_struct; diff --git a/libs/evoral/evoral/SMFReader.hpp b/libs/evoral/evoral/SMFReader.h index 81f9f6a6ce..81f9f6a6ce 100644 --- a/libs/evoral/evoral/SMFReader.hpp +++ b/libs/evoral/evoral/SMFReader.h diff --git a/libs/evoral/evoral/Sequence.hpp b/libs/evoral/evoral/Sequence.h index 2dbca34d7d..04864dde8d 100644 --- a/libs/evoral/evoral/Sequence.hpp +++ b/libs/evoral/evoral/Sequence.h @@ -32,10 +32,10 @@ #include <glibmm/threads.h> #include "evoral/visibility.h" -#include "evoral/Note.hpp" -#include "evoral/ControlSet.hpp" -#include "evoral/ControlList.hpp" -#include "evoral/PatchChange.hpp" +#include "evoral/Note.h" +#include "evoral/ControlSet.h" +#include "evoral/ControlList.h" +#include "evoral/PatchChange.h" namespace Evoral { diff --git a/libs/evoral/evoral/TimeConverter.hpp b/libs/evoral/evoral/TimeConverter.h index b0ef750f28..b0ef750f28 100644 --- a/libs/evoral/evoral/TimeConverter.hpp +++ b/libs/evoral/evoral/TimeConverter.h diff --git a/libs/evoral/evoral/TypeMap.hpp b/libs/evoral/evoral/TypeMap.h index be2cc62834..af9c8c3962 100644 --- a/libs/evoral/evoral/TypeMap.hpp +++ b/libs/evoral/evoral/TypeMap.h @@ -24,7 +24,7 @@ #include <string> #include "evoral/visibility.h" -#include "evoral/types.hpp" +#include "evoral/types.h" namespace Evoral { diff --git a/libs/evoral/evoral/types.hpp b/libs/evoral/evoral/types.h index 35eea56d6d..35eea56d6d 100644 --- a/libs/evoral/evoral/types.hpp +++ b/libs/evoral/evoral/types.h diff --git a/libs/evoral/src/Control.cpp b/libs/evoral/src/Control.cc index 95b6e32432..0fd6449aa3 100644 --- a/libs/evoral/src/Control.cpp +++ b/libs/evoral/src/Control.cc @@ -21,10 +21,10 @@ #include <iostream> -#include "evoral/Control.hpp" -#include "evoral/ControlList.hpp" -#include "evoral/ParameterDescriptor.hpp" -#include "evoral/TypeMap.hpp" +#include "evoral/Control.h" +#include "evoral/ControlList.h" +#include "evoral/ParameterDescriptor.h" +#include "evoral/TypeMap.h" namespace Evoral { diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cc index e622a03d7a..897a689dfc 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cc @@ -40,11 +40,11 @@ #include <iostream> #include <utility> -#include "evoral/ControlList.hpp" -#include "evoral/Curve.hpp" -#include "evoral/ParameterDescriptor.hpp" -#include "evoral/TypeMap.hpp" -#include "evoral/types.hpp" +#include "evoral/ControlList.h" +#include "evoral/Curve.h" +#include "evoral/ParameterDescriptor.h" +#include "evoral/TypeMap.h" +#include "evoral/types.h" #include "pbd/control_math.h" #include "pbd/compose.h" diff --git a/libs/evoral/src/ControlSet.cpp b/libs/evoral/src/ControlSet.cc index 132b48beba..c9096187db 100644 --- a/libs/evoral/src/ControlSet.cpp +++ b/libs/evoral/src/ControlSet.cc @@ -20,10 +20,10 @@ #include <iostream> #include <limits> -#include "evoral/ControlSet.hpp" -#include "evoral/ControlList.hpp" -#include "evoral/Control.hpp" -#include "evoral/Event.hpp" +#include "evoral/ControlSet.h" +#include "evoral/ControlList.h" +#include "evoral/Control.h" +#include "evoral/Event.h" using namespace std; diff --git a/libs/evoral/src/Curve.cpp b/libs/evoral/src/Curve.cc index c4a2706992..37e6407537 100644 --- a/libs/evoral/src/Curve.cpp +++ b/libs/evoral/src/Curve.cc @@ -31,8 +31,8 @@ #include "pbd/control_math.h" -#include "evoral/Curve.hpp" -#include "evoral/ControlList.hpp" +#include "evoral/Curve.h" +#include "evoral/ControlList.h" using namespace std; using namespace sigc; diff --git a/libs/evoral/src/Event.cpp b/libs/evoral/src/Event.cc index 91496f32af..a2c1cddbc4 100644 --- a/libs/evoral/src/Event.cpp +++ b/libs/evoral/src/Event.cc @@ -22,7 +22,7 @@ #include <glib.h> #include "temporal/beats.h" -#include "evoral/Event.hpp" +#include "evoral/Event.h" namespace Evoral { diff --git a/libs/evoral/src/Note.cpp b/libs/evoral/src/Note.cc index 00d02204c9..a703a85ad8 100644 --- a/libs/evoral/src/Note.cpp +++ b/libs/evoral/src/Note.cc @@ -22,7 +22,7 @@ #include <limits> #include <glib.h> #ifndef COMPILER_MSVC -#include "evoral/Note.hpp" +#include "evoral/Note.h" #endif #include "temporal/beats.h" diff --git a/libs/evoral/src/SMF.cpp b/libs/evoral/src/SMF.cc index 8297429dc1..aebc41e20a 100644 --- a/libs/evoral/src/SMF.cpp +++ b/libs/evoral/src/SMF.cc @@ -30,8 +30,8 @@ #include "libsmf/smf.h" -#include "evoral/Event.hpp" -#include "evoral/SMF.hpp" +#include "evoral/Event.h" +#include "evoral/SMF.h" #include "evoral/midi_util.h" #ifdef COMPILER_MSVC diff --git a/libs/evoral/src/SMFReader.cpp b/libs/evoral/src/SMFReader.cc index bbd6e6c4ec..601cd7ac60 100644 --- a/libs/evoral/src/SMFReader.cpp +++ b/libs/evoral/src/SMFReader.cc @@ -23,7 +23,7 @@ #include <glibmm/miscutils.h> #include "evoral/midi_util.h" -#include "evoral/SMFReader.hpp" +#include "evoral/SMFReader.h" using namespace std; diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cc index 65b70bb946..a1f166cd77 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cc @@ -29,7 +29,7 @@ #include <cstdio> #if __clang__ -#include "evoral/Note.hpp" +#include "evoral/Note.h" #endif #include "pbd/compose.h" @@ -37,13 +37,13 @@ #include "temporal/beats.h" -#include "evoral/Control.hpp" -#include "evoral/ControlList.hpp" -#include "evoral/ControlSet.hpp" -#include "evoral/EventSink.hpp" -#include "evoral/ParameterDescriptor.hpp" -#include "evoral/Sequence.hpp" -#include "evoral/TypeMap.hpp" +#include "evoral/Control.h" +#include "evoral/ControlList.h" +#include "evoral/ControlSet.h" +#include "evoral/EventSink.h" +#include "evoral/ParameterDescriptor.h" +#include "evoral/Sequence.h" +#include "evoral/TypeMap.h" #include "evoral/midi_util.h" #include "pbd/i18n.h" diff --git a/libs/evoral/src/TimeConverter.cpp b/libs/evoral/src/TimeConverter.cc index 7d6dfd5ac4..d34be44a31 100644 --- a/libs/evoral/src/TimeConverter.cpp +++ b/libs/evoral/src/TimeConverter.cc @@ -21,8 +21,8 @@ #include "temporal/beats.h" #include "temporal/types.h" -#include "evoral/TimeConverter.hpp" -#include "evoral/types.hpp" +#include "evoral/TimeConverter.h" +#include "evoral/types.h" namespace Evoral { diff --git a/libs/evoral/src/debug.cpp b/libs/evoral/src/debug.cc index 785c33bf1b..e6ed3aaa6c 100644 --- a/libs/evoral/src/debug.cpp +++ b/libs/evoral/src/debug.cc @@ -1,4 +1,4 @@ -#include "evoral/types.hpp" +#include "evoral/types.h" PBD::DebugBits PBD::DEBUG::Sequence = PBD::new_debug_bit ("sequence"); PBD::DebugBits PBD::DEBUG::Note = PBD::new_debug_bit ("note"); diff --git a/libs/evoral/test/BeatsTest.cpp b/libs/evoral/test/BeatsTest.cc index 07eab1f1ec..07eab1f1ec 100644 --- a/libs/evoral/test/BeatsTest.cpp +++ b/libs/evoral/test/BeatsTest.cc diff --git a/libs/evoral/test/BeatsTest.hpp b/libs/evoral/test/BeatsTest.h index 0db3831b49..0db3831b49 100644 --- a/libs/evoral/test/BeatsTest.hpp +++ b/libs/evoral/test/BeatsTest.h diff --git a/libs/evoral/test/CurveTest.cpp b/libs/evoral/test/CurveTest.cc index 820c53f5ac..195be51a4b 100644 --- a/libs/evoral/test/CurveTest.cpp +++ b/libs/evoral/test/CurveTest.cc @@ -1,6 +1,6 @@ #include "CurveTest.hpp" -#include "evoral/ControlList.hpp" -#include "evoral/Curve.hpp" +#include "evoral/ControlList.h" +#include "evoral/Curve.h" #include <stdlib.h> CPPUNIT_TEST_SUITE_REGISTRATION (CurveTest); diff --git a/libs/evoral/test/CurveTest.hpp b/libs/evoral/test/CurveTest.h index 60c0cb788c..32606794d6 100644 --- a/libs/evoral/test/CurveTest.hpp +++ b/libs/evoral/test/CurveTest.h @@ -1,7 +1,7 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <boost/shared_ptr.hpp> -#include "evoral/ControlList.hpp" +#include "evoral/ControlList.h" class CurveTest : public CppUnit::TestFixture { diff --git a/libs/evoral/test/NoteTest.cpp b/libs/evoral/test/NoteTest.cc index ead96f1d99..43e599d743 100644 --- a/libs/evoral/test/NoteTest.cpp +++ b/libs/evoral/test/NoteTest.cc @@ -1,6 +1,6 @@ #include "NoteTest.hpp" #include "temporal/beats.h" -#include "evoral/Note.hpp" +#include "evoral/Note.h" #include <stdlib.h> CPPUNIT_TEST_SUITE_REGISTRATION (NoteTest); diff --git a/libs/evoral/test/NoteTest.hpp b/libs/evoral/test/NoteTest.h index 9d0af69022..9d0af69022 100644 --- a/libs/evoral/test/NoteTest.hpp +++ b/libs/evoral/test/NoteTest.h diff --git a/libs/evoral/test/RangeTest.cpp b/libs/evoral/test/RangeTest.cc index bbb2bdeb58..dcbe1c12dd 100644 --- a/libs/evoral/test/RangeTest.cpp +++ b/libs/evoral/test/RangeTest.cc @@ -1,5 +1,5 @@ #include "RangeTest.hpp" -#include "evoral/Range.hpp" +#include "evoral/Range.h" #include <stdlib.h> CPPUNIT_TEST_SUITE_REGISTRATION (RangeTest); diff --git a/libs/evoral/test/RangeTest.hpp b/libs/evoral/test/RangeTest.h index b06a477b4d..b06a477b4d 100644 --- a/libs/evoral/test/RangeTest.hpp +++ b/libs/evoral/test/RangeTest.h diff --git a/libs/evoral/test/SMFTest.cpp b/libs/evoral/test/SMFTest.cc index 7a7f1cdbe0..7a7f1cdbe0 100644 --- a/libs/evoral/test/SMFTest.cpp +++ b/libs/evoral/test/SMFTest.cc diff --git a/libs/evoral/test/SMFTest.hpp b/libs/evoral/test/SMFTest.h index d3f01c3607..79bf3d0e89 100644 --- a/libs/evoral/test/SMFTest.hpp +++ b/libs/evoral/test/SMFTest.h @@ -24,7 +24,7 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include "temporal/beats.h" -#include "evoral/SMF.hpp" +#include "evoral/SMF.h" #include "SequenceTest.hpp" using namespace Evoral; diff --git a/libs/evoral/test/SequenceTest.cpp b/libs/evoral/test/SequenceTest.cc index 6a5fbb64cf..6a5fbb64cf 100644 --- a/libs/evoral/test/SequenceTest.cpp +++ b/libs/evoral/test/SequenceTest.cc diff --git a/libs/evoral/test/SequenceTest.hpp b/libs/evoral/test/SequenceTest.h index a337b47279..b40cf15c0a 100644 --- a/libs/evoral/test/SequenceTest.hpp +++ b/libs/evoral/test/SequenceTest.h @@ -3,11 +3,11 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include "temporal/beats.h" -#include "evoral/Sequence.hpp" -#include "evoral/TypeMap.hpp" -#include "evoral/EventSink.hpp" +#include "evoral/Sequence.h" +#include "evoral/TypeMap.h" +#include "evoral/EventSink.h" #include "evoral/midi_events.h" -#include "evoral/Control.hpp" +#include "evoral/Control.h" using namespace Evoral; diff --git a/libs/evoral/test/testrunner.cpp b/libs/evoral/test/testrunner.cc index 12f2c9a629..12f2c9a629 100644 --- a/libs/evoral/test/testrunner.cpp +++ b/libs/evoral/test/testrunner.cc diff --git a/libs/evoral/wscript b/libs/evoral/wscript index 5cc7957e31..fba2667d61 100644 --- a/libs/evoral/wscript +++ b/libs/evoral/wscript @@ -61,7 +61,7 @@ def configure(conf): def build(bld): # Headers #bld.install_files('${INCLUDEDIR}/evoral', 'evoral/*.h') - #bld.install_files('${INCLUDEDIR}/evoral', 'evoral/*.hpp') + #bld.install_files('${INCLUDEDIR}/evoral', 'evoral/*.h') # Pkgconfig file #autowaf.build_pc(bld, 'EVORAL', EVORAL_VERSION, 'GLIBMM GTHREAD') @@ -87,16 +87,16 @@ def build(bld): libsmf.cflags = [ bld.env['compiler_flags_dict']['pic'] ] lib_source = ''' - src/Control.cpp - src/ControlList.cpp - src/ControlSet.cpp - src/Curve.cpp - src/Event.cpp - src/Note.cpp - src/SMF.cpp - src/Sequence.cpp - src/TimeConverter.cpp - src/debug.cpp + src/Control.cc + src/ControlList.cc + src/ControlSet.cc + src/Curve.cc + src/Event.cc + src/Note.cc + src/SMF.cc + src/Sequence.cc + src/TimeConverter.cc + src/debug.cc ''' # Library @@ -141,12 +141,12 @@ def build(bld): # Unit tests obj = bld(features = 'cxx cxxprogram') obj.source = ''' - test/SequenceTest.cpp - test/SMFTest.cpp - test/RangeTest.cpp - test/NoteTest.cpp - test/CurveTest.cpp - test/testrunner.cpp + test/SequenceTest.cc + test/SMFTest.cc + test/RangeTest.cc + test/NoteTest.cc + test/CurveTest.cc + test/testrunner.cc ''' obj.includes = ['.', './src'] obj.use = 'libevoral_static' |