diff options
31 files changed, 29 insertions, 30 deletions
diff --git a/gtk2_ardour/midi_cut_buffer.h b/gtk2_ardour/midi_cut_buffer.h index 8c92b9a442..da17c50413 100644 --- a/gtk2_ardour/midi_cut_buffer.h +++ b/gtk2_ardour/midi_cut_buffer.h @@ -19,7 +19,7 @@ #ifndef __gtk_ardour_midi_cut_buffer_h__ #define __gtk_ardour_midi_cut_buffer_h__ -#include "evoral/types.hpp" +#include "evoral/Beats.hpp" #include "ardour/automatable_sequence.h" diff --git a/gtk2_ardour/midi_list_editor.h b/gtk2_ardour/midi_list_editor.h index 9ff413946c..283a0da8bc 100644 --- a/gtk2_ardour/midi_list_editor.h +++ b/gtk2_ardour/midi_list_editor.h @@ -25,14 +25,13 @@ #include <gtkmm/liststore.h> #include <gtkmm/scrolledwindow.h> -#include "evoral/types.hpp" - #include "ardour/session_handle.h" #include "ardour_window.h" namespace Evoral { template<typename Time> class Note; + class Beats; }; namespace ARDOUR { diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h index 059aa9dc8f..d55f87c552 100644 --- a/gtk2_ardour/note_base.h +++ b/gtk2_ardour/note_base.h @@ -23,7 +23,6 @@ #include <boost/shared_ptr.hpp> #include "canvas/types.h" -#include "evoral/types.hpp" #include "rgb_macros.h" #include "ui_config.h" @@ -33,6 +32,7 @@ class MidiRegionView; namespace Evoral { template<typename T> class Note; + class Beats; } namespace ArdourCanvas { diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 45fbb9ece9..519a714c79 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -35,8 +35,8 @@ #include <gtkmm/notebook.h> #include <sigc++/signal.h> +#include "evoral/Beats.hpp" #include "evoral/Note.hpp" -#include "evoral/types.hpp" #include "pbd/statefuldestructible.h" diff --git a/gtk2_ardour/quantize_dialog.h b/gtk2_ardour/quantize_dialog.h index 8203875e98..f162dd0993 100644 --- a/gtk2_ardour/quantize_dialog.h +++ b/gtk2_ardour/quantize_dialog.h @@ -27,7 +27,6 @@ #include <gtkmm/checkbutton.h> #include <gtkmm/spinbutton.h> -#include "evoral/types.hpp" #include "ardour/types.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/step_editor.h b/gtk2_ardour/step_editor.h index 31632a801b..b16cd8f863 100644 --- a/gtk2_ardour/step_editor.h +++ b/gtk2_ardour/step_editor.h @@ -25,7 +25,7 @@ #include <sigc++/trackable.h> #include "pbd/signals.h" -#include "evoral/types.hpp" +#include "evoral/Beats.hpp" namespace ARDOUR { class MidiTrack; diff --git a/gtk2_ardour/transform_dialog.h b/gtk2_ardour/transform_dialog.h index 5111aa7543..df7a1c8b92 100644 --- a/gtk2_ardour/transform_dialog.h +++ b/gtk2_ardour/transform_dialog.h @@ -31,7 +31,6 @@ #include "ardour/midi_model.h" #include "ardour/transform.h" #include "ardour/types.h" -#include "evoral/types.hpp" #include "ardour_dialog.h" diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h index d24a0d9da9..39fdb11397 100644 --- a/libs/ardour/ardour/automation_control.h +++ b/libs/ardour/ardour/automation_control.h @@ -24,7 +24,6 @@ #include <boost/shared_ptr.hpp> #include <boost/enable_shared_from_this.hpp> -#include "evoral/types.hpp" #include "pbd/controllable.h" #include "evoral/Control.hpp" diff --git a/libs/ardour/ardour/beats_frames_converter.h b/libs/ardour/ardour/beats_frames_converter.h index 908dd1909e..4b7169bfe7 100644 --- a/libs/ardour/ardour/beats_frames_converter.h +++ b/libs/ardour/ardour/beats_frames_converter.h @@ -19,8 +19,8 @@ $Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $ */ +#include "evoral/Beats.hpp" #include "evoral/TimeConverter.hpp" -#include "evoral/types.hpp" #include "ardour/libardour_visibility.h" #include "ardour/types.h" diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index fb9be653e1..e51f8c3ef1 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -29,7 +29,7 @@ #include <boost/utility.hpp> -#include "evoral/types.hpp" +#include "evoral/Range.hpp" #include "ardour/ardour.h" #include "ardour/chan_count.h" diff --git a/libs/ardour/ardour/midi_operator.h b/libs/ardour/ardour/midi_operator.h index b79544ed61..589e93041d 100644 --- a/libs/ardour/ardour/midi_operator.h +++ b/libs/ardour/ardour/midi_operator.h @@ -23,7 +23,7 @@ #include <vector> #include <string> -#include "evoral/types.hpp" +#include "evoral/Beats.hpp" #include "evoral/Sequence.hpp" class Command; diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h index cb07bc1820..a84c464801 100644 --- a/libs/ardour/ardour/midi_playlist.h +++ b/libs/ardour/ardour/midi_playlist.h @@ -30,12 +30,12 @@ #include "ardour/midi_state_tracker.h" #include "ardour/note_fixer.h" #include "ardour/playlist.h" -#include "evoral/Beats.hpp" #include "evoral/Note.hpp" #include "evoral/Parameter.hpp" namespace Evoral { template<typename Time> class EventSink; +class Beats; } namespace ARDOUR diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 250a58aa70..81f490f51c 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -23,7 +23,7 @@ #include <vector> -#include "evoral/types.hpp" +#include "evoral/Beats.hpp" #include "ardour/ardour.h" #include "ardour/region.h" diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index e5bdfd9458..5eec755a38 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -38,7 +38,7 @@ #include "pbd/sequence_property.h" #include "pbd/stacktrace.h" -#include "evoral/types.hpp" +#include "evoral/Range.hpp" #include "ardour/ardour.h" #include "ardour/region.h" diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index a650bfdb1a..9e0cf6ec08 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -49,7 +49,7 @@ #include "lua/luastate.h" -#include "evoral/types.hpp" +#include "evoral/Range.hpp" #include "midi++/types.h" #include "midi++/mmc.h" diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index bb22a79c8e..89e41938d2 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -30,7 +30,7 @@ #include "pbd/stateful.h" #include "pbd/statefuldestructible.h" -#include "evoral/types.hpp" +#include "evoral/Beats.hpp" #include "ardour/ardour.h" diff --git a/libs/ardour/ardour/variant.h b/libs/ardour/ardour/variant.h index 9ecadbfe6a..4cf1df5556 100644 --- a/libs/ardour/ardour/variant.h +++ b/libs/ardour/ardour/variant.h @@ -27,7 +27,7 @@ #include <stdexcept> #include "ardour/libardour_visibility.h" -#include "evoral/types.hpp" +#include "evoral/Beats.hpp" #include "pbd/compose.h" namespace ARDOUR { diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index 56472e4ba8..6a9e1cd762 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -28,7 +28,7 @@ #include <glibmm/fileutils.h> #include <glibmm/miscutils.h> -#include "evoral/types.hpp" +#include "evoral/Beats.hpp" #include "pbd/xml++.h" #include "pbd/basename.h" diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index b3207e15a5..e2de5ba49f 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -25,7 +25,7 @@ #include <glibmm/threads.h> #include "pbd/xml++.h" -#include "evoral/types.hpp" +#include "evoral/Beats.hpp" #include "ardour/debug.h" #include "ardour/lmath.h" #include "ardour/tempo.h" 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" |