From c83e48e07a0b4790512c6251d8ad8f941c881021 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 30 Oct 2009 15:30:22 +0000 Subject: Trim session.h include dependency tree. git-svn-id: svn://localhost/ardour2/branches/3.0@5979 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/add_route_dialog.h | 1 - gtk2_ardour/ardour_ui.cc | 6 +++--- gtk2_ardour/ardour_ui.h | 34 ++++++++++++++++++---------------- gtk2_ardour/ardour_ui2.cc | 1 + gtk2_ardour/ardour_ui_dependents.cc | 2 ++ gtk2_ardour/audio_region_editor.cc | 1 + gtk2_ardour/audio_region_view.cc | 1 + gtk2_ardour/audio_streamview.cc | 2 ++ gtk2_ardour/automation_time_axis.cc | 1 + gtk2_ardour/editor.h | 6 ++++-- gtk2_ardour/editor_actions.cc | 1 + gtk2_ardour/editor_audiotrack.cc | 1 + gtk2_ardour/editor_canvas.cc | 1 + gtk2_ardour/editor_drag.cc | 1 + gtk2_ardour/editor_export_audio.cc | 3 +++ gtk2_ardour/editor_keyboard.cc | 1 + gtk2_ardour/editor_markers.cc | 1 + gtk2_ardour/editor_mixer.cc | 1 + gtk2_ardour/editor_mouse.cc | 1 + gtk2_ardour/editor_route_groups.cc | 1 + gtk2_ardour/editor_routes.cc | 1 + gtk2_ardour/editor_rulers.cc | 3 +++ gtk2_ardour/editor_selection.cc | 1 + gtk2_ardour/editor_snapshots.cc | 1 + gtk2_ardour/export_dialog.h | 2 +- gtk2_ardour/location_ui.h | 1 - gtk2_ardour/midi_region_view.cc | 1 + gtk2_ardour/midi_streamview.cc | 1 + gtk2_ardour/plugin_eq_gui.cc | 1 + gtk2_ardour/plugin_selector.cc | 1 + gtk2_ardour/plugin_ui.cc | 1 + gtk2_ardour/region_view.cc | 1 + gtk2_ardour/return_ui.cc | 1 + gtk2_ardour/send_ui.cc | 1 + gtk2_ardour/sfdb_ui.h | 1 - gtk2_ardour/startup.h | 2 ++ gtk2_ardour/streamview.cc | 1 + gtk2_ardour/utils.cc | 2 +- 38 files changed, 64 insertions(+), 26 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h index d8c0b07762..691a1c549d 100644 --- a/gtk2_ardour/add_route_dialog.h +++ b/gtk2_ardour/add_route_dialog.h @@ -34,7 +34,6 @@ #include "ardour/types.h" #include "ardour/template_utils.h" -#include "ardour/session.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index f6208fab8c..30a9d59312 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2610,7 +2610,7 @@ ARDOUR_UI::hide_splash () } void -ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* list_title, +ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* list_title, const string& plural_msg, const string& singular_msg) { size_t removed; @@ -2765,7 +2765,7 @@ After cleanup, unused audio files will be moved to a \ return; } - Session::cleanup_report rep; + ARDOUR::CleanupReport rep; editor->prepare_for_cleanup (); @@ -2812,7 +2812,7 @@ ARDOUR_UI::flush_trash () return; } - Session::cleanup_report rep; + ARDOUR::CleanupReport rep; if (session->cleanup_trash_sources (rep)) { return; diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index e9b037d3c4..7253f58031 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -59,40 +59,42 @@ #include #include #include "ardour/ardour.h" -#include "ardour/session.h" #include "ardour/types.h" +#include "ardour/utils.h" #include "audio_clock.h" #include "ardour_dialog.h" #include "editing.h" #include "ui_config.h" +class About; +class AddRouteDialog; +class ArdourStartup; class AudioClock; -class PublicEditor; -class Keyboard; -class RCOptionEditor; -class SessionOptionEditor; +class BundleManager; +class ConnectionEditor; class KeyEditor; +class Keyboard; +class LocationUI; class Mixer_UI; -class ConnectionEditor; +class PublicEditor; +class RCOptionEditor; class RouteParams_UI; -class About; +class SessionOptionEditor; class Splash; -class AddRouteDialog; -class LocationUI; class ThemeManager; -class BundleManager; -class ArdourStartup; namespace Gtkmm2ext { class TearOff; } namespace ARDOUR { - class Route; - class Port; - class IO; class ControlProtocolInfo; + class IO; + class Port; + class Route; + class RouteGroup; + class Location; } extern sigc::signal ColorsChanged; @@ -618,8 +620,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI Gtk::MenuItem *cleanup_item; - void display_cleanup_results (ARDOUR::Session::cleanup_report& rep, const gchar* list_title, - const std::string& plural_msg, const std::string& singular_msg); + void display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* list_title, + const std::string& plural_msg, const std::string& singular_msg); void cleanup (); void flush_trash (); diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 613da7e631..57c3df4cdf 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -32,6 +32,7 @@ #include #include +#include "ardour/session.h" #include "ardour/audioengine.h" #include "ardour/ardour.h" #include "ardour/profile.h" diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index 6755b27d1e..0850d0d707 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -25,6 +25,8 @@ #include "pbd/error.h" +#include "ardour/session.h" + #include "ardour_ui.h" #include "public_editor.h" #include "mixer_ui.h" diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index cee59ec647..d42a546179 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/gtk2_ardour/audio_region_editor.cc @@ -19,6 +19,7 @@ #include "pbd/memento_command.h" +#include "ardour/session.h" #include "ardour/audioregion.h" #include "ardour/playlist.h" #include "ardour/utils.h" diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 4ca50c241d..5b0725339e 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -29,6 +29,7 @@ #include "ardour/audiosource.h" #include "ardour/audio_diskstream.h" #include "ardour/profile.h" +#include "ardour/session.h" #include "pbd/memento_command.h" #include "pbd/stacktrace.h" diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 1ffb37bb7f..6ce08aa5eb 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -32,6 +32,8 @@ #include "ardour/source.h" #include "ardour/region_factory.h" #include "ardour/profile.h" +#include "ardour/rc_configuration.h" +#include "ardour/session.h" #include "audio_streamview.h" #include "audio_region_view.h" diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 8e0445c4eb..eaed1e5199 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -23,6 +23,7 @@ #include "ardour/automation_control.h" #include "ardour/event_type_map.h" #include "ardour/route.h" +#include "ardour/session.h" #include "ardour_ui.h" #include "automation_time_axis.h" diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 030be68ec1..609a0ef6ed 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -46,7 +46,7 @@ #include #include "pbd/stateful.h" -#include "ardour/session.h" +#include "ardour/import_status.h" #include "ardour/tempo.h" #include "ardour/location.h" #include "ardour/audioregion.h" @@ -83,6 +83,8 @@ namespace ARDOUR { class Crossfade; class ChanCount; class MidiOperator; + class MidiTrack; + class AudioTrack; } namespace LADSPA { @@ -1189,7 +1191,7 @@ class Editor : public PublicEditor /* import specific info */ - struct EditorImportStatus : public ARDOUR::Session::ImportStatus { + struct EditorImportStatus : public ARDOUR::ImportStatus { Editing::ImportMode mode; nframes64_t pos; int target_tracks; diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 9d5fec0969..678be375de 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -22,6 +22,7 @@ #include "ardour/ardour.h" #include "ardour/profile.h" +#include "ardour/session.h" #include "actions.h" #include "ardour_ui.h" diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc index 084a7f9984..c64ee68b0e 100644 --- a/gtk2_ardour/editor_audiotrack.cc +++ b/gtk2_ardour/editor_audiotrack.cc @@ -19,6 +19,7 @@ #include "ardour/location.h" #include "ardour/audio_diskstream.h" +#include "ardour/rc_configuration.h" #include "ardour_ui.h" #include "editor.h" diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index cd3ee76116..9342387dbe 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -23,6 +23,7 @@ #include #include "ardour/profile.h" +#include "ardour/rc_configuration.h" #include "ardour_ui.h" #include "editor.h" diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index ca50b9111e..ac0c4f304e 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -20,6 +20,7 @@ #include "pbd/memento_command.h" #include "pbd/basename.h" #include "ardour/diskstream.h" +#include "ardour/session.h" #include "ardour/dB.h" #include "ardour/region_factory.h" #include "ardour/midi_diskstream.h" diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 851a045f0d..c8d27037a3 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -19,6 +19,8 @@ /* Note: public Editor methods are documented in public_editor.h */ +#define __STDC_FORMAT_MACROS 1 +#include #include #include @@ -44,6 +46,7 @@ #include "ardour/session_directory.h" #include "ardour/source_factory.h" #include "ardour/audiofilesource.h" +#include "ardour/session.h" #include "i18n.h" diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc index 977a7ec10c..a721c54ab7 100644 --- a/gtk2_ardour/editor_keyboard.cc +++ b/gtk2_ardour/editor_keyboard.cc @@ -19,6 +19,7 @@ #include "ardour/audioregion.h" #include "ardour/playlist.h" +#include "ardour/session.h" #include "ardour/location.h" #include "pbd/memento_command.h" diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 7bd09379d8..7989b83e2d 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -24,6 +24,7 @@ #include #include +#include "ardour/session.h" #include "ardour/location.h" #include "ardour/profile.h" #include "pbd/memento_command.h" diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 6f858b19ae..742af793ad 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -24,6 +24,7 @@ #include "pbd/enumwriter.h" #include "ardour/audioengine.h" +#include "ardour/session.h" #include "editor.h" #include "mixer_strip.h" diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 60edec69c4..4ac5cf6989 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -67,6 +67,7 @@ #include "ardour/utils.h" #include "ardour/region_factory.h" #include "ardour/source_factory.h" +#include "ardour/session.h" #include diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 08695f348f..7496d50ccb 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -37,6 +37,7 @@ #include "editor_route_groups.h" #include "ardour/route.h" +#include "ardour/session.h" #include "i18n.h" diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index bbda43a295..38a78370ff 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -25,6 +25,7 @@ #include #include "ardour/diskstream.h" +#include "ardour/session.h" #include "editor.h" #include "keyboard.h" diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 12b4547747..31871e916b 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -17,13 +17,16 @@ */ +#define __STDC_FORMAT_MACROS 1 #include // for sprintf, grrr #include +#include #include #include +#include "ardour/session.h" #include "ardour/tempo.h" #include "ardour/profile.h" #include diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 3894a96d52..24ee3cadcf 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -22,6 +22,7 @@ #include "pbd/stacktrace.h" +#include "ardour/session.h" #include "ardour/diskstream.h" #include "ardour/playlist.h" #include "ardour/route_group.h" diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc index 80ffdb4491..92fa6d76d6 100644 --- a/gtk2_ardour/editor_snapshots.cc +++ b/gtk2_ardour/editor_snapshots.cc @@ -19,6 +19,7 @@ #include #include "gtkmm2ext/choice.h" +#include "ardour/session.h" #include "ardour/session_state_utils.h" #include "ardour/session_directory.h" #include "editor_snapshots.h" diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h index 5a1d7839ca..1895e5c3fe 100644 --- a/gtk2_ardour/export_dialog.h +++ b/gtk2_ardour/export_dialog.h @@ -23,7 +23,6 @@ #include -#include "ardour/export_handler.h" #include "ardour/export_profile_manager.h" #include "public_editor.h" @@ -39,6 +38,7 @@ namespace ARDOUR { class ExportStatus; + class ExportHandler; } class ExportTimespanSelector; diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h index 87977c80ba..30bb7ec13b 100644 --- a/gtk2_ardour/location_ui.h +++ b/gtk2_ardour/location_ui.h @@ -28,7 +28,6 @@ #include #include "ardour/location.h" -#include "ardour/session.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 77ba80b077..2644be763a 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -37,6 +37,7 @@ #include "ardour/midi_diskstream.h" #include "ardour/midi_model.h" #include "ardour/midi_patch_manager.h" +#include "ardour/session.h" #include "evoral/Parameter.hpp" #include "evoral/Control.hpp" diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 1b48dfe55e..791507bde0 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -31,6 +31,7 @@ #include "ardour/midi_track.h" #include "ardour/region_factory.h" #include "ardour/smf_source.h" +#include "ardour/session.h" #include "ardour_ui.h" #include "canvas-simplerect.h" diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc index ae8d4946fb..9e30d35a26 100644 --- a/gtk2_ardour/plugin_eq_gui.cc +++ b/gtk2_ardour/plugin_eq_gui.cc @@ -26,6 +26,7 @@ #include "ardour/audio_buffer.h" #include "ardour/data_type.h" #include "ardour/chan_mapping.h" +#include "ardour/session.h" #include #include diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc index 50176d8d07..f7ba9cbd0b 100644 --- a/gtk2_ardour/plugin_selector.cc +++ b/gtk2_ardour/plugin_selector.cc @@ -38,6 +38,7 @@ #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/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index 5af2c1ad0d..b6326392e2 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -41,6 +41,7 @@ #include "midi++/manager.h" +#include "ardour/session.h" #include "ardour/plugin.h" #include "ardour/plugin_insert.h" #include "ardour/ladspa_plugin.h" diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index b44f287079..8bd3bfcc23 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -30,6 +30,7 @@ #include "ardour/audioregion.h" #include "ardour/audiosource.h" #include "ardour/audio_diskstream.h" +#include "ardour/session.h" #include "ardour_ui.h" #include "streamview.h" diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc index d5e367d8d9..03b6d6044d 100644 --- a/gtk2_ardour/return_ui.cc +++ b/gtk2_ardour/return_ui.cc @@ -22,6 +22,7 @@ #include "ardour/amp.h" #include "ardour/io.h" #include "ardour/return.h" +#include "ardour/rc_configuration.h" #include "utils.h" #include "return_ui.h" diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc index 7dab778054..9f30616cf8 100644 --- a/gtk2_ardour/send_ui.cc +++ b/gtk2_ardour/send_ui.cc @@ -22,6 +22,7 @@ #include "ardour/amp.h" #include "ardour/io.h" #include "ardour/send.h" +#include "ardour/rc_configuration.h" #include "utils.h" #include "send_ui.h" diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h index 740667fc0f..c3030669c2 100644 --- a/gtk2_ardour/sfdb_ui.h +++ b/gtk2_ardour/sfdb_ui.h @@ -38,7 +38,6 @@ #include #include -#include "ardour/session.h" #include "ardour/audiofilesource.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h index 6b7e92a33b..8566204755 100644 --- a/gtk2_ardour/startup.h +++ b/gtk2_ardour/startup.h @@ -20,6 +20,8 @@ #include #include +#include "ardour/utils.h" + class EngineControl; class ArdourStartup : public Gtk::Assistant { diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 81c272a882..d3bbeb3532 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -27,6 +27,7 @@ #include "ardour/source.h" #include "ardour/diskstream.h" #include "ardour/track.h" +#include "ardour/session.h" #include "streamview.h" #include "region_view.h" diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 72b128c02f..4c4bcf69ec 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -36,7 +36,7 @@ #include #include "ardour/configuration.h" -#include "ardour/configuration.h" +#include "ardour/rc_configuration.h" #include "ardour/filesystem_paths.h" -- cgit v1.2.3