diff options
author | David Robillard <d@drobilla.net> | 2015-10-05 13:58:35 -0400 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2016-03-21 18:58:31 -0400 |
commit | eaca325ce81c63888ee70305ad384102e46757be (patch) | |
tree | a22a611e9e3f1bb70ac8b4a69287b25863f0f81f /libs/evoral | |
parent | ea354226c19c65c81e4b0685caef1d0e5d005eab (diff) |
Trim dependence on evoral types.hpp and Beats.hpp
Diffstat (limited to 'libs/evoral')
-rw-r--r-- | libs/evoral/evoral/ControlList.hpp | 1 | ||||
-rw-r--r-- | libs/evoral/evoral/ControlSet.hpp | 1 | ||||
-rw-r--r-- | libs/evoral/evoral/EventList.hpp | 5 | ||||
-rw-r--r-- | libs/evoral/evoral/Sequence.hpp | 1 | ||||
-rw-r--r-- | libs/evoral/evoral/types.hpp | 6 | ||||
-rw-r--r-- | libs/evoral/src/ControlList.cpp | 1 | ||||
-rw-r--r-- | libs/evoral/src/Event.cpp | 2 | ||||
-rw-r--r-- | libs/evoral/src/MIDIEvent.cpp | 1 | ||||
-rw-r--r-- | libs/evoral/src/Note.cpp | 2 | ||||
-rw-r--r-- | libs/evoral/src/Sequence.cpp | 1 | ||||
-rw-r--r-- | libs/evoral/src/types.cpp | 1 | ||||
-rw-r--r-- | libs/evoral/test/SequenceTest.hpp | 1 |
12 files changed, 13 insertions, 10 deletions
diff --git a/libs/evoral/evoral/ControlList.hpp b/libs/evoral/evoral/ControlList.hpp index f1a4627a1c..f424188c56 100644 --- a/libs/evoral/evoral/ControlList.hpp +++ b/libs/evoral/evoral/ControlList.hpp @@ -31,7 +31,6 @@ #include "pbd/signals.h" #include "evoral/visibility.h" -#include "evoral/types.hpp" #include "evoral/Range.hpp" #include "evoral/Parameter.hpp" #include "evoral/ParameterDescriptor.hpp" diff --git a/libs/evoral/evoral/ControlSet.hpp b/libs/evoral/evoral/ControlSet.hpp index f1c2d96f49..5a9fc588b2 100644 --- a/libs/evoral/evoral/ControlSet.hpp +++ b/libs/evoral/evoral/ControlSet.hpp @@ -27,7 +27,6 @@ #include "pbd/signals.h" #include "evoral/visibility.h" -#include "evoral/types.hpp" #include "evoral/Parameter.hpp" #include "evoral/ControlList.hpp" diff --git a/libs/evoral/evoral/EventList.hpp b/libs/evoral/evoral/EventList.hpp index 0766d488ac..38ade74fee 100644 --- a/libs/evoral/evoral/EventList.hpp +++ b/libs/evoral/evoral/EventList.hpp @@ -20,10 +20,9 @@ #include <list> -#include "evoral/visibility.h" -#include "evoral/EventSink.hpp" -#include "evoral/types.hpp" #include "evoral/Event.hpp" +#include "evoral/EventSink.hpp" +#include "evoral/visibility.h" namespace Evoral { diff --git a/libs/evoral/evoral/Sequence.hpp b/libs/evoral/evoral/Sequence.hpp index 93e97c65e1..8485f94a49 100644 --- a/libs/evoral/evoral/Sequence.hpp +++ b/libs/evoral/evoral/Sequence.hpp @@ -28,7 +28,6 @@ #include <glibmm/threads.h> #include "evoral/visibility.h" -#include "evoral/types.hpp" #include "evoral/Note.hpp" #include "evoral/ControlSet.hpp" #include "evoral/ControlList.hpp" diff --git a/libs/evoral/evoral/types.hpp b/libs/evoral/evoral/types.hpp index 7d3f415142..a5d4a8ca1e 100644 --- a/libs/evoral/evoral/types.hpp +++ b/libs/evoral/evoral/types.hpp @@ -27,11 +27,7 @@ #include <limits> #include <list> -#include "pbd/debug.h" - -#include "evoral/Beats.hpp" #include "evoral/visibility.h" - #include "pbd/debug.h" namespace Evoral { @@ -44,6 +40,8 @@ typedef int32_t event_id_t; /** Type of an event (opaque, mapped by application) */ typedef uint32_t EventType; +class Beats; + } // namespace Evoral namespace PBD { diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp index 73c1675a6c..2690a64426 100644 --- a/libs/evoral/src/ControlList.cpp +++ b/libs/evoral/src/ControlList.cpp @@ -36,6 +36,7 @@ #include "evoral/Curve.hpp" #include "evoral/ParameterDescriptor.hpp" #include "evoral/TypeMap.hpp" +#include "evoral/types.hpp" #include "pbd/compose.h" #include "pbd/debug.h" diff --git a/libs/evoral/src/Event.cpp b/libs/evoral/src/Event.cpp index 64caba3952..09b240284f 100644 --- a/libs/evoral/src/Event.cpp +++ b/libs/evoral/src/Event.cpp @@ -17,7 +17,9 @@ */ #include <glib.h> + #include "evoral/Event.hpp" +#include "evoral/Beats.hpp" namespace Evoral { diff --git a/libs/evoral/src/MIDIEvent.cpp b/libs/evoral/src/MIDIEvent.cpp index 4985f66cf4..d03a3ff06a 100644 --- a/libs/evoral/src/MIDIEvent.cpp +++ b/libs/evoral/src/MIDIEvent.cpp @@ -17,6 +17,7 @@ */ #include <string> +#include "evoral/Beats.hpp" #include "evoral/MIDIEvent.hpp" #ifdef EVORAL_MIDI_XML #include "pbd/xml++.h" diff --git a/libs/evoral/src/Note.cpp b/libs/evoral/src/Note.cpp index afd7330325..a63bf43571 100644 --- a/libs/evoral/src/Note.cpp +++ b/libs/evoral/src/Note.cpp @@ -23,6 +23,8 @@ #include "evoral/Note.hpp" #endif +#include "evoral/Beats.hpp" + namespace Evoral { template<typename Time> diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp index 7f032487b1..a73720009a 100644 --- a/libs/evoral/src/Sequence.cpp +++ b/libs/evoral/src/Sequence.cpp @@ -31,6 +31,7 @@ #include "pbd/compose.h" #include "pbd/error.h" +#include "evoral/Beats.hpp" #include "evoral/Control.hpp" #include "evoral/ControlList.hpp" #include "evoral/ControlSet.hpp" diff --git a/libs/evoral/src/types.cpp b/libs/evoral/src/types.cpp index 50c2975d3d..db061fd8e9 100644 --- a/libs/evoral/src/types.cpp +++ b/libs/evoral/src/types.cpp @@ -18,6 +18,7 @@ #include <limits.h> +#include "evoral/Beats.hpp" #include "evoral/types.hpp" namespace Evoral { diff --git a/libs/evoral/test/SequenceTest.hpp b/libs/evoral/test/SequenceTest.hpp index 3207541571..de51f714a1 100644 --- a/libs/evoral/test/SequenceTest.hpp +++ b/libs/evoral/test/SequenceTest.hpp @@ -2,6 +2,7 @@ #include <sigc++/sigc++.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> +#include "evoral/Beats.hpp" #include "evoral/Sequence.hpp" #include "evoral/TypeMap.hpp" #include "evoral/EventSink.hpp" |