diff options
Diffstat (limited to 'gtk2_ardour')
90 files changed, 128 insertions, 326 deletions
diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index 5ecc075c30..571f602e71 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -28,7 +28,6 @@ #include "pbd/file_utils.h" #include "ardour/svn_revision.h" -#include "ardour/ardour.h" #include "ardour/version.h" #include "ardour/filesystem_paths.h" diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index 0db4831e6f..5391d58f42 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -31,7 +31,6 @@ #include "pbd/error.h" #include "pbd/file_utils.h" -#include "ardour/ardour.h" #include "ardour/filesystem_paths.h" #include "ardour/rc_configuration.h" diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index d54ae5e291..6236bcd5dc 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -60,26 +60,18 @@ #include "midi++/manager.h" #include "ardour/ardour.h" -#include "ardour/callback.h" +#include "ardour/audioengine.h" +#include "ardour/audiofilesource.h" +#include "ardour/diskstream.h" +#include "ardour/filename_extensions.h" +#include "ardour/port.h" +#include "ardour/process_thread.h" #include "ardour/profile.h" -#include "ardour/plugin_manager.h" +#include "ardour/recent_sessions.h" #include "ardour/session_directory.h" #include "ardour/session_route.h" #include "ardour/session_state_utils.h" #include "ardour/session_utils.h" -#include "ardour/port.h" -#include "ardour/audioengine.h" -#include "ardour/playlist.h" -#include "ardour/utils.h" -#include "ardour/audio_diskstream.h" -#include "ardour/audiofilesource.h" -#include "ardour/recent_sessions.h" -#include "ardour/port.h" -#include "ardour/audio_track.h" -#include "ardour/midi_track.h" -#include "ardour/filesystem_paths.h" -#include "ardour/filename_extensions.h" -#include "ardour/process_thread.h" typedef uint64_t microseconds_t; @@ -121,6 +113,7 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; +using namespace std; ARDOUR_UI *ARDOUR_UI::theArdourUI = 0; UIConfiguration *ARDOUR_UI::ui_config = 0; @@ -130,7 +123,7 @@ sigc::signal<void> ARDOUR_UI::RapidScreenUpdate; sigc::signal<void> ARDOUR_UI::SuperRapidScreenUpdate; sigc::signal<void, framepos_t, bool, framepos_t> ARDOUR_UI::Clock; -bool could_be_a_valid_path (const string& path); +bool could_be_a_valid_path (const std::string& path); ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) @@ -335,7 +328,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) /** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */ bool -ARDOUR_UI::run_startup (bool should_be_new, string load_template) +ARDOUR_UI::run_startup (bool should_be_new, std::string load_template) { delete _startup; _startup = new ArdourStartup (); diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 05addb98e3..74353d21c0 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -37,11 +37,9 @@ #include <gtkmm2ext/click_box.h> #include <gtkmm2ext/tearoff.h> -#include "ardour/session.h" -#include "ardour/audioengine.h" -#include "ardour/ardour.h" #include "ardour/profile.h" -#include "ardour/route.h" +#include "ardour/session.h" +#include "ardour/types.h" #include "ardour_ui.h" #include "keyboard.h" diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 35100e940b..bd99be4ff2 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -61,7 +61,6 @@ #include "ardour/session.h" #include "ardour/profile.h" #include "ardour/audioengine.h" -#include "ardour/control_protocol_manager.h" #include "control_protocol/control_protocol.h" diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 6c8319e808..19e7106378 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -26,10 +26,8 @@ #include <gtkmm2ext/utils.h> -#include "ardour/configuration.h" -#include "ardour/session.h" -#include "ardour/audioengine.h" #include "ardour/rc_configuration.h" +#include "ardour/session.h" #ifdef HAVE_LIBLO #include "ardour/osc.h" diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 76abb9d6bb..e20dfffcd8 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -24,17 +24,16 @@ #include "pbd/enumwriter.h" #include <gtkmm/style.h> +#include <sigc++/bind.h> #include "gtkmm2ext/cairocell.h" #include "gtkmm2ext/utils.h" #include "gtkmm2ext/rgb_macros.h" -#include "ardour/ardour.h" +#include "ardour/types.h" #include "ardour/session.h" #include "ardour/tempo.h" #include "ardour/profile.h" -#include "ardour/slave.h" -#include <sigc++/bind.h> #include "ardour_ui.h" #include "audio_clock.h" diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index e06e50f113..2aeb2dbe60 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/gtk2_ardour/audio_region_editor.cc @@ -17,17 +17,17 @@ */ +#include <cmath> + +#include <gtkmm2ext/utils.h> + #include "pbd/memento_command.h" #include "pbd/stateful_diff_command.h" #include "pbd/pthread_utils.h" -#include "ardour/session.h" #include "ardour/audioregion.h" -#include "ardour/playlist.h" -#include "ardour/utils.h" +#include "ardour/session_event.h" #include "ardour/dB.h" -#include <gtkmm2ext/utils.h> -#include <cmath> #include "audio_region_editor.h" #include "audio_region_view.h" diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index be8601170f..22e07c0ec9 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -26,11 +26,9 @@ #include "pbd/stacktrace.h" -#include "ardour/audioplaylist.h" #include "ardour/audioregion.h" #include "ardour/audiofilesource.h" #include "ardour/audio_track.h" -#include "ardour/source.h" #include "ardour/region_factory.h" #include "ardour/profile.h" #include "ardour/rc_configuration.h" diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index a34d6421a2..45204971e6 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -36,19 +36,10 @@ #include <gtkmm2ext/bindable_button.h> #include <gtkmm2ext/utils.h> -#include "ardour/amp.h" -#include "ardour/audioplaylist.h" #include "ardour/event_type_map.h" -#include "ardour/location.h" #include "ardour/pannable.h" #include "ardour/panner.h" #include "ardour/panner_shell.h" -#include "ardour/playlist.h" -#include "ardour/processor.h" -#include "ardour/profile.h" -#include "ardour/session.h" -#include "ardour/session_playlist.h" -#include "ardour/utils.h" #include "ardour_button.h" #include "ardour_ui.h" @@ -67,8 +58,6 @@ #include "audio_streamview.h" #include "utils.h" -#include "ardour/audio_track.h" - #include "i18n.h" using namespace std; diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index d6c3d5b824..bb51b94fc4 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -23,12 +23,8 @@ #include "pbd/error.h" -#include "ardour/automation_list.h" -#include "ardour/automation_control.h" -#include "ardour/event_type_map.h" #include "ardour/automatable.h" -#include "ardour/panner.h" -#include "ardour/pan_controllable.h" +#include "ardour/automation_control.h" #include "ardour/session.h" #include "ardour_ui.h" diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index ed1283e024..0fb22b05bc 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -26,7 +26,6 @@ #include "ardour/midi_automation_list_binder.h" #include "ardour/midi_region.h" #include "ardour/session.h" -#include "ardour/source.h" #include "automation_region_view.h" #include "editing.h" diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index ba3426678e..65df722e3c 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/gtk2_ardour/automation_streamview.cc @@ -26,7 +26,6 @@ #include "ardour/midi_region.h" #include "ardour/midi_source.h" -#include "ardour/region_factory.h" #include "automation_streamview.h" #include "region_view.h" diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc index 43763abcc3..7a449843e0 100644 --- a/gtk2_ardour/axis_view.cc +++ b/gtk2_ardour/axis_view.cc @@ -32,9 +32,6 @@ #include <gtkmm2ext/selector.h> #include <gtkmm2ext/gtk_ui.h> -#include "ardour/session.h" -#include "ardour/utils.h" - #include "public_editor.h" #include "ardour_ui.h" #include "gui_object.h" diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc index 1c89f7b3cd..9dff8f82d2 100644 --- a/gtk2_ardour/bundle_manager.cc +++ b/gtk2_ardour/bundle_manager.cc @@ -27,7 +27,6 @@ #include "ardour/session.h" #include "ardour/user_bundle.h" -#include "ardour/audioengine.h" #include "bundle_manager.h" #include "gui_thread.h" #include "i18n.h" diff --git a/gtk2_ardour/canvas-flag.h b/gtk2_ardour/canvas-flag.h index ef78221803..c8b32c72a5 100644 --- a/gtk2_ardour/canvas-flag.h +++ b/gtk2_ardour/canvas-flag.h @@ -6,8 +6,6 @@ #include <libgnomecanvasmm/widget.h> #include <libgnomecanvasmm/text.h> -#include "ardour/midi_model.h" - #include "simplerect.h" #include "simpleline.h" @@ -20,19 +18,19 @@ class CanvasFlag : public Group { public: CanvasFlag(MidiRegionView& region, - Group& parent, - double height, - guint outline_color_rgba = 0xc0c0c0ff, - guint fill_color_rgba = 0x07070707, - double x = 0.0, - double y = 0.0); + Group& parent, + double height, + guint outline_color_rgba = 0xc0c0c0ff, + guint fill_color_rgba = 0x07070707, + double x = 0.0, + double y = 0.0); virtual ~CanvasFlag(); virtual bool on_event(GdkEvent* ev); virtual void set_text(const std::string& a_text); - virtual void set_height (double); + virtual void set_height (double); protected: Text* _text; diff --git a/gtk2_ardour/canvas-sysex.h b/gtk2_ardour/canvas-sysex.h index 281cbb557a..718f81fd6a 100644 --- a/gtk2_ardour/canvas-sysex.h +++ b/gtk2_ardour/canvas-sysex.h @@ -20,6 +20,8 @@ #ifndef CANVAS_SYSEX_H_ #define CANVAS_SYSEX_H_ +#include <string> + #include "canvas-flag.h" class MidiRegionView; @@ -33,7 +35,7 @@ public: CanvasSysEx( MidiRegionView& region, Group& parent, - string& text, + std::string& text, double height, double x, double y); diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc index 5f3cb16502..4195ab8962 100644 --- a/gtk2_ardour/edit_note_dialog.cc +++ b/gtk2_ardour/edit_note_dialog.cc @@ -19,11 +19,11 @@ #include <gtkmm/stock.h> #include <gtkmm/table.h> -#include "ardour/midi_model.h" -#include "ardour/midi_region.h" -#include "edit_note_dialog.h" + #include "canvas-note-event.h" +#include "edit_note_dialog.h" #include "midi_region_view.h" + #include "i18n.h" using namespace Gtk; diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 0ba5f4054c..d19359a0f3 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -60,20 +60,14 @@ #include "gtkmm2ext/cell_renderer_pixbuf_toggle.h" #include "ardour/audio_track.h" -#include "ardour/audioplaylist.h" +#include "ardour/audioengine.h" #include "ardour/audioregion.h" #include "ardour/location.h" -#include "ardour/midi_region.h" -#include "ardour/plugin_manager.h" #include "ardour/profile.h" #include "ardour/route_group.h" -#include "ardour/session_directory.h" -#include "ardour/session_route.h" -#include "ardour/session_state_utils.h" +#include "ardour/session_playlists.h" #include "ardour/tempo.h" #include "ardour/utils.h" -#include "ardour/session_playlists.h" -#include "ardour/audioengine.h" #include "control_protocol/control_protocol.h" diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index e544f7d8c3..074d51428e 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -20,17 +20,16 @@ #include <gio/gio.h> #include <gtk/gtkiconfactory.h> - #include "pbd/filesystem.h" #include "pbd/file_utils.h" #include "pbd/search_path.h" #include "gtkmm2ext/tearoff.h" -#include "ardour/ardour.h" #include "ardour/filesystem_paths.h" #include "ardour/profile.h" #include "ardour/session.h" +#include "ardour/types.h" #include "actions.h" #include "ardour_ui.h" diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index 8bd17c92f6..aaf587a464 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -33,22 +33,16 @@ #include <gtkmm2ext/choice.h> -#include "ardour/session.h" -#include "ardour/session_directory.h" -#include "ardour/audioplaylist.h" -#include "ardour/audioregion.h" -#include "ardour/audio_diskstream.h" -#include "ardour/midi_track.h" -#include "ardour/midi_region.h" -#include "ardour/utils.h" #include "ardour/audio_track.h" -#include "ardour/audioplaylist.h" #include "ardour/audiofilesource.h" +#include "ardour/audioregion.h" +#include "ardour/midi_region.h" +#include "ardour/midi_track.h" +#include "ardour/operations.h" #include "ardour/region_factory.h" -#include "ardour/source_factory.h" -#include "ardour/session.h" #include "ardour/smf_source.h" -#include "ardour/operations.h" +#include "ardour/source_factory.h" +#include "ardour/utils.h" #include "pbd/memento_command.h" #include "ardour_ui.h" diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc index 5eadac1ca5..df88f7b65f 100644 --- a/gtk2_ardour/editor_audiotrack.cc +++ b/gtk2_ardour/editor_audiotrack.cc @@ -17,8 +17,6 @@ */ -#include "ardour/location.h" -#include "ardour/audio_diskstream.h" #include "ardour/rc_configuration.h" #include "ardour_ui.h" diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 77bc5ec27b..e6b0b8ec9e 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -24,10 +24,8 @@ #include "pbd/stacktrace.h" -#include "ardour/audioplaylist.h" -#include "ardour/audioregion.h" -#include "ardour/region_factory.h" #include "ardour/midi_region.h" +#include "ardour/region_factory.h" #include "editor.h" #include "keyboard.h" diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index dbe95c229f..509e629aee 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -29,10 +29,8 @@ #include "pbd/pthread_utils.h" -#include "ardour/audio_diskstream.h" #include "ardour/audio_track.h" #include "ardour/audiofilesource.h" -#include "ardour/audiofilesource.h" #include "ardour/audioplaylist.h" #include "ardour/audioregion.h" #include "ardour/chan_count.h" diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc index 2da3122d48..d887697d63 100644 --- a/gtk2_ardour/editor_keys.cc +++ b/gtk2_ardour/editor_keys.cc @@ -21,17 +21,17 @@ #include <cmath> #include <string> +#include <gtkmm/treeview.h> + #include "pbd/error.h" #include "ardour/session.h" -#include "ardour/region.h" -#include <gtkmm/treeview.h> #include "ardour_ui.h" #include "editor.h" -#include "time_axis_view.h" #include "region_view.h" #include "selection.h" +#include "time_axis_view.h" #include "i18n.h" diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 7f4445652a..b5c7635265 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -62,20 +62,14 @@ #include "editor_cursors.h" #include "verbose_cursor.h" -#include "ardour/types.h" -#include "ardour/profile.h" -#include "ardour/route.h" -#include "ardour/audio_track.h" -#include "ardour/playlist.h" -#include "ardour/audioplaylist.h" #include "ardour/audioregion.h" -#include "ardour/midi_region.h" -#include "ardour/dB.h" -#include "ardour/utils.h" +#include "ardour/operations.h" +#include "ardour/playlist.h" +#include "ardour/profile.h" #include "ardour/region_factory.h" -#include "ardour/source_factory.h" +#include "ardour/route.h" #include "ardour/session.h" -#include "ardour/operations.h" +#include "ardour/types.h" #include <bitset> diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index d6cae9a8e2..7f4c22616e 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -49,12 +49,10 @@ #include "ardour/quantize.h" #include "ardour/region_factory.h" #include "ardour/reverse.h" -#include "ardour/route_group.h" #include "ardour/session.h" #include "ardour/session_playlists.h" #include "ardour/strip_silence.h" #include "ardour/transient_detector.h" -#include "ardour/utils.h" #include "ardour_ui.h" #include "debug.h" diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index ab4f7afe3c..01b26705f5 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -28,10 +28,9 @@ #include "ardour/audioregion.h" #include "ardour/audiofilesource.h" +#include "ardour/silentfilesource.h" #include "ardour/region_factory.h" #include "ardour/session.h" -#include "ardour/session_playlists.h" -#include "ardour/silentfilesource.h" #include "ardour/profile.h" #include "gtkmm2ext/choice.h" diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 8e2b668375..6e12a03856 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -22,12 +22,11 @@ #include "pbd/stacktrace.h" -#include "ardour/session.h" +#include "ardour/midi_region.h" #include "ardour/playlist.h" -#include "ardour/route_group.h" #include "ardour/profile.h" -#include "ardour/midi_region.h" -#include "ardour/audioplaylist.h" +#include "ardour/route_group.h" +#include "ardour/session.h" #include "control_protocol/control_protocol.h" diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc index c47c815984..093e21952f 100644 --- a/gtk2_ardour/editor_snapshots.cc +++ b/gtk2_ardour/editor_snapshots.cc @@ -25,7 +25,6 @@ #include "editor_snapshots.h" #include "ardour_ui.h" #include "i18n.h" -#include "editor.h" #include "utils.h" #include "prompter.h" diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc index 34c974e102..b942f04cca 100644 --- a/gtk2_ardour/editor_timefx.cc +++ b/gtk2_ardour/editor_timefx.cc @@ -37,14 +37,12 @@ #include "region_selection.h" #include "time_fx_dialog.h" -#include "ardour/session.h" -#include "ardour/region.h" -#include "ardour/audioplaylist.h" -#include "ardour/audio_track.h" #include "ardour/audioregion.h" -#include "ardour/stretch.h" #include "ardour/midi_stretch.h" #include "ardour/pitch.h" +#include "ardour/region.h" +#include "ardour/session.h" +#include "ardour/stretch.h" #ifdef USE_RUBBERBAND #include "rubberband/RubberBandStretcher.h" diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 712871fcef..de613f3cf4 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -39,7 +39,6 @@ #include <alsa/asoundlib.h> #endif -#include "ardour/profile.h" #include <jack/jack.h> #include <gtkmm/stock.h> diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc index b9c2dd5a78..78dd8d20f8 100644 --- a/gtk2_ardour/export_channel_selector.cc +++ b/gtk2_ardour/export_channel_selector.cc @@ -24,12 +24,9 @@ #include "pbd/convert.h" -#include "ardour/audio_port.h" #include "ardour/audio_track.h" -#include "ardour/audioengine.h" #include "ardour/audioregion.h" #include "ardour/export_channel_configuration.h" -#include "ardour/export_handler.h" #include "ardour/io.h" #include "ardour/route.h" #include "ardour/session.h" diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h index 511ccd5b78..4cb9902ed0 100644 --- a/gtk2_ardour/export_channel_selector.h +++ b/gtk2_ardour/export_channel_selector.h @@ -24,7 +24,6 @@ #include <list> #include "ardour/export_profile_manager.h" -#include "ardour/export_channel.h" #include <gtkmm.h> #include <sigc++/signal.h> diff --git a/gtk2_ardour/export_filename_selector.cc b/gtk2_ardour/export_filename_selector.cc index e2d360984c..1b85d6585c 100644 --- a/gtk2_ardour/export_filename_selector.cc +++ b/gtk2_ardour/export_filename_selector.cc @@ -22,10 +22,6 @@ #include "export_filename_selector.h" -#include "ardour/export_handler.h" -#include "ardour/session.h" -#include "ardour/session_directory.h" - #include "i18n.h" using namespace ARDOUR; diff --git a/gtk2_ardour/export_format_selector.cc b/gtk2_ardour/export_format_selector.cc index 146b31ab51..f66d13d62e 100644 --- a/gtk2_ardour/export_format_selector.cc +++ b/gtk2_ardour/export_format_selector.cc @@ -24,7 +24,6 @@ #include "ardour/export_format_specification.h" #include "ardour/export_profile_manager.h" -#include "ardour/session.h" #include "i18n.h" diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc index 41257e1248..a96ea69b6d 100644 --- a/gtk2_ardour/export_timespan_selector.cc +++ b/gtk2_ardour/export_timespan_selector.cc @@ -22,7 +22,6 @@ #include "ardour_ui.h" -#include "ardour/tempo.h" #include "ardour/location.h" #include "ardour/types.h" #include "ardour/session.h" diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h index 420baa5806..2118a57b83 100644 --- a/gtk2_ardour/export_timespan_selector.h +++ b/gtk2_ardour/export_timespan_selector.h @@ -21,7 +21,6 @@ #ifndef __export_timespan_selector_h__ #define __export_timespan_selector_h__ -#include "public_editor.h" #include "audio_clock.h" #include <list> @@ -40,6 +39,7 @@ namespace ARDOUR { } using ARDOUR::CDMarkerFormat; +using ARDOUR::framecnt_t; /// Timespan Selector base class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr diff --git a/gtk2_ardour/fft_result.h b/gtk2_ardour/fft_result.h index 2873138dfd..ddf2bb1842 100644 --- a/gtk2_ardour/fft_result.h +++ b/gtk2_ardour/fft_result.h @@ -21,7 +21,6 @@ #ifndef __ardour_fft_result_h #define __ardour_fft_result_h -#include "ardour/types.h" #include <fftw3.h> #include <gdkmm/color.h> diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index b571ed52c7..9f4e286f3a 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -20,10 +20,7 @@ #include <limits.h> #include "ardour/amp.h" -#include "ardour/io.h" -#include "ardour/route.h" #include "ardour/route_group.h" -#include "ardour/session.h" #include "ardour/session_route.h" #include "ardour/dB.h" #include "ardour/utils.h" diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index 19f25dcf1c..db165b8b3c 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -17,21 +17,18 @@ */ +#include <stdint.h> + #include <glibmm/objectbase.h> #include <gtkmm2ext/doi.h> -#include "ardour/port_insert.h" -#include "ardour/session.h" -#include "ardour/io.h" #include "ardour/audioengine.h" -#include "ardour/track.h" -#include "ardour/audio_track.h" -#include "ardour/midi_track.h" -#include "ardour/mtdm.h" +#include "ardour/bundle.h" #include "ardour/data_type.h" +#include "ardour/io.h" #include "ardour/port.h" -#include "ardour/bundle.h" +#include "ardour/session.h" #include "io_selector.h" #include "utils.h" @@ -207,13 +204,13 @@ IOSelector::list_is_global (int dim) const return (dim == _other); } -string +std::string IOSelector::disassociation_verb () const { return _("Disconnect"); } -string +std::string IOSelector::channel_noun () const { return _("port"); @@ -256,7 +253,7 @@ void IOSelectorWindow::on_show () { Gtk::Window::on_show (); - pair<uint32_t, uint32_t> const pm_max = _selector.max_size (); + std::pair<uint32_t, uint32_t> const pm_max = _selector.max_size (); resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second); } @@ -264,8 +261,8 @@ void IOSelectorWindow::io_name_changed (void*) { ENSURE_GUI_THREAD (*this, &IOSelectorWindow::io_name_changed, src) - - string title; + + std::string title; if (!_selector.find_inputs_for_io_outputs()) { title = string_compose(_("%1 input"), _selector.io()->name()); diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc index 055a9bcae0..dbe374fcbc 100644 --- a/gtk2_ardour/keyeditor.cc +++ b/gtk2_ardour/keyeditor.cc @@ -23,8 +23,6 @@ #include <map> -#include "ardour/profile.h" - #include <gtkmm/stock.h> #include <gtkmm/label.h> #include <gtkmm/accelkey.h> diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 7268e8a2f4..9ccff8d9c9 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -19,9 +19,6 @@ #include <limits.h> -#include "ardour/session.h" -#include "ardour/session_route.h" -#include "ardour/dB.h" #include "ardour/meter.h" #include <gtkmm2ext/utils.h> @@ -39,8 +36,6 @@ #include "keyboard.h" #include "public_editor.h" -#include "ardour/session.h" - #include "i18n.h" using namespace ARDOUR; diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 4ef413aef7..ea6a3f544c 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -22,8 +22,6 @@ #include <gtkmm2ext/utils.h> -#include "ardour/utils.h" -#include "ardour/configuration.h" #include "ardour/session.h" #include "pbd/memento_command.h" diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc index ab3fe1b39d..e2120e112a 100644 --- a/gtk2_ardour/lv2_plugin_ui.cc +++ b/gtk2_ardour/lv2_plugin_ui.cc @@ -18,13 +18,10 @@ */ #include "ardour/lv2_plugin.h" -#include "ardour/plugin_manager.h" -#include "ardour/processor.h" #include "ardour/session.h" #include "pbd/error.h" #include "ardour_ui.h" -#include "gui_thread.h" #include "lv2_plugin_ui.h" #include "lv2/lv2plug.in/ns/extensions/ui/ui.h" diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 142b6c6988..299ca8ee50 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -31,8 +31,6 @@ #include "pbd/memento_command.h" #include "pbd/stateful_diff_command.h" -#include "ardour/playlist.h" -#include "ardour/tempo.h" #include "ardour/midi_region.h" #include "ardour/midi_source.h" #include "ardour/midi_model.h" diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 2c8c91ebcd..676aa52028 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -24,14 +24,12 @@ #include <gtkmm2ext/gtk_ui.h> -#include "ardour/midi_diskstream.h" -#include "ardour/midi_playlist.h" #include "ardour/midi_region.h" #include "ardour/midi_source.h" #include "ardour/midi_track.h" #include "ardour/region_factory.h" -#include "ardour/smf_source.h" #include "ardour/session.h" +#include "ardour/smf_source.h" #include "ardour_ui.h" #include "canvas-simplerect.h" diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index f38913fe31..4df22c7c96 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -38,22 +38,22 @@ #include "gtkmm2ext/bindable_button.h" #include "gtkmm2ext/utils.h" -#include "ardour/file_source.h" -#include "ardour/ladspa_plugin.h" -#include "ardour/location.h" -#include "ardour/midi_diskstream.h" +#include "ardour/event_type_map.h" #include "ardour/midi_patch_manager.h" #include "ardour/midi_playlist.h" #include "ardour/midi_region.h" #include "ardour/midi_source.h" +#include "ardour/midi_track.h" #include "ardour/operations.h" #include "ardour/playlist.h" -#include "ardour/processor.h" +#include "ardour/region.h" #include "ardour/region_factory.h" +#include "ardour/route.h" #include "ardour/session.h" -#include "ardour/session_playlist.h" -#include "ardour/tempo.h" -#include "ardour/utils.h" +#include "ardour/session_object.h" +#include "ardour/source.h" +#include "ardour/track.h" +#include "ardour/types.h" #include "midi++/names.h" diff --git a/gtk2_ardour/missing_plugin_dialog.cc b/gtk2_ardour/missing_plugin_dialog.cc index d5edd4ca36..ddbca3a5f4 100755 --- a/gtk2_ardour/missing_plugin_dialog.cc +++ b/gtk2_ardour/missing_plugin_dialog.cc @@ -17,7 +17,6 @@ */ #include <gtkmm/label.h> -#include "ardour/session.h" #include "missing_plugin_dialog.h" #include "i18n.h" diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc index 6482abebc2..db586eed7e 100644 --- a/gtk2_ardour/mixer_group_tabs.cc +++ b/gtk2_ardour/mixer_group_tabs.cc @@ -22,7 +22,6 @@ #include "gtkmm2ext/utils.h" #include "ardour/route_group.h" -#include "ardour/session.h" #include "mixer_group_tabs.h" #include "mixer_strip.h" #include "mixer_ui.h" diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 542ab7b21f..ff3fd54624 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -34,24 +34,21 @@ #include <gtkmm2ext/slider_controller.h> #include <gtkmm2ext/bindable_button.h> -#include "ardour/ardour.h" -#include "ardour/amp.h" -#include "ardour/session.h" +#include "ardour/audio_track.h" #include "ardour/audioengine.h" #include "ardour/internal_send.h" -#include "ardour/route.h" -#include "ardour/route_group.h" -#include "ardour/audio_track.h" #include "ardour/midi_track.h" #include "ardour/pannable.h" #include "ardour/panner.h" #include "ardour/panner_shell.h" -#include "ardour/send.h" -#include "ardour/processor.h" +#include "ardour/port.h" #include "ardour/profile.h" -#include "ardour/ladspa_plugin.h" +#include "ardour/route.h" +#include "ardour/route_group.h" +#include "ardour/send.h" +#include "ardour/session.h" +#include "ardour/types.h" #include "ardour/user_bundle.h" -#include "ardour/port.h" #include "ardour_ui.h" #include "ardour_window.h" diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 3779f0c042..779369aa90 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -36,11 +36,9 @@ #include <gtkmm2ext/tearoff.h> #include <gtkmm2ext/window_title.h> -#include "ardour/audio_track.h" #include "ardour/plugin_manager.h" #include "ardour/route_group.h" #include "ardour/session.h" -#include "ardour/session_route.h" #include "keyboard.h" #include "mixer_ui.h" diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 82519cc85e..359ce0c796 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -8,10 +8,8 @@ #include "gtkmm2ext/actions.h" #include "gtkmm2ext/motionfeedback.h" -#include "ardour/dB.h" #include "ardour/monitor_processor.h" #include "ardour/route.h" -#include "ardour/utils.h" #include "ardour_ui.h" #include "gui_thread.h" diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index e93dc83894..8ba9c411bd 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -32,9 +32,8 @@ #include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/utils.h" -#include "ardour/panner.h" -#include "ardour/panner.h" #include "ardour/pannable.h" +#include "ardour/panner.h" #include "ardour_ui.h" #include "global_signals.h" diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc index 8d9d75538f..110a977716 100644 --- a/gtk2_ardour/nag.cc +++ b/gtk2_ardour/nag.cc @@ -7,7 +7,6 @@ #include "pbd/openuri.h" -#include "ardour/ardour.h" #include "ardour/filesystem_paths.h" #include "nag.h" diff --git a/gtk2_ardour/note_player.cc b/gtk2_ardour/note_player.cc index c9c9f9de0e..b9f480a6be 100644 --- a/gtk2_ardour/note_player.cc +++ b/gtk2_ardour/note_player.cc @@ -20,7 +20,6 @@ #include <glibmm/main.h> #include "ardour/midi_track.h" -#include "ardour/session.h" #include "note_player.h" diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 51255d3291..14513ca8ad 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -18,13 +18,17 @@ #include <limits.h> -#include "ardour/io.h" -#include "ardour/dB.h" #include <gtkmm2ext/utils.h> #include <gtkmm2ext/barcontroller.h> + #include "midi++/manager.h" #include "pbd/fastlog.h" +#include "ardour/pannable.h" +#include "ardour/panner.h" +#include "ardour/panner_shell.h" +#include "ardour/session.h" + #include "ardour_ui.h" #include "panner_ui.h" #include "panner2d.h" @@ -33,12 +37,6 @@ #include "stereo_panner.h" #include "mono_panner.h" -#include "ardour/delivery.h" -#include "ardour/session.h" -#include "ardour/panner.h" -#include "ardour/pannable.h" -#include "ardour/panner_shell.h" -#include "ardour/route.h" #include "i18n.h" diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc index 31710deb71..cda844ee89 100644 --- a/gtk2_ardour/playlist_selector.cc +++ b/gtk2_ardour/playlist_selector.cc @@ -20,12 +20,10 @@ #include <gtkmm/button.h> -#include "ardour/session_playlist.h" -#include "ardour/audio_diskstream.h" -#include "ardour/playlist.h" #include "ardour/audio_track.h" #include "ardour/audioplaylist.h" -#include "ardour/configuration.h" +#include "ardour/playlist.h" +#include "ardour/session_playlist.h" #include <gtkmm2ext/gtk_ui.h> diff --git a/gtk2_ardour/plugin_eq_gui.h b/gtk2_ardour/plugin_eq_gui.h index 145edb760e..5743152b15 100644 --- a/gtk2_ardour/plugin_eq_gui.h +++ b/gtk2_ardour/plugin_eq_gui.h @@ -21,15 +21,20 @@ #ifndef __ardour_plugin_eq_gui_h #define __ardour_plugin_eq_gui_h +#include "pbd/signals.h" + #include "ardour/buffer_set.h" -#include "ardour/plugin_insert.h" -#include "ardour/plugin.h" #include <gtkmm/table.h> #include <gtkmm/drawingarea.h> #include <gtkmm/combobox.h> #include <gtkmm/liststore.h> +namespace ARDOUR { + class Plugin; + class PluginInsert; +} + namespace GTKArdour { class FFT; } diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc index 1ec07d1bbe..77b8f26ca9 100644 --- a/gtk2_ardour/plugin_selector.cc +++ b/gtk2_ardour/plugin_selector.cc @@ -37,8 +37,6 @@ #include "ardour/plugin_manager.h" #include "ardour/plugin.h" -#include "ardour/configuration.h" -#include "ardour/session.h" #include "ardour_ui.h" #include "plugin_selector.h" diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index 863c29f243..36b9ea1187 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -24,16 +24,13 @@ #include "midi++/manager.h" #include "midi++/mmc.h" -#include "ardour/audio_track.h" #include "ardour/audioengine.h" +#include "ardour/auditioner.h" #include "ardour/bundle.h" -#include "ardour/user_bundle.h" +#include "ardour/control_protocol_manager.h" #include "ardour/io_processor.h" -#include "ardour/midi_track.h" -#include "ardour/port.h" #include "ardour/session.h" -#include "ardour/auditioner.h" -#include "ardour/control_protocol_manager.h" +#include "ardour/user_bundle.h" #include "control_protocol/control_protocol.h" #include "gui_thread.h" diff --git a/gtk2_ardour/port_insert_ui.cc b/gtk2_ardour/port_insert_ui.cc index 4e9a3b1c1e..16beb75877 100644 --- a/gtk2_ardour/port_insert_ui.cc +++ b/gtk2_ardour/port_insert_ui.cc @@ -22,17 +22,10 @@ #include <gtkmm2ext/doi.h> -#include "ardour/port_insert.h" -#include "ardour/session.h" -#include "ardour/io.h" #include "ardour/audioengine.h" -#include "ardour/track.h" -#include "ardour/audio_track.h" -#include "ardour/midi_track.h" #include "ardour/mtdm.h" -#include "ardour/data_type.h" -#include "ardour/port.h" -#include "ardour/bundle.h" +#include "ardour/port_insert.h" +#include "ardour/session.h" #include "port_insert_ui.h" #include "utils.h" @@ -170,7 +163,7 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD { set_name ("IOSelectorWindow"); - string title = _("Port Insert "); + std::string title = _("Port Insert "); title += pi->name(); set_title (title); diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc index 5496c40a49..1f5a21feec 100644 --- a/gtk2_ardour/port_matrix_column_labels.cc +++ b/gtk2_ardour/port_matrix_column_labels.cc @@ -20,7 +20,6 @@ #include <iostream> #include "gtkmm2ext/keyboard.h" #include "ardour/bundle.h" -#include "ardour/types.h" #include "port_matrix_column_labels.h" #include "port_matrix.h" #include "port_matrix_body.h" diff --git a/gtk2_ardour/port_matrix_grid.cc b/gtk2_ardour/port_matrix_grid.cc index daa25139dc..c8699ece1e 100644 --- a/gtk2_ardour/port_matrix_grid.cc +++ b/gtk2_ardour/port_matrix_grid.cc @@ -20,7 +20,6 @@ #include <iostream> #include <cairo/cairo.h> #include "ardour/bundle.h" -#include "ardour/types.h" #include "port_matrix_grid.h" #include "port_matrix.h" #include "port_matrix_body.h" diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 1bba2c8af1..d9c21dcc9b 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -40,13 +40,10 @@ #include <gtkmm2ext/doi.h> #include "ardour/amp.h" -#include "ardour/ardour.h" #include "ardour/audio_track.h" #include "ardour/audioengine.h" -#include "ardour/internal_send.h" #include "ardour/internal_return.h" -#include "ardour/ladspa_plugin.h" -#include "ardour/meter.h" +#include "ardour/internal_send.h" #include "ardour/plugin_insert.h" #include "ardour/port_insert.h" #include "ardour/profile.h" @@ -54,7 +51,7 @@ #include "ardour/route.h" #include "ardour/send.h" #include "ardour/session.h" -#include "ardour/dB.h" +#include "ardour/types.h" #include "actions.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/public_editor.cc b/gtk2_ardour/public_editor.cc index 1b8b5c4801..dc468e4a83 100644 --- a/gtk2_ardour/public_editor.cc +++ b/gtk2_ardour/public_editor.cc @@ -18,7 +18,6 @@ */ #include "public_editor.h" -#include "editor.h" PublicEditor* PublicEditor::_instance = 0; diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 57e3c8dede..9f903b547c 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -36,7 +36,6 @@ #include <sigc++/signal.h> #include "evoral/types.hpp" -#include "ardour/route_group.h" #include "pbd/statefuldestructible.h" diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc index 622223047a..cf1bfcfb62 100755 --- a/gtk2_ardour/region_editor.cc +++ b/gtk2_ardour/region_editor.cc @@ -17,18 +17,16 @@ */ +#include <cmath> + +#include <gtkmm/listviewtext.h> + #include "pbd/memento_command.h" #include "pbd/stateful_diff_command.h" -#include "ardour/session.h" #include "ardour/region.h" -#include "ardour/playlist.h" -#include "ardour/utils.h" -#include "ardour/dB.h" +#include "ardour/session.h" #include "ardour/source.h" -#include "gtkmm2ext/utils.h" -#include <gtkmm/listviewtext.h> -#include <cmath> #include "ardour_ui.h" #include "clock_group.h" diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 1c9b8fe67b..5c6a452b61 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -26,8 +26,6 @@ #include <gtkmm2ext/gtk_ui.h> #include "ardour/playlist.h" -#include "ardour/audioregion.h" -#include "ardour/audiosource.h" #include "ardour/session.h" #include "ardour_ui.h" diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc index eabb164785..8120534b7d 100644 --- a/gtk2_ardour/return_ui.cc +++ b/gtk2_ardour/return_ui.cc @@ -19,10 +19,9 @@ #include <gtkmm2ext/doi.h> -#include "ardour/amp.h" #include "ardour/io.h" -#include "ardour/return.h" #include "ardour/rc_configuration.h" +#include "ardour/return.h" #include "utils.h" #include "return_ui.h" diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc index bd9dd42f87..9400d2fc20 100644 --- a/gtk2_ardour/rhythm_ferret.cc +++ b/gtk2_ardour/rhythm_ferret.cc @@ -4,13 +4,10 @@ #include "pbd/memento_command.h" #include "pbd/convert.h" -#include "ardour/transient_detector.h" -#include "ardour/onset_detector.h" -#include "ardour/audiosource.h" #include "ardour/audioregion.h" -#include "ardour/playlist.h" -#include "ardour/region_factory.h" +#include "ardour/onset_detector.h" #include "ardour/session.h" +#include "ardour/transient_detector.h" #include "rhythm_ferret.h" #include "audio_region_view.h" diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index e10fcb4139..ca673954d4 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -24,9 +24,7 @@ #include <gtkmm2ext/utils.h> #include <gtkmm2ext/window_title.h> -#include "ardour/ardour.h" #include "ardour/audioengine.h" -#include "ardour/audio_track.h" #include "ardour/plugin.h" #include "ardour/plugin_insert.h" #include "ardour/plugin_manager.h" @@ -34,9 +32,6 @@ #include "ardour/return.h" #include "ardour/route.h" #include "ardour/send.h" -#include "ardour/session.h" -#include "ardour/session.h" -#include "ardour/session_route.h" #include "ardour_ui.h" #include "gui_thread.h" diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc index 1810ba674b..e66eaf959e 100644 --- a/gtk2_ardour/route_processor_selection.cc +++ b/gtk2_ardour/route_processor_selection.cc @@ -21,10 +21,6 @@ #include <sigc++/bind.h> #include "pbd/error.h" -#include "ardour/playlist.h" -#include "ardour/processor.h" -#include "ardour/route.h" - #include "gui_thread.h" #include "mixer_strip.h" #include "route_processor_selection.h" diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 8fc9b90140..6b52e64572 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -43,22 +43,12 @@ #include <gtkmm2ext/utils.h> #include "ardour/amp.h" -#include "ardour/audioplaylist.h" -#include "ardour/diskstream.h" #include "ardour/event_type_map.h" -#include "ardour/ladspa_plugin.h" -#include "ardour/location.h" -#include "ardour/panner.h" -#include "ardour/playlist.h" -#include "ardour/playlist.h" #include "ardour/processor.h" #include "ardour/profile.h" -#include "ardour/region_factory.h" #include "ardour/route_group.h" #include "ardour/session.h" -#include "ardour/session_playlist.h" -#include "ardour/debug.h" -#include "ardour/utils.h" +#include "ardour/session_playlists.h" #include "evoral/Parameter.hpp" #include "ardour_ui.h" diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 6fdd10d9cc..ff970bc5a1 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -46,16 +46,13 @@ #include "route_time_axis.h" #include "group_tabs.h" -#include "ardour/route.h" -#include "ardour/event_type_map.h" -#include "ardour/session.h" -#include "ardour/audioengine.h" #include "ardour/audio_track.h" +#include "ardour/audioengine.h" +#include "ardour/filename_extensions.h" #include "ardour/midi_track.h" +#include "ardour/route.h" +#include "ardour/session.h" #include "ardour/template_utils.h" -#include "ardour/filename_extensions.h" -#include "ardour/directory_names.h" -#include "ardour/profile.h" #include "i18n.h" using namespace Gtk; diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc index e1e3a8b7da..e9699f2cfe 100644 --- a/gtk2_ardour/send_ui.cc +++ b/gtk2_ardour/send_ui.cc @@ -19,7 +19,6 @@ #include <gtkmm2ext/doi.h> -#include "ardour/amp.h" #include "ardour/io.h" #include "ardour/send.h" #include "ardour/rc_configuration.h" diff --git a/gtk2_ardour/session_import_dialog.h b/gtk2_ardour/session_import_dialog.h index f4ba9cadf7..b31751115f 100644 --- a/gtk2_ardour/session_import_dialog.h +++ b/gtk2_ardour/session_import_dialog.h @@ -29,12 +29,11 @@ #include <gtkmm.h> #include "pbd/xml++.h" -#include "ardour/element_importer.h" -#include "ardour/element_import_handler.h" #include "ardour_dialog.h" - namespace ARDOUR { + class ElementImportHandler; + class ElementImporter; class Session; } diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc index 5bac706106..1184a89cf5 100644 --- a/gtk2_ardour/session_metadata_dialog.cc +++ b/gtk2_ardour/session_metadata_dialog.cc @@ -24,10 +24,9 @@ #include <gtkmm2ext/utils.h> #include "pbd/xml++.h" + #include "ardour/session.h" -#include "ardour/session_directory.h" #include "ardour/session_utils.h" -#include "ardour/configuration.h" #include "i18n.h" diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index b9f54f94e8..0f7483a8eb 100644 --- a/gtk2_ardour/session_option_editor.cc +++ b/gtk2_ardour/session_option_editor.cc @@ -18,10 +18,6 @@ */ #include "ardour/session.h" -#include "ardour/io.h" -#include "ardour/auditioner.h" -#include "ardour/audioengine.h" -#include "ardour/port.h" #include "gui_thread.h" #include "session_option_editor.h" diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 5451fe180e..0e233e83d2 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -43,7 +43,6 @@ #include "evoral/SMF.hpp" -#include "ardour/amp.h" #include "ardour/audio_library.h" #include "ardour/auditioner.h" #include "ardour/audioregion.h" @@ -53,7 +52,6 @@ #include "ardour/source_factory.h" #include "ardour/session.h" #include "ardour/session_directory.h" -#include "ardour/profile.h" #include "ardour_ui.h" #include "editing.h" diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 5dd58deb26..f72b464d80 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -25,7 +25,6 @@ #include "ardour/playlist.h" #include "ardour/region.h" -#include "ardour/source.h" #include "ardour/track.h" #include "ardour/session.h" diff --git a/gtk2_ardour/strip_silence_dialog.cc b/gtk2_ardour/strip_silence_dialog.cc index 0049371a17..32e7bc6054 100644 --- a/gtk2_ardour/strip_silence_dialog.cc +++ b/gtk2_ardour/strip_silence_dialog.cc @@ -22,12 +22,10 @@ #include <gtkmm/table.h> #include <gtkmm/label.h> #include <gtkmm/stock.h> -#include "ardour/audioregion.h" -#include "ardour/audiosource.h" +#include "ardour/audioregion.h" #include "ardour/dB.h" #include "ardour_ui.h" -#include "ardour/session.h" #include "audio_clock.h" #include "gui_thread.h" diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc index 5fef5e46ee..33731798d7 100644 --- a/gtk2_ardour/tape_region_view.cc +++ b/gtk2_ardour/tape_region_view.cc @@ -24,7 +24,6 @@ #include <gtkmm2ext/gtk_ui.h> -#include "ardour/playlist.h" #include "ardour/audioregion.h" #include "ardour/audiosource.h" diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index 8c9d559441..71300ad07d 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -32,9 +32,7 @@ #include "pbd/file_utils.h" -#include "ardour/configuration.h" #include "ardour/filesystem_paths.h" -#include "ardour/profile.h" #include "ardour_button.h" #include "theme_manager.h" diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 8c30772f0c..229a7065a2 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -33,12 +33,6 @@ #include <gtkmm2ext/utils.h> #include <gtkmm2ext/selector.h> -#include "ardour/session.h" -#include "ardour/utils.h" -#include "ardour/ladspa_plugin.h" -#include "ardour/processor.h" -#include "ardour/location.h" - #include "ardour_ui.h" #include "global_signals.h" #include "gui_thread.h" diff --git a/gtk2_ardour/time_fx_dialog.cc b/gtk2_ardour/time_fx_dialog.cc index 0958c20f2e..1fd52cebc3 100644 --- a/gtk2_ardour/time_fx_dialog.cc +++ b/gtk2_ardour/time_fx_dialog.cc @@ -36,15 +36,6 @@ #include "audio_region_view.h" #include "region_selection.h" -#include "ardour/session.h" -#include "ardour/region.h" -#include "ardour/audioplaylist.h" -#include "ardour/audio_track.h" -#include "ardour/audioregion.h" -#include "ardour/stretch.h" -#include "ardour/midi_stretch.h" -#include "ardour/pitch.h" - #ifdef USE_RUBBERBAND #include "rubberband/RubberBandStretcher.h" using namespace RubberBand; diff --git a/gtk2_ardour/time_fx_dialog.h b/gtk2_ardour/time_fx_dialog.h index d47ba4265f..424bfe9813 100644 --- a/gtk2_ardour/time_fx_dialog.h +++ b/gtk2_ardour/time_fx_dialog.h @@ -22,11 +22,9 @@ #include <gtkmm.h> -#include "ardour/playlist.h" #include "ardour/timefx_request.h" #include "ardour_dialog.h" -#include "region_selection.h" #include "progress_reporter.h" class Editor; diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc index 4bc0e2a96a..419d82dbcc 100644 --- a/gtk2_ardour/time_selection.cc +++ b/gtk2_ardour/time_selection.cc @@ -20,7 +20,7 @@ #include <algorithm> #include "pbd/error.h" -#include "ardour/ardour.h" +#include "ardour/types.h" #include "time_selection.h" diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index 0d41ade0a5..b17316e2db 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -31,7 +31,6 @@ #include "gtkmm2ext/rgb_macros.h" -#include "ardour/ardour.h" #include "ardour/filesystem_paths.h" #include "ui_config.h" diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 988bd370ae..96bee1a87b 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -40,7 +40,6 @@ #include "pbd/file_utils.h" #include <gtkmm2ext/utils.h> -#include "ardour/configuration.h" #include "ardour/rc_configuration.h" #include "ardour/filesystem_paths.h" |