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 +- libs/ardour/ardour/audio_region_importer.h | 5 +- libs/ardour/ardour/element_importer.h | 6 +- libs/ardour/ardour/export_handler.h | 2 +- libs/ardour/ardour/import_status.h | 49 ++++++++++++++ libs/ardour/ardour/session.h | 26 ++------ libs/ardour/ardour/session_region.h | 3 +- libs/ardour/ardour/slave.h | 29 +++++---- libs/ardour/ardour/types.h | 5 ++ libs/ardour/import.cc | 19 +++--- libs/ardour/session_state.cc | 4 +- libs/ardour/slave.cc | 74 ++++++++++++++++++++++ libs/ardour/wscript | 1 + .../tranzport/tranzport_control_protocol.cc | 1 - .../generic_midi/generic_midi_control_protocol.cc | 2 +- libs/surfaces/mackie/interface.cc | 4 +- libs/surfaces/mackie/mackie_control_protocol.cc | 2 +- libs/surfaces/mackie/mackie_control_protocol.h | 1 - .../mackie/mackie_control_protocol_poll.cc | 11 ++-- libs/surfaces/mackie/mackie_jog_wheel.cc | 4 +- libs/surfaces/mackie/mackie_port.cc | 2 +- libs/surfaces/osc/interface.cc | 1 + libs/surfaces/osc/osc.h | 1 - libs/surfaces/tranzport/tranzport_common.h | 2 +- libs/surfaces/tranzport/wheel_modes.cc | 1 - 62 files changed, 252 insertions(+), 93 deletions(-) create mode 100644 libs/ardour/ardour/import_status.h create mode 100644 libs/ardour/slave.cc 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" diff --git a/libs/ardour/ardour/audio_region_importer.h b/libs/ardour/ardour/audio_region_importer.h index d6d5c192d9..2187d92148 100644 --- a/libs/ardour/ardour/audio_region_importer.h +++ b/libs/ardour/ardour/audio_region_importer.h @@ -33,6 +33,7 @@ #include "ardour/types.h" #include "ardour/element_importer.h" #include "ardour/element_import_handler.h" +#include "ardour/import_status.h" namespace ARDOUR { @@ -76,7 +77,7 @@ class AudioRegionImporter : public ElementImporter // Interface implementation std::string get_info () const; - Session::ImportStatus * get_import_status () { return &status; } + ImportStatus * get_import_status () { return &status; } // other stuff void add_sources_to_session (); @@ -94,7 +95,7 @@ class AudioRegionImporter : public ElementImporter PBD::ID old_id; PBD::ID id; std::list filenames; - Session::ImportStatus status; + ImportStatus status; bool parse_xml_region (); bool parse_source_xml (); diff --git a/libs/ardour/ardour/element_importer.h b/libs/ardour/ardour/element_importer.h index 396ac8358d..a203c5d37b 100644 --- a/libs/ardour/ardour/element_importer.h +++ b/libs/ardour/ardour/element_importer.h @@ -27,11 +27,13 @@ #include #include "ardour/types.h" -#include "ardour/session.h" class XMLTree; namespace ARDOUR { +class Session; +class ImportStatus; + /// Virtual interface class for element importers class ElementImporter { @@ -51,7 +53,7 @@ class ElementImporter virtual std::string get_info () const = 0; /** Gets import status, if applicable. */ - virtual Session::ImportStatus * get_import_status () { return 0; } + virtual ImportStatus * get_import_status () { return 0; } /** Prepares to move element * diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h index b222c04eb4..fad21ac780 100644 --- a/libs/ardour/ardour/export_handler.h +++ b/libs/ardour/ardour/export_handler.h @@ -27,9 +27,9 @@ #include +#include "ardour/session.h" #include "ardour/ardour.h" #include "ardour/types.h" -#include "ardour/session.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/import_status.h b/libs/ardour/ardour/import_status.h new file mode 100644 index 0000000000..25a14f3fae --- /dev/null +++ b/libs/ardour/ardour/import_status.h @@ -0,0 +1,49 @@ +/* + Copyright (C) 2000 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + */ + +#ifndef __ardour_import_status_h__ +#define __ardour_import_status_h__ + +#include +#include + +#include +#include + +#include "ardour/types.h" + +namespace ARDOUR { + +struct ImportStatus : public InterThreadInfo { + std::string doing_what; + + /* control info */ + uint32_t total; + SrcQuality quality; + volatile bool freeze; + std::vector paths; + bool replace_existing_source; + + /* result */ + SourceList sources; +}; + +} // namespace ARDOUR + +#endif /* __ardour_import_status_h__ */ diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index d850fb96d6..8dfcf228b9 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -86,12 +86,14 @@ class AutomationList; class AuxInput; class BufferSet; class Bundle; +class Butler; class ControlProtocolInfo; class Diskstream; class ExportHandler; class ExportStatus; class IO; class IOProcessor; +class ImportStatus; class MidiDiskstream; class MidiRegion; class MidiSource; @@ -114,7 +116,6 @@ class Slave; class Source; class TempoMap; class VSTPlugin; -class Butler; class Session : public PBD::StatefulDestructible, public boost::noncopyable { @@ -612,20 +613,6 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable /* source management */ - struct ImportStatus : public InterThreadInfo { - std::string doing_what; - - /* control info */ - uint32_t total; - SrcQuality quality; - volatile bool freeze; - std::vector paths; - bool replace_existing_source; - - /* result */ - SourceList sources; - }; - void import_audiofiles (ImportStatus&); bool sample_rate_convert (ImportStatus&, std::string infile, std::string& outfile); std::string build_tmp_convert_name (std::string file); @@ -644,13 +631,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable uint32_t source_use_count (boost::shared_ptr src) const; - struct cleanup_report { - std::vector paths; - int64_t space; - }; - - int cleanup_sources (cleanup_report&); - int cleanup_trash_sources (cleanup_report&); + int cleanup_sources (CleanupReport&); + int cleanup_trash_sources (CleanupReport&); int destroy_region (boost::shared_ptr); int destroy_regions (std::list >); diff --git a/libs/ardour/ardour/session_region.h b/libs/ardour/ardour/session_region.h index a9c9713035..136aaa0022 100644 --- a/libs/ardour/ardour/session_region.h +++ b/libs/ardour/ardour/session_region.h @@ -25,7 +25,8 @@ namespace ARDOUR { -template void Session::foreach_region (T *obj, void (T::*func)(boost::shared_ptr)) +template void +Session::foreach_region (T *obj, void (T::*func)(boost::shared_ptr)) { Glib::Mutex::Lock lm (region_lock); for (RegionList::iterator i = regions.begin(); i != regions.end(); i++) { diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 64e350ae9c..0f005d6f1b 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -25,9 +25,7 @@ #include #include -#include "ardour/ardour.h" -#include "ardour/session.h" -#include "ardour/audioengine.h" +#include "ardour/types.h" #include "midi++/parser.h" #include "midi++/types.h" @@ -36,6 +34,10 @@ namespace MIDI { } namespace ARDOUR { + +class TempoMap; +class Session; + /** * @class Slave * @@ -177,16 +179,17 @@ class SlaveSessionProxy : public ISlaveSessionProxy { Session& session; public: - SlaveSessionProxy(Session &s) : session(s) {}; - TempoMap& tempo_map() const { return session.tempo_map(); } - nframes_t frame_rate() const { return session.frame_rate(); } - nframes_t audible_frame () const { return session.audible_frame(); } - nframes_t transport_frame () const { return session.transport_frame(); } - nframes_t frames_since_cycle_start () const { return session.engine().frames_since_cycle_start(); } - nframes_t frame_time () const { return session.engine().frame_time(); } - - void request_locate (nframes_t frame, bool with_roll = false) { session.request_locate(frame, with_roll); } - void request_transport_speed (double speed) { session.request_transport_speed(speed); } + SlaveSessionProxy(Session &s) : session(s) {} + + TempoMap& tempo_map() const; + nframes_t frame_rate() const; + nframes_t audible_frame () const; + nframes_t transport_frame () const; + nframes_t frames_since_cycle_start () const; + nframes_t frame_time () const; + + void request_locate (nframes_t frame, bool with_roll = false); + void request_transport_speed (double speed); }; struct SafeTime { diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 6ec954075c..dd2c8861be 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -423,6 +423,11 @@ namespace ARDOUR { Groove }; + struct CleanupReport { + std::vector paths; + int64_t space; + }; + } // namespace ARDOUR diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index 174a2a81a3..e2f52fe28f 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -45,20 +45,21 @@ #include "evoral/SMF.hpp" +#include "ardour/analyser.h" #include "ardour/ardour.h" -#include "ardour/session.h" -#include "ardour/session_directory.h" #include "ardour/audio_diskstream.h" #include "ardour/audioengine.h" -#include "ardour/sndfilesource.h" -#include "ardour/sndfile_helpers.h" #include "ardour/audioregion.h" +#include "ardour/import_status.h" #include "ardour/region_factory.h" -#include "ardour/source_factory.h" #include "ardour/resampled_source.h" -#include "ardour/sndfileimportable.h" -#include "ardour/analyser.h" +#include "ardour/session.h" +#include "ardour/session_directory.h" #include "ardour/smf_source.h" +#include "ardour/sndfile_helpers.h" +#include "ardour/sndfileimportable.h" +#include "ardour/sndfilesource.h" +#include "ardour/source_factory.h" #include "ardour/tempo.h" #ifdef HAVE_COREAUDIO @@ -260,7 +261,7 @@ compose_status_message (const string& path, } static void -write_audio_data_to_new_files (ImportableSource* source, Session::ImportStatus& status, +write_audio_data_to_new_files (ImportableSource* source, ImportStatus& status, vector >& newfiles) { const nframes_t nframes = ResampledImportableSource::blocksize; @@ -312,7 +313,7 @@ write_audio_data_to_new_files (ImportableSource* source, Session::ImportStatus& } static void -write_midi_data_to_new_files (Evoral::SMF* source, Session::ImportStatus& status, +write_midi_data_to_new_files (Evoral::SMF* source, ImportStatus& status, vector >& newfiles) { uint32_t buf_size = 4; diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 437699f1e9..8b8e2ba8ff 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -2436,7 +2436,7 @@ struct RegionCounter { }; int -Session::cleanup_sources (Session::cleanup_report& rep) +Session::cleanup_sources (CleanupReport& rep) { // FIXME: needs adaptation to midi @@ -2699,7 +2699,7 @@ Session::cleanup_sources (Session::cleanup_report& rep) } int -Session::cleanup_trash_sources (Session::cleanup_report& rep) +Session::cleanup_trash_sources (CleanupReport& rep) { // FIXME: needs adaptation for MIDI diff --git a/libs/ardour/slave.cc b/libs/ardour/slave.cc new file mode 100644 index 0000000000..f07ea4c872 --- /dev/null +++ b/libs/ardour/slave.cc @@ -0,0 +1,74 @@ +/* + Copyright (C) 2002 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + */ + +#include "ardour/audioengine.h" +#include "ardour/session.h" +#include "ardour/slave.h" + +namespace ARDOUR { + +TempoMap& +SlaveSessionProxy::tempo_map() const +{ + return session.tempo_map(); +} + +nframes_t +SlaveSessionProxy::frame_rate() const +{ + return session.frame_rate(); +} + +nframes_t +SlaveSessionProxy::audible_frame() const +{ + return session.audible_frame(); +} + +nframes_t +SlaveSessionProxy::transport_frame() const +{ + return session.transport_frame(); +} + +nframes_t +SlaveSessionProxy::frames_since_cycle_start() const +{ + return session.engine().frames_since_cycle_start(); +} + +nframes_t +SlaveSessionProxy::frame_time() const +{ + return session.engine().frame_time(); +} + +void +SlaveSessionProxy::request_locate(nframes_t frame, bool with_roll) +{ + session.request_locate(frame, with_roll); +} + +void +SlaveSessionProxy::request_transport_speed(double speed) +{ + session.request_transport_speed(speed); +} + +} // namespace ARDOUR diff --git a/libs/ardour/wscript b/libs/ardour/wscript index ac6559f2b8..67e138da38 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -168,6 +168,7 @@ libardour_sources = [ 'session_time.cc', 'session_transport.cc', 'session_utils.cc', + 'slave.cc', 'smf_source.cc', 'sndfile_helpers.cc', 'sndfileimportable.cc', diff --git a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc index e002775d56..2338e7c090 100644 --- a/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc +++ b/libs/surfaces/frontier/tranzport/tranzport_control_protocol.cc @@ -56,7 +56,6 @@ #include "ardour/route.h" #include "ardour/audio_track.h" -#include "ardour/session.h" #include "ardour/tempo.h" #include "ardour/location.h" #include "ardour/dB.h" diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index 9cd5f8a934..86bf90ee3f 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -28,8 +28,8 @@ #include "midi++/port.h" #include "midi++/manager.h" -#include "ardour/route.h" #include "ardour/session.h" +#include "ardour/route.h" #include "generic_midi_control_protocol.h" #include "midicontrollable.h" diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc index 60f5752a58..067941484c 100644 --- a/libs/surfaces/mackie/interface.cc +++ b/libs/surfaces/mackie/interface.cc @@ -18,7 +18,9 @@ #include "control_protocol/control_protocol.h" #include "mackie_control_protocol.h" -#include +#include "ardour/rc_configuration.h" + +#include "pbd/error.h" #include diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index aba0cd565a..d93bf78d33 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -40,8 +40,8 @@ #include "pbd/memento_command.h" #include "pbd/convert.h" -#include "ardour/route.h" #include "ardour/session.h" +#include "ardour/route.h" #include "ardour/location.h" #include "ardour/dB.h" #include "ardour/panner.h" diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 1a6412667a..d220213d2d 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -26,7 +26,6 @@ #include #include "ardour/types.h" -#include "ardour/session.h" #include "midi++/types.h" #include "control_protocol/control_protocol.h" diff --git a/libs/surfaces/mackie/mackie_control_protocol_poll.cc b/libs/surfaces/mackie/mackie_control_protocol_poll.cc index d3401c7904..867a7d784a 100644 --- a/libs/surfaces/mackie/mackie_control_protocol_poll.cc +++ b/libs/surfaces/mackie/mackie_control_protocol_poll.cc @@ -3,18 +3,19 @@ #include "midi_byte_array.h" #include "surface_port.h" -#include -#include +#include "pbd/pthread_utils.h" +#include "pbd/error.h" -#include -#include -#include +#include "midi++/types.h" +#include "midi++/port.h" +#include "midi++/manager.h" #include "i18n.h" #include #include #include #include +#include #include #include diff --git a/libs/surfaces/mackie/mackie_jog_wheel.cc b/libs/surfaces/mackie/mackie_jog_wheel.cc index 3cd9664fb1..8b01d7c89d 100644 --- a/libs/surfaces/mackie/mackie_jog_wheel.cc +++ b/libs/surfaces/mackie/mackie_jog_wheel.cc @@ -1,5 +1,7 @@ #include +#include + #include "mackie_jog_wheel.h" #include "mackie_control_protocol.h" @@ -24,7 +26,7 @@ JogWheel::State JogWheel::jog_wheel_state() const { if ( !_jog_wheel_states.empty() ) return _jog_wheel_states.top(); - else + else return scroll; } diff --git a/libs/surfaces/mackie/mackie_port.cc b/libs/surfaces/mackie/mackie_port.cc index 85e05fd1b4..4413d3fc34 100644 --- a/libs/surfaces/mackie/mackie_port.cc +++ b/libs/surfaces/mackie/mackie_port.cc @@ -30,7 +30,7 @@ #include "midi++/types.h" #include "midi++/port.h" #include "sigc++/sigc++.h" -#include "ardour/configuration.h" +#include "ardour/rc_configuration.h" #include "i18n.h" diff --git a/libs/surfaces/osc/interface.cc b/libs/surfaces/osc/interface.cc index 1d313eeaa6..7b6b2e801f 100644 --- a/libs/surfaces/osc/interface.cc +++ b/libs/surfaces/osc/interface.cc @@ -17,6 +17,7 @@ * * */ +#include "ardour/rc_configuration.h" #include "control_protocol/control_protocol.h" #include "osc.h" diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h index 6cc0598520..63433e7059 100644 --- a/libs/surfaces/osc/osc.h +++ b/libs/surfaces/osc/osc.h @@ -32,7 +32,6 @@ #include #include "ardour/types.h" -#include "ardour/session.h" #include "control_protocol/control_protocol.h" class OSCControllable; diff --git a/libs/surfaces/tranzport/tranzport_common.h b/libs/surfaces/tranzport/tranzport_common.h index a7beb8f943..b3a2da513a 100644 --- a/libs/surfaces/tranzport/tranzport_common.h +++ b/libs/surfaces/tranzport/tranzport_common.h @@ -36,7 +36,7 @@ #include "ardour/route.h" #include "ardour/audio_track.h" -#include "ardour/session.h" +#include "ardour/rc_configuration.h" #include "ardour/tempo.h" #include "ardour/location.h" #include "ardour/dB.h" diff --git a/libs/surfaces/tranzport/wheel_modes.cc b/libs/surfaces/tranzport/wheel_modes.cc index 6a4e113222..a7861fc5ed 100644 --- a/libs/surfaces/tranzport/wheel_modes.cc +++ b/libs/surfaces/tranzport/wheel_modes.cc @@ -37,7 +37,6 @@ #include "ardour/route.h" #include "ardour/audio_track.h" -#include "ardour/session.h" #include "ardour/tempo.h" #include "ardour/location.h" #include "ardour/dB.h" -- cgit v1.2.3