Trim dependence on evoral types.hpp and Beats.hpp

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"
 

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 {

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 {

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"
 

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"

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;

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"
 

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"
 

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"

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"

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;

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

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"

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"

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"

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"
 

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 {

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"

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"

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"

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"
 

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 {
 

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"

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 {

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"

libs/evoral/src/Event.cpp

@@ -17,7 +17,9 @@
  */
 
 #include <glib.h>
+
 #include "evoral/Event.hpp"
+#include "evoral/Beats.hpp"
 
 namespace Evoral {
 

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"

libs/evoral/src/Note.cpp

@@ -23,6 +23,8 @@
 #include "evoral/Note.hpp"
 #endif
 
+#include "evoral/Beats.hpp"
+
 namespace Evoral {
 
 template<typename Time>

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"

libs/evoral/src/types.cpp

@@ -18,6 +18,7 @@
 
 #include <limits.h>
 
+#include "evoral/Beats.hpp"
 #include "evoral/types.hpp"
 
 namespace Evoral {

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"