summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2015-10-05 13:58:35 -0400
committerDavid Robillard <d@drobilla.net>2016-03-21 18:58:31 -0400
commiteaca325ce81c63888ee70305ad384102e46757be (patch)
treea22a611e9e3f1bb70ac8b4a69287b25863f0f81f /gtk2_ardour
parentea354226c19c65c81e4b0685caef1d0e5d005eab (diff)
Trim dependence on evoral types.hpp and Beats.hpp
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/midi_cut_buffer.h2
-rw-r--r--gtk2_ardour/midi_list_editor.h3
-rw-r--r--gtk2_ardour/note_base.h2
-rw-r--r--gtk2_ardour/public_editor.h2
-rw-r--r--gtk2_ardour/quantize_dialog.h1
-rw-r--r--gtk2_ardour/step_editor.h2
-rw-r--r--gtk2_ardour/transform_dialog.h1
7 files changed, 5 insertions, 8 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"