From 2588b1cac9a50353c65c671ee2a5efe569b96c36 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 30 Nov 2014 19:57:15 -0500 Subject: Trim the include tree. --- gtk2_ardour/canvas_patch_change.cc | 1 - gtk2_ardour/edit_note_dialog.h | 1 - gtk2_ardour/hit.cc | 2 -- gtk2_ardour/midi_automation_line.cc | 3 +++ gtk2_ardour/midi_automation_line.h | 5 ++++- gtk2_ardour/midi_cut_buffer.cc | 2 +- gtk2_ardour/midi_cut_buffer.h | 8 +++++--- gtk2_ardour/note.cc | 1 - gtk2_ardour/note_base.cc | 4 +++- gtk2_ardour/note_base.h | 5 +++-- gtk2_ardour/sfdb_ui.cc | 1 + 11 files changed, 20 insertions(+), 13 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/canvas_patch_change.cc b/gtk2_ardour/canvas_patch_change.cc index e836dba7a8..68dbbe3b0d 100644 --- a/gtk2_ardour/canvas_patch_change.cc +++ b/gtk2_ardour/canvas_patch_change.cc @@ -28,7 +28,6 @@ #include "midi++/midnam_patch.h" #include "ardour_ui.h" -#include "midi_region_view.h" #include "canvas_patch_change.h" #include "editor.h" #include "editor_drag.h" diff --git a/gtk2_ardour/edit_note_dialog.h b/gtk2_ardour/edit_note_dialog.h index bc8d546057..5ef4a6b4af 100644 --- a/gtk2_ardour/edit_note_dialog.h +++ b/gtk2_ardour/edit_note_dialog.h @@ -18,7 +18,6 @@ */ #include -#include "ardour/midi_model.h" #include "ardour_dialog.h" #include "audio_clock.h" diff --git a/gtk2_ardour/hit.cc b/gtk2_ardour/hit.cc index 43dc8ce347..c7bfcb617f 100644 --- a/gtk2_ardour/hit.cc +++ b/gtk2_ardour/hit.cc @@ -22,8 +22,6 @@ #include "canvas/polygon.h" #include "canvas/debug.h" -#include "midi_region_view.h" -#include "public_editor.h" #include "hit.h" using namespace ARDOUR; diff --git a/gtk2_ardour/midi_automation_line.cc b/gtk2_ardour/midi_automation_line.cc index 30bb37c5b0..c76a35a069 100644 --- a/gtk2_ardour/midi_automation_line.cc +++ b/gtk2_ardour/midi_automation_line.cc @@ -18,7 +18,10 @@ */ #include "ardour/midi_automation_list_binder.h" +#include "ardour/midi_region.h" + #include "midi++/midnam_patch.h" + #include "midi_automation_line.h" #include "midi_time_axis.h" diff --git a/gtk2_ardour/midi_automation_line.h b/gtk2_ardour/midi_automation_line.h index 3748c35bd4..e0da2a00d7 100644 --- a/gtk2_ardour/midi_automation_line.h +++ b/gtk2_ardour/midi_automation_line.h @@ -17,9 +17,12 @@ */ -#include "ardour/midi_region.h" #include "automation_line.h" +namespace ARDOUR { + class MidiRegion; +} + /** Stub class so that lines for MIDI AutomationRegionViews can use the correct * MementoCommandBinder. */ diff --git a/gtk2_ardour/midi_cut_buffer.cc b/gtk2_ardour/midi_cut_buffer.cc index 21567d401f..94a21ed830 100644 --- a/gtk2_ardour/midi_cut_buffer.cc +++ b/gtk2_ardour/midi_cut_buffer.cc @@ -21,7 +21,7 @@ using namespace ARDOUR; MidiCutBuffer::MidiCutBuffer (Session* s) - : AutomatableSequence (*s) + : AutomatableSequence (*s) , _origin (0) { diff --git a/gtk2_ardour/midi_cut_buffer.h b/gtk2_ardour/midi_cut_buffer.h index a52771019d..bfd31fb270 100644 --- a/gtk2_ardour/midi_cut_buffer.h +++ b/gtk2_ardour/midi_cut_buffer.h @@ -19,16 +19,18 @@ #ifndef __gtk_ardour_midi_cut_buffer_h__ #define __gtk_ardour_midi_cut_buffer_h__ -#include "ardour/midi_model.h" +#include "evoral/types.hpp" + +#include "ardour/automatable_sequence.h" namespace ARDOUR { class Session; } -class MidiCutBuffer : public ARDOUR::AutomatableSequence +class MidiCutBuffer : public ARDOUR::AutomatableSequence { public: - typedef ARDOUR::MidiModel::TimeType TimeType; + typedef Evoral::MusicalTime TimeType; MidiCutBuffer (ARDOUR::Session*); ~MidiCutBuffer(); diff --git a/gtk2_ardour/note.cc b/gtk2_ardour/note.cc index ddfb11fe8e..bc10d79d8b 100644 --- a/gtk2_ardour/note.cc +++ b/gtk2_ardour/note.cc @@ -24,7 +24,6 @@ #include "canvas/debug.h" #include "note.h" -#include "midi_region_view.h" #include "public_editor.h" using namespace ARDOUR; diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc index 5e5d83e500..b70b821ade 100644 --- a/gtk2_ardour/note_base.cc +++ b/gtk2_ardour/note_base.cc @@ -21,13 +21,15 @@ #include "gtkmm2ext/keyboard.h" +#include "evoral/Note.hpp" + #include "canvas/text.h" #include "note_base.h" -#include "midi_region_view.h" #include "public_editor.h" #include "editing_syms.h" #include "keyboard.h" +#include "midi_region_view.h" using namespace std; using namespace Gtkmm2ext; diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h index 04de75f48f..be9f3b67ca 100644 --- a/gtk2_ardour/note_base.h +++ b/gtk2_ardour/note_base.h @@ -21,8 +21,9 @@ #define __gtk_ardour_note_base_h__ #include + #include "canvas/types.h" -#include "ardour/midi_model.h" +#include "evoral/types.hpp" #include "rgb_macros.h" #include "ardour_ui.h" @@ -54,7 +55,7 @@ namespace ArdourCanvas { class NoteBase : public sigc::trackable { public: - typedef Evoral::Note NoteType; + typedef Evoral::Note NoteType; NoteBase (MidiRegionView& region, bool, const boost::shared_ptr note = boost::shared_ptr()); virtual ~NoteBase (); diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 80ee165a84..2c7499fd6d 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -51,6 +51,7 @@ #include "ardour/auditioner.h" #include "ardour/audioregion.h" #include "ardour/audiofilesource.h" +#include "ardour/midi_region.h" #include "ardour/smf_source.h" #include "ardour/region_factory.h" #include "ardour/source_factory.h" -- cgit v1.2.3