From 9040cbf82a9fcb78583dc4e77df2a54bea827b45 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 19 Oct 2011 03:34:02 +0000 Subject: Trim the include tree. git-svn-id: svn://localhost/ardour2/branches/3.0@10227 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/click.h | 5 ++--- libs/ardour/ardour/export_channel.h | 3 +-- libs/ardour/ardour/midi_ui.h | 2 +- libs/ardour/ardour/session.h | 13 +++++++------ libs/ardour/ardour/slave.h | 1 - libs/ardour/audio_track_importer.cc | 3 ++- libs/ardour/midi_model.cc | 17 +++++++++++------ libs/ardour/midi_region.cc | 11 ++++++----- libs/ardour/panner_shell.cc | 1 + libs/ardour/session_click.cc | 7 ++++--- libs/ardour/session_state.cc | 1 + libs/ardour/session_transport.cc | 1 + libs/audiographer/audiographer/sndfile/sndfile_writer.h | 4 ++-- 13 files changed, 39 insertions(+), 30 deletions(-) (limited to 'libs') diff --git a/libs/ardour/ardour/click.h b/libs/ardour/ardour/click.h index b4c2f7d9cc..1047540a74 100644 --- a/libs/ardour/ardour/click.h +++ b/libs/ardour/ardour/click.h @@ -28,7 +28,8 @@ namespace ARDOUR { -struct Click { +class Click { +public: framepos_t start; framecnt_t duration; framecnt_t offset; @@ -48,8 +49,6 @@ private: static Pool pool; }; -typedef std::list Clicks; - class ClickIO : public IO { public: diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h index a73d04aa36..c13580e25c 100644 --- a/libs/ardour/ardour/export_channel.h +++ b/libs/ardour/ardour/export_channel.h @@ -23,9 +23,8 @@ #include -#include -#include #include +#include #include "pbd/signals.h" diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h index 95e97c64ea..51e3ca2544 100644 --- a/libs/ardour/ardour/midi_ui.h +++ b/libs/ardour/ardour/midi_ui.h @@ -2,7 +2,7 @@ #define __libardour_midi_ui_h__ #include -#include + #include "pbd/abstract_ui.h" #include "pbd/signals.h" diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index d6edaf6a0e..d96d8fc828 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -42,19 +42,19 @@ #include "pbd/signals.h" #include "pbd/undo.h" +#include "evoral/types.hpp" + #include "midi++/types.h" #include "timecode/time.h" #include "ardour/ardour.h" -#include "ardour/click.h" #include "ardour/chan_count.h" #include "ardour/rc_configuration.h" #include "ardour/session_configuration.h" #include "ardour/session_event.h" #include "ardour/location.h" #include "ardour/interpolation.h" -#include "ardour/speakers.h" #ifdef HAVE_JACK_SESSION #include @@ -92,16 +92,18 @@ class AuxInput; class BufferSet; class Bundle; class Butler; +class Click; class Diskstream; class ExportHandler; class ExportStatus; +class Graph; class IO; class IOProcessor; class ImportStatus; +class MidiControlUI; class MidiRegion; class MidiSource; class MidiTrack; -class MidiControlUI; class NamedSelection; class Playlist; class PluginInsert; @@ -122,9 +124,8 @@ class Slave; class Source; class Speakers; class TempoMap; -class VSTPlugin; -class Graph; class Track; +class VSTPlugin; extern void setup_enum_writer (); @@ -1369,7 +1370,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi XMLNode& state(bool); /* click track */ - + typedef std::list Clicks; Clicks clicks; bool _clicking; boost::shared_ptr _click_io; diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 8400472921..9bd3124e23 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -23,7 +23,6 @@ #include #include -#include #include diff --git a/libs/ardour/audio_track_importer.cc b/libs/ardour/audio_track_importer.cc index a831e480db..4e28df9f87 100644 --- a/libs/ardour/audio_track_importer.cc +++ b/libs/ardour/audio_track_importer.cc @@ -24,8 +24,9 @@ #include "ardour/audio_diskstream.h" #include "ardour/session.h" -#include "pbd/failed_constructor.h" +#include "pbd/controllable.h" #include "pbd/convert.h" +#include "pbd/failed_constructor.h" #include #include diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index 17645a1994..d6f21f1f4c 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -18,23 +18,28 @@ */ -#include -#include #include +#include +#include #include #include -#include "pbd/error.h" -#include "pbd/enumwriter.h" + #include "pbd/compose.h" +#include "pbd/enumwriter.h" +#include "pbd/error.h" + +#include "evoral/Control.hpp" + #include "midi++/events.h" +#include "ardour/automation_control.h" +#include "ardour/midi_automation_list_binder.h" #include "ardour/midi_model.h" #include "ardour/midi_source.h" #include "ardour/midi_state_tracker.h" +#include "ardour/session.h" #include "ardour/smf_source.h" #include "ardour/types.h" -#include "ardour/session.h" -#include "ardour/midi_automation_list_binder.h" #include "i18n.h" diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index f67617da62..61b1459c17 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -30,15 +30,16 @@ #include "pbd/xml++.h" #include "pbd/enumwriter.h" -#include "ardour/midi_region.h" -#include "ardour/session.h" -#include "ardour/gain.h" +#include "ardour/automation_control.h" #include "ardour/dB.h" -#include "ardour/playlist.h" +#include "ardour/gain.h" +#include "ardour/midi_region.h" +#include "ardour/midi_ring_buffer.h" #include "ardour/midi_source.h" +#include "ardour/playlist.h" #include "ardour/region_factory.h" +#include "ardour/session.h" #include "ardour/types.h" -#include "ardour/midi_ring_buffer.h" #include "i18n.h" #include diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc index 8c0236bd9f..bffcb0cccb 100644 --- a/libs/ardour/panner_shell.cc +++ b/libs/ardour/panner_shell.cc @@ -53,6 +53,7 @@ #include "ardour/panner_shell.h" #include "ardour/runtime_functions.h" #include "ardour/session.h" +#include "ardour/speakers.h" #include "ardour/utils.h" #include "i18n.h" diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc index 8e57d7578c..22f9de449d 100644 --- a/libs/ardour/session_click.cc +++ b/libs/ardour/session_click.cc @@ -21,11 +21,12 @@ #include #include "ardour/ardour.h" +#include "ardour/audio_buffer.h" +#include "ardour/buffer_set.h" +#include "ardour/click.h" +#include "ardour/io.h" #include "ardour/session.h" #include "ardour/tempo.h" -#include "ardour/io.h" -#include "ardour/buffer_set.h" -#include "ardour/audio_buffer.h" #include diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 7084b81f05..d66b07c334 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -116,6 +116,7 @@ #include "ardour/sndfile_helpers.h" #include "ardour/sndfilesource.h" #include "ardour/source_factory.h" +#include "ardour/speakers.h" #include "ardour/template_utils.h" #include "ardour/tempo.h" #include "ardour/ticker.h" diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 4534339d18..de295a8e8a 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -40,6 +40,7 @@ #include "ardour/audioengine.h" #include "ardour/auditioner.h" #include "ardour/butler.h" +#include "ardour/click.h" #include "ardour/debug.h" #include "ardour/location.h" #include "ardour/session.h" diff --git a/libs/audiographer/audiographer/sndfile/sndfile_writer.h b/libs/audiographer/audiographer/sndfile/sndfile_writer.h index 7b3c2968ff..6e8ecc2567 100644 --- a/libs/audiographer/audiographer/sndfile/sndfile_writer.h +++ b/libs/audiographer/audiographer/sndfile/sndfile_writer.h @@ -1,10 +1,10 @@ #ifndef AUDIOGRAPHER_SNDFILE_WRITER_H #define AUDIOGRAPHER_SNDFILE_WRITER_H -#include -#include #include +#include + #include "audiographer/flag_debuggable.h" #include "audiographer/sink.h" #include "audiographer/types.h" -- cgit v1.2.3