diff options
| author | David Robillard <d@drobilla.net> | 2009-02-25 18:26:51 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-25 18:26:51 +0000 |
| commit | e0aaed6d65f160c328cb8b56d7c6552ee15d65e2 (patch) | |
| tree | 1d5de9845ec4019fea2cf721bf918b4bbf5d246c | |
| parent | 16d97766465ba87cd69412836d65e68395e84943 (diff) | |
*** NEW CODING POLICY ***
All #include statements that include a header that is a part of a library
bundled with ardour MUST use quotes, not angle brackets.
Do this:
#include "ardour/types.h"
NOT this:
#include <ardour/types.h>
Rationale:
This is best practice in general, to ensure we include the local version
and not the system version. That quotes mean "local" (in some sense)
and angle brackets mean "system" (in some sense) is a ubiquitous
convention and IIRC right in the C spec somewhere.
More pragmatically, this is required by (my) waf (stuff) for dependencies
to work correctly. That is:
!!! FAILURE TO DO THIS CAN RESULT IN BROKEN BUILDS !!!
Failure to comply is punishable by death by torture. :)
P.S. It's not that dramatic in all cases, but this (in combination with some
GCC flags specific to the include type) is the best way I have found to be
absolutely 100% positive the local ones are being used (and we definitely
want to be absolutely 100% positive on that one).
git-svn-id: svn://localhost/ardour2/branches/3.0@4655 d708f5d6-7413-0410-9779-e7cbd77b26cf
555 files changed, 2624 insertions, 2628 deletions
diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index 78e8778ec2..207f974d26 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -25,12 +25,12 @@ #include <ctime> #include <cstdlib> -#include <pbd/file_utils.h> +#include "pbd/file_utils.h" -#include <ardour/svn_revision.h> -#include <ardour/ardour.h> -#include <ardour/version.h> -#include <ardour/filesystem_paths.h> +#include "ardour/svn_revision.h" +#include "ardour/ardour.h" +#include "ardour/version.h" +#include "ardour/filesystem_paths.h" #include "utils.h" #include "version.h" diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index fcfc6d75ce..9059ba2776 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -29,11 +29,11 @@ #include <gtkmm/accelmap.h> #include <gtkmm/uimanager.h> -#include <pbd/error.h> -#include <pbd/file_utils.h> +#include "pbd/error.h" +#include "pbd/file_utils.h" -#include <ardour/ardour.h> -#include <ardour/filesystem_paths.h> +#include "ardour/ardour.h" +#include "ardour/filesystem_paths.h" #include "actions.h" #include "i18n.h" diff --git a/gtk2_ardour/actions.h b/gtk2_ardour/actions.h index d8b2c64eda..c7175d1891 100644 --- a/gtk2_ardour/actions.h +++ b/gtk2_ardour/actions.h @@ -27,7 +27,7 @@ #include <gtkmm/actiongroup.h> #include <gtkmm/accelkey.h> -#include <ardour/configuration.h> +#include "ardour/configuration.h" namespace Gtk { class UIManager; diff --git a/gtk2_ardour/add_midi_cc_track_dialog.cc b/gtk2_ardour/add_midi_cc_track_dialog.cc index 0c393f3981..4631e1c002 100644 --- a/gtk2_ardour/add_midi_cc_track_dialog.cc +++ b/gtk2_ardour/add_midi_cc_track_dialog.cc @@ -22,8 +22,8 @@ #include <sigc++/bind.h> #include <gtkmm/stock.h> -#include <pbd/error.h> -#include <pbd/convert.h> +#include "pbd/error.h" +#include "pbd/convert.h" #include "utils.h" #include "add_midi_cc_track_dialog.h" diff --git a/gtk2_ardour/add_midi_cc_track_dialog.h b/gtk2_ardour/add_midi_cc_track_dialog.h index b04456afc4..ecdc9588c8 100644 --- a/gtk2_ardour/add_midi_cc_track_dialog.h +++ b/gtk2_ardour/add_midi_cc_track_dialog.h @@ -25,9 +25,9 @@ #include <gtkmm/dialog.h> #include <gtkmm/adjustment.h> #include <gtkmm/spinbutton.h> -#include <ardour/types.h> -#include <ardour/data_type.h> -#include <evoral/Parameter.hpp> +#include "ardour/types.h" +#include "ardour/data_type.h" +#include "evoral/Parameter.hpp" class AddMidiCCTrackDialog : public Gtk::Dialog { diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index ecbd2a66e3..7cc633b980 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -22,10 +22,10 @@ #include <sigc++/bind.h> #include <gtkmm/stock.h> -#include <pbd/error.h> -#include <pbd/convert.h> +#include "pbd/error.h" +#include "pbd/convert.h" #include <gtkmm2ext/utils.h> -#include <ardour/profile.h> +#include "ardour/profile.h" #include "utils.h" #include "add_route_dialog.h" diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h index 32e690ef27..52cb70a5da 100644 --- a/gtk2_ardour/add_route_dialog.h +++ b/gtk2_ardour/add_route_dialog.h @@ -31,8 +31,8 @@ #include <gtkmm/button.h> #include <gtkmm/comboboxtext.h> -#include <ardour/types.h> -#include <ardour/data_type.h> +#include "ardour/types.h" +#include "ardour/data_type.h" class AddRouteDialog : public Gtk::Dialog { diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc index b76a1b356e..ed2b90b34f 100644 --- a/gtk2_ardour/analysis_window.cc +++ b/gtk2_ardour/analysis_window.cc @@ -24,9 +24,9 @@ #include <gtkmm/treemodel.h> #include <gtkmm/treeiter.h> -#include <ardour/audioregion.h> -#include <ardour/audioplaylist.h> -#include <ardour/types.h> +#include "ardour/audioregion.h" +#include "ardour/audioplaylist.h" +#include "ardour/types.h" #include "analysis_window.h" diff --git a/gtk2_ardour/ardour_dialog.h b/gtk2_ardour/ardour_dialog.h index 44c731b36c..3384c013d4 100644 --- a/gtk2_ardour/ardour_dialog.h +++ b/gtk2_ardour/ardour_dialog.h @@ -20,7 +20,7 @@ #ifndef __ardour_dialog_h__ #define __ardour_dialog_h__ -#include <ardour/ardour.h> +#include "ardour/ardour.h" #include <gtkmm/window.h> #include <gtkmm/dialog.h> diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 4fdbe2209e..1038a3295c 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -36,13 +36,13 @@ #include <gtkmm/messagedialog.h> #include <gtkmm/accelmap.h> -#include <pbd/error.h> -#include <pbd/basename.h> -#include <pbd/compose.h> -#include <pbd/failed_constructor.h> -#include <pbd/enumwriter.h> -#include <pbd/memento_command.h> -#include <pbd/file_utils.h> +#include "pbd/error.h" +#include "pbd/basename.h" +#include "pbd/compose.h" +#include "pbd/failed_constructor.h" +#include "pbd/enumwriter.h" +#include "pbd/memento_command.h" +#include "pbd/file_utils.h" #include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/utils.h> @@ -52,26 +52,26 @@ #include <gtkmm2ext/popup.h> #include <gtkmm2ext/window_title.h> -#include <midi++/manager.h> - -#include <ardour/ardour.h> -#include <ardour/profile.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 "midi++/manager.h" + +#include "ardour/ardour.h" +#include "ardour/profile.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" typedef uint64_t microseconds_t; diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 663dd633f8..f3f4d5ef3f 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -36,8 +36,8 @@ #include <libgnomecanvasmm/canvas.h> -#include <pbd/xml++.h> -#include <pbd/controllable.h> +#include "pbd/xml++.h" +#include "pbd/controllable.h" #include <gtkmm/box.h> #include <gtkmm/frame.h> #include <gtkmm/label.h> @@ -57,10 +57,10 @@ #include <gtkmm2ext/click_box.h> #include <gtkmm2ext/stateful_button.h> #include <gtkmm2ext/bindable_button.h> -#include <ardour/ardour.h> -#include <ardour/session.h> -#include <ardour/configuration.h> -#include <ardour/types.h> +#include "ardour/ardour.h" +#include "ardour/session.h" +#include "ardour/configuration.h" +#include "ardour/types.h" #include "audio_clock.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 60f390501e..3f0b5f57e2 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -25,17 +25,17 @@ #include <cmath> #include <sigc++/bind.h> -#include <pbd/error.h> -#include <pbd/basename.h> -#include <pbd/fastlog.h> +#include "pbd/error.h" +#include "pbd/basename.h" +#include "pbd/fastlog.h" #include <gtkmm2ext/utils.h> #include <gtkmm2ext/click_box.h> #include <gtkmm2ext/tearoff.h> -#include <ardour/audioengine.h> -#include <ardour/ardour.h> -#include <ardour/profile.h> -#include <ardour/route.h> +#include "ardour/audioengine.h" +#include "ardour/ardour.h" +#include "ardour/profile.h" +#include "ardour/route.h" #include "ardour_ui.h" #include "keyboard.h" diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc index eacf0b50b7..2d4f390272 100644 --- a/gtk2_ardour/ardour_ui_dependents.cc +++ b/gtk2_ardour/ardour_ui_dependents.cc @@ -23,7 +23,7 @@ #include <cstdio> -#include <pbd/error.h> +#include "pbd/error.h" #include "ardour_ui.h" #include "public_editor.h" diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 1624824ec5..3fa662d589 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -23,7 +23,7 @@ This is to cut down on the compile times. It also helps with my sanity. */ -#include <ardour/session.h> +#include "ardour/session.h" #include "actions.h" #include "ardour_ui.h" diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 1b4d434c15..cf8fd19ba4 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -23,8 +23,8 @@ is to cut down on the nasty compile times for both these classes. */ -#include <pbd/file_utils.h> -#include <pbd/fpu.h> +#include "pbd/file_utils.h" +#include "pbd/fpu.h" #include <glibmm/miscutils.h> @@ -44,10 +44,10 @@ #include <gtkmm2ext/sync-menu.h> #endif -#include <ardour/session.h> -#include <ardour/profile.h> -#include <ardour/audioengine.h> -#include <ardour/control_protocol_manager.h> +#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 1d03fd158e..f47f4c9079 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -17,17 +17,17 @@ */ -#include <pbd/convert.h> -#include <pbd/stacktrace.h> +#include "pbd/convert.h" +#include "pbd/stacktrace.h" #include <gtkmm2ext/utils.h> -#include <ardour/configuration.h> -#include <ardour/session.h> -#include <ardour/audioengine.h> +#include "ardour/configuration.h" +#include "ardour/session.h" +#include "ardour/audioengine.h" #ifdef HAVE_LIBLO -#include <ardour/osc.h> +#include "ardour/osc.h" #endif #include "ardour_ui.h" diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index c27015801f..a53a1c7490 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -20,15 +20,15 @@ #include <cstdio> // for sprintf #include <cmath> -#include <pbd/convert.h> -#include <pbd/enumwriter.h> +#include "pbd/convert.h" +#include "pbd/enumwriter.h" #include <gtkmm2ext/utils.h> -#include <ardour/ardour.h> -#include <ardour/session.h> -#include <ardour/tempo.h> -#include <ardour/profile.h> +#include "ardour/ardour.h" +#include "ardour/session.h" +#include "ardour/tempo.h" +#include "ardour/profile.h" #include <sigc++/bind.h> #include "ardour_ui.h" diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h index 7c1b6d386b..1d9c550052 100644 --- a/gtk2_ardour/audio_clock.h +++ b/gtk2_ardour/audio_clock.h @@ -25,7 +25,7 @@ #include <gtkmm/eventbox.h> #include <gtkmm/label.h> #include <gtkmm/frame.h> -#include <ardour/ardour.h> +#include "ardour/ardour.h" namespace ARDOUR { class Session; diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc index c36ddbc041..c746cbe6a9 100644 --- a/gtk2_ardour/audio_region_editor.cc +++ b/gtk2_ardour/audio_region_editor.cc @@ -17,11 +17,11 @@ */ -#include <pbd/memento_command.h> +#include "pbd/memento_command.h" -#include <ardour/audioregion.h> -#include <ardour/playlist.h> -#include <ardour/utils.h> +#include "ardour/audioregion.h" +#include "ardour/playlist.h" +#include "ardour/utils.h" #include <gtkmm2ext/utils.h> #include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/window_title.h> diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 6af8496e9b..17de6517ac 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -24,16 +24,16 @@ #include <gtkmm2ext/gtk_ui.h> -#include <ardour/playlist.h> -#include <ardour/audioregion.h> -#include <ardour/audiosource.h> -#include <ardour/audio_diskstream.h> -#include <ardour/profile.h> +#include "ardour/playlist.h" +#include "ardour/audioregion.h" +#include "ardour/audiosource.h" +#include "ardour/audio_diskstream.h" +#include "ardour/profile.h" -#include <pbd/memento_command.h> -#include <pbd/stacktrace.h> +#include "pbd/memento_command.h" +#include "pbd/stacktrace.h" -#include <evoral/Curve.hpp> +#include "evoral/Curve.hpp" #include "streamview.h" #include "audio_region_view.h" diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h index a43ba0db86..7c40a5a4e5 100644 --- a/gtk2_ardour/audio_region_view.h +++ b/gtk2_ardour/audio_region_view.h @@ -24,7 +24,7 @@ #include <libgnomecanvasmm.h> #include <libgnomecanvasmm/polygon.h> #include <sigc++/signal.h> -#include <ardour/audioregion.h> +#include "ardour/audioregion.h" #include "region_view.h" #include "route_time_axis.h" diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index f102674fb4..ed56651e5f 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -24,15 +24,15 @@ #include <gtkmm2ext/gtk_ui.h> -#include <ardour/audioplaylist.h> -#include <ardour/audioregion.h> -#include <ardour/audiofilesource.h> -#include <ardour/audio_diskstream.h> -#include <ardour/audio_track.h> -#include <ardour/playlist_templates.h> -#include <ardour/source.h> -#include <ardour/region_factory.h> -#include <ardour/profile.h> +#include "ardour/audioplaylist.h" +#include "ardour/audioregion.h" +#include "ardour/audiofilesource.h" +#include "ardour/audio_diskstream.h" +#include "ardour/audio_track.h" +#include "ardour/playlist_templates.h" +#include "ardour/source.h" +#include "ardour/region_factory.h" +#include "ardour/profile.h" #include "audio_streamview.h" #include "audio_region_view.h" diff --git a/gtk2_ardour/audio_streamview.h b/gtk2_ardour/audio_streamview.h index d7f0c2571e..e8a2c64a03 100644 --- a/gtk2_ardour/audio_streamview.h +++ b/gtk2_ardour/audio_streamview.h @@ -25,7 +25,7 @@ #include <boost/weak_ptr.hpp> -#include <ardour/location.h> +#include "ardour/location.h" #include "editing.h" #include "simplerect.h" #include "streamview.h" diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 16a9ef6b2f..609d7b7d6c 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -27,9 +27,9 @@ #include <sigc++/bind.h> -#include <pbd/error.h> -#include <pbd/stl_delete.h> -#include <pbd/memento_command.h> +#include "pbd/error.h" +#include "pbd/stl_delete.h" +#include "pbd/memento_command.h" #include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/selector.h> @@ -37,17 +37,17 @@ #include <gtkmm2ext/bindable_button.h> #include <gtkmm2ext/utils.h> -#include <ardour/audio_diskstream.h> -#include <ardour/audioplaylist.h> -#include <ardour/event_type_map.h> -#include <ardour/location.h> -#include <ardour/panner.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/audio_diskstream.h" +#include "ardour/audioplaylist.h" +#include "ardour/event_type_map.h" +#include "ardour/location.h" +#include "ardour/panner.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_ui.h" #include "audio_time_axis.h" @@ -65,7 +65,7 @@ #include "audio_streamview.h" #include "utils.h" -#include <ardour/audio_track.h> +#include "ardour/audio_track.h" #include "i18n.h" diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h index f3bdbd3fb6..bd2fa6b5d6 100644 --- a/gtk2_ardour/audio_time_axis.h +++ b/gtk2_ardour/audio_time_axis.h @@ -31,7 +31,7 @@ #include <gtkmm2ext/selector.h> #include <list> -#include <ardour/types.h> +#include "ardour/types.h" #include "ardour_dialog.h" #include "route_ui.h" diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index 6f62608f0a..cf79eb4d48 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -18,7 +18,7 @@ */ -#include <pbd/error.h> +#include "pbd/error.h" #include "ardour/automation_list.h" #include "ardour/automation_control.h" #include "ardour/event_type_map.h" diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index d141bafad1..8156ec2a04 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -22,13 +22,13 @@ #include <vector> #include <fstream> -#include <pbd/stl_delete.h> -#include <pbd/memento_command.h> -#include <pbd/stacktrace.h> +#include "pbd/stl_delete.h" +#include "pbd/memento_command.h" +#include "pbd/stacktrace.h" -#include <ardour/automation_list.h> -#include <ardour/dB.h> -#include <evoral/Curve.hpp> +#include "ardour/automation_list.h" +#include "ardour/dB.h" +#include "evoral/Curve.hpp" #include "simplerect.h" #include "automation_line.h" @@ -44,8 +44,8 @@ #include "automation_time_axis.h" #include "public_editor.h" -#include <ardour/event_type_map.h> -#include <ardour/session.h> +#include "ardour/event_type_map.h" +#include "ardour/session.h" #include "i18n.h" diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index 5e1f5b6af0..b312cbd685 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -30,13 +30,13 @@ #include "canvas.h" #include "simplerect.h" -#include <evoral/TimeConverter.hpp> +#include "evoral/TimeConverter.hpp" -#include <pbd/undo.h> -#include <pbd/statefuldestructible.h> +#include "pbd/undo.h" +#include "pbd/statefuldestructible.h" -#include <ardour/automation_list.h> -#include <ardour/types.h> +#include "ardour/automation_list.h" +#include "ardour/types.h" class AutomationLine; class ControlPoint; diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index 3ba0794b17..dc0a5b07cd 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -17,11 +17,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <pbd/memento_command.h> -#include <ardour/automation_control.h> -#include <ardour/event_type_map.h> -#include <ardour/session.h> -#include <ardour/source.h> +#include "pbd/memento_command.h" +#include "ardour/automation_control.h" +#include "ardour/event_type_map.h" +#include "ardour/session.h" +#include "ardour/source.h" #include "automation_region_view.h" #include "public_editor.h" diff --git a/gtk2_ardour/automation_region_view.h b/gtk2_ardour/automation_region_view.h index dfe774aba6..99a344d681 100644 --- a/gtk2_ardour/automation_region_view.h +++ b/gtk2_ardour/automation_region_view.h @@ -20,8 +20,8 @@ #ifndef __gtk_ardour_automation_region_view_h__ #define __gtk_ardour_automation_region_view_h__ -#include <ardour/diskstream.h> -#include <ardour/types.h> +#include "ardour/diskstream.h" +#include "ardour/types.h" #include "region_view.h" #include "automation_time_axis.h" diff --git a/gtk2_ardour/automation_selectable.h b/gtk2_ardour/automation_selectable.h index f81b265982..e7139bedf0 100644 --- a/gtk2_ardour/automation_selectable.h +++ b/gtk2_ardour/automation_selectable.h @@ -20,7 +20,7 @@ #ifndef __ardour_gtk_automation_selectable_h__ #define __ardour_gtk_automation_selectable_h__ -#include <ardour/types.h> +#include "ardour/types.h" #include "selectable.h" class TimeAxisView; diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index 2769ab846d..c36085a77c 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/gtk2_ardour/automation_streamview.cc @@ -24,13 +24,13 @@ #include <gtkmm2ext/gtk_ui.h> -#include <ardour/midi_playlist.h> -#include <ardour/midi_region.h> -#include <ardour/midi_source.h> -#include <ardour/midi_diskstream.h> -#include <ardour/midi_track.h> -#include <ardour/smf_source.h> -#include <ardour/region_factory.h> +#include "ardour/midi_playlist.h" +#include "ardour/midi_region.h" +#include "ardour/midi_source.h" +#include "ardour/midi_diskstream.h" +#include "ardour/midi_track.h" +#include "ardour/smf_source.h" +#include "ardour/region_factory.h" #include "automation_streamview.h" #include "region_view.h" diff --git a/gtk2_ardour/automation_streamview.h b/gtk2_ardour/automation_streamview.h index 4188e7e983..d11de8113b 100644 --- a/gtk2_ardour/automation_streamview.h +++ b/gtk2_ardour/automation_streamview.h @@ -22,7 +22,7 @@ #include <list> #include <cmath> -#include <ardour/location.h> +#include "ardour/location.h" #include "enums.h" #include "simplerect.h" #include "streamview.h" diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index abdfa9841d..5d6b48850e 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -19,10 +19,10 @@ #include <utility> #include <gtkmm2ext/barcontroller.h> -#include <pbd/memento_command.h> -#include <ardour/automation_control.h> -#include <ardour/event_type_map.h> -#include <ardour/route.h> +#include "pbd/memento_command.h" +#include "ardour/automation_control.h" +#include "ardour/event_type_map.h" +#include "ardour/route.h" #include "ardour_ui.h" #include "automation_time_axis.h" diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h index fe44c5d2b7..6df4536ca6 100644 --- a/gtk2_ardour/automation_time_axis.h +++ b/gtk2_ardour/automation_time_axis.h @@ -27,9 +27,9 @@ #include <boost/shared_ptr.hpp> -#include <ardour/types.h> -#include <ardour/automatable.h> -#include <ardour/automation_list.h> +#include "ardour/types.h" +#include "ardour/automatable.h" +#include "ardour/automation_list.h" #include "canvas.h" #include "time_axis_view.h" diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc index f22b0d2dc7..e4632dc9ca 100644 --- a/gtk2_ardour/axis_view.cc +++ b/gtk2_ardour/axis_view.cc @@ -25,14 +25,14 @@ #include <list> -#include <pbd/error.h> +#include "pbd/error.h" #include <gtkmm2ext/utils.h> #include <gtkmm2ext/selector.h> #include <gtkmm2ext/gtk_ui.h> -#include <ardour/session.h> -#include <ardour/utils.h> +#include "ardour/session.h" +#include "ardour/utils.h" #include "public_editor.h" #include "axis_view.h" diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h index 3a15e05c99..187443dab6 100644 --- a/gtk2_ardour/axis_view.h +++ b/gtk2_ardour/axis_view.h @@ -25,7 +25,7 @@ #include <gtkmm/label.h> #include <gdkmm/color.h> -#include <pbd/xml++.h> +#include "pbd/xml++.h" #include "prompter.h" #include "selectable.h" diff --git a/gtk2_ardour/canvas-flag.h b/gtk2_ardour/canvas-flag.h index ad8c506d65..a9dbb09175 100644 --- a/gtk2_ardour/canvas-flag.h +++ b/gtk2_ardour/canvas-flag.h @@ -5,7 +5,7 @@ #include <libgnomecanvasmm/group.h> #include <libgnomecanvasmm/widget.h> -#include <ardour/midi_model.h> +#include "ardour/midi_model.h" #include "simplerect.h" #include "simpleline.h" diff --git a/gtk2_ardour/control_point.h b/gtk2_ardour/control_point.h index 013ba71e49..d8c18f10b3 100644 --- a/gtk2_ardour/control_point.h +++ b/gtk2_ardour/control_point.h @@ -22,7 +22,7 @@ #include <sys/types.h> -#include <ardour/automation_list.h> +#include "ardour/automation_list.h" #include "canvas.h" #include "simplerect.h" diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc index f6a0d7e1f7..bbbe72e91b 100644 --- a/gtk2_ardour/crossfade_edit.cc +++ b/gtk2_ardour/crossfade_edit.cc @@ -27,16 +27,16 @@ #include <libgnomecanvasmm/line.h> -#include <ardour/automation_list.h> -#include <evoral/Curve.hpp> -#include <ardour/crossfade.h> -#include <ardour/session.h> -#include <ardour/auditioner.h> -#include <ardour/audioplaylist.h> -#include <ardour/audiosource.h> -#include <ardour/playlist_templates.h> -#include <ardour/region_factory.h> -#include <ardour/profile.h> +#include "ardour/automation_list.h" +#include "evoral/Curve.hpp" +#include "ardour/crossfade.h" +#include "ardour/session.h" +#include "ardour/auditioner.h" +#include "ardour/audioplaylist.h" +#include "ardour/audiosource.h" +#include "ardour/playlist_templates.h" +#include "ardour/region_factory.h" +#include "ardour/profile.h" #include <gtkmm2ext/gtk_ui.h> diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h index 685dc43772..4b905a85c2 100644 --- a/gtk2_ardour/crossfade_edit.h +++ b/gtk2_ardour/crossfade_edit.h @@ -26,7 +26,7 @@ #include <gtkmm/button.h> #include <gtkmm/radiobutton.h> -#include <evoral/Curve.hpp> +#include "evoral/Curve.hpp" #include "ardour_dialog.h" #include "canvas.h" diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index c4a74b8a18..63c2115b87 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -19,7 +19,7 @@ #include <algorithm> -#include <ardour/region.h> +#include "ardour/region.h" #include <gtkmm2ext/doi.h> #include "canvas-simplerect.h" diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h index 6d45f05e79..fc41f7f721 100644 --- a/gtk2_ardour/crossfade_view.h +++ b/gtk2_ardour/crossfade_view.h @@ -23,7 +23,7 @@ #include <vector> #include <libgnomecanvasmm.h> #include <sigc++/signal.h> -#include <ardour/crossfade.h> +#include "ardour/crossfade.h" #include "time_axis_view_item.h" diff --git a/gtk2_ardour/curvetest.cc b/gtk2_ardour/curvetest.cc index 15195ff2a5..4710cfb821 100644 --- a/gtk2_ardour/curvetest.cc +++ b/gtk2_ardour/curvetest.cc @@ -22,8 +22,8 @@ #include <cfloat> #include <unistd.h> -#include <ardour/automation_list.h> -#include <evoral/Curve.hpp> +#include "ardour/automation_list.h" +#include "evoral/Curve.hpp" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/draginfo.h b/gtk2_ardour/draginfo.h index e0fccb7f70..cdc0b8e9c6 100644 --- a/gtk2_ardour/draginfo.h +++ b/gtk2_ardour/draginfo.h @@ -28,7 +28,7 @@ #include "canvas.h" #include "editor_items.h" -#include <ardour/types.h> +#include "ardour/types.h" namespace ARDOUR { class Location; diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h index d6608e3d8b..d2c9ba97b7 100644 --- a/gtk2_ardour/editing.h +++ b/gtk2_ardour/editing.h @@ -22,7 +22,7 @@ #include <string> #include <map> -#include <ardour/types.h> +#include "ardour/types.h" // This involves some cpp magic. --taybin diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 65a7c2ef69..2062a426a9 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -29,10 +29,10 @@ #include <sigc++/bind.h> -#include <pbd/convert.h> -#include <pbd/error.h> -#include <pbd/enumwriter.h> -#include <pbd/memento_command.h> +#include "pbd/convert.h" +#include "pbd/error.h" +#include "pbd/enumwriter.h" +#include "pbd/memento_command.h" #include <glibmm/miscutils.h> #include <gtkmm/image.h> @@ -46,20 +46,20 @@ #include <gtkmm2ext/window_title.h> #include <gtkmm2ext/choice.h> -#include <ardour/audio_diskstream.h> -#include <ardour/audio_track.h> -#include <ardour/audioplaylist.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/tempo.h> -#include <ardour/utils.h> +#include "ardour/audio_diskstream.h" +#include "ardour/audio_track.h" +#include "ardour/audioplaylist.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/tempo.h" +#include "ardour/utils.h" #include <control_protocol/control_protocol.h> diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index a77454a5e0..571b612294 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -45,14 +45,14 @@ #include <gtkmm2ext/click_box.h> #include <gtkmm2ext/dndtreeview.h> -#include <pbd/stateful.h> -#include <ardour/session.h> -#include <ardour/tempo.h> -#include <ardour/stretch.h> -#include <ardour/location.h> -#include <ardour/audioregion.h> -#include <ardour/track.h> -#include <ardour/types.h> +#include "pbd/stateful.h" +#include "ardour/session.h" +#include "ardour/tempo.h" +#include "ardour/stretch.h" +#include "ardour/location.h" +#include "ardour/audioregion.h" +#include "ardour/track.h" +#include "ardour/types.h" #include "audio_clock.h" #include "gtk-custom-ruler.h" diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 84e111e990..63c0b79bc0 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -17,8 +17,8 @@ */ -#include <ardour/ardour.h> -#include <ardour/profile.h> +#include "ardour/ardour.h" +#include "ardour/profile.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 730063655a..4301e1ac34 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -26,28 +26,28 @@ #include <sndfile.h> -#include <pbd/pthread_utils.h> -#include <pbd/basename.h> -#include <pbd/shortpath.h> +#include "pbd/pthread_utils.h" +#include "pbd/basename.h" +#include "pbd/shortpath.h" #include <gtkmm2ext/choice.h> #include <gtkmm2ext/window_title.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/region_factory.h> -#include <ardour/source_factory.h> -#include <ardour/session.h> -#include <pbd/memento_command.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/region_factory.h" +#include "ardour/source_factory.h" +#include "ardour/session.h" +#include "pbd/memento_command.h" #include "ardour_ui.h" #include "editor.h" diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc index 7e821f0e5e..693a7a6af9 100644 --- a/gtk2_ardour/editor_audiotrack.cc +++ b/gtk2_ardour/editor_audiotrack.cc @@ -17,8 +17,8 @@ */ -#include <ardour/location.h> -#include <ardour/audio_diskstream.h> +#include "ardour/location.h" +#include "ardour/audio_diskstream.h" #include "ardour_ui.h" #include "editor.h" diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 848c663200..bdb051173d 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -22,8 +22,8 @@ #include <jack/types.h> #include <gtkmm2ext/utils.h> -#include <ardour/audioregion.h> -#include <ardour/profile.h> +#include "ardour/audioregion.h" +#include "ardour/profile.h" #include "ardour_ui.h" #include "editor.h" diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 478fc1afe4..c0e90abf39 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -22,10 +22,10 @@ #include <algorithm> #include <typeinfo> -#include <pbd/stacktrace.h> +#include "pbd/stacktrace.h" -#include <ardour/audio_diskstream.h> -#include <ardour/audioplaylist.h> +#include "ardour/audio_diskstream.h" +#include "ardour/audioplaylist.h" #include "editor.h" #include "keyboard.h" diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc index 371b13ed0c..55b264f87f 100644 --- a/gtk2_ardour/editor_edit_groups.cc +++ b/gtk2_ardour/editor_edit_groups.cc @@ -22,7 +22,7 @@ #include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/gtk_ui.h> -#include <ardour/route_group.h> +#include "ardour/route_group.h" #include "editor.h" #include "keyboard.h" @@ -31,7 +31,7 @@ #include "prompter.h" #include "gui_thread.h" -#include <ardour/route.h> +#include "ardour/route.h" #include "i18n.h" diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index ea1876ca94..ca73c4d8b0 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -32,17 +32,17 @@ #include "audio_time_axis.h" #include "audio_region_view.h" -#include <pbd/pthread_utils.h> -#include <ardour/types.h> -#include <ardour/audio_track.h> -#include <ardour/audiofilesource.h> -#include <ardour/audio_diskstream.h> -#include <ardour/audioregion.h> -#include <ardour/audioplaylist.h> -#include <ardour/chan_count.h> -#include <ardour/session_directory.h> -#include <ardour/source_factory.h> -#include <ardour/audiofilesource.h> +#include "pbd/pthread_utils.h" +#include "ardour/types.h" +#include "ardour/audio_track.h" +#include "ardour/audiofilesource.h" +#include "ardour/audio_diskstream.h" +#include "ardour/audioregion.h" +#include "ardour/audioplaylist.h" +#include "ardour/chan_count.h" +#include "ardour/session_directory.h" +#include "ardour/source_factory.h" +#include "ardour/audiofilesource.h" #include "i18n.h" diff --git a/gtk2_ardour/editor_hscroller.cc b/gtk2_ardour/editor_hscroller.cc index f5f94c4163..b5f265daa5 100644 --- a/gtk2_ardour/editor_hscroller.cc +++ b/gtk2_ardour/editor_hscroller.cc @@ -19,7 +19,7 @@ #include "editor.h" -#include <ardour/session.h> +#include "ardour/session.h" using namespace std; using namespace ARDOUR; diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc index d4bf497591..5ff1fc6459 100644 --- a/gtk2_ardour/editor_imageframe.cc +++ b/gtk2_ardour/editor_imageframe.cc @@ -30,7 +30,7 @@ #include "canvas_impl.h" #include <gtkmm2ext/gtk_ui.h> -#include <pbd/error.h> +#include "pbd/error.h" #include <sys/types.h> #include <sys/socket.h> diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc index 257ebc487a..32b797a1a0 100644 --- a/gtk2_ardour/editor_keyboard.cc +++ b/gtk2_ardour/editor_keyboard.cc @@ -17,11 +17,11 @@ */ -#include <ardour/audioregion.h> -#include <ardour/playlist.h> -#include <ardour/location.h> +#include "ardour/audioregion.h" +#include "ardour/playlist.h" +#include "ardour/location.h" -#include <pbd/memento_command.h> +#include "pbd/memento_command.h" #include "editor.h" #include "region_view.h" diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc index efbe0cb522..1826ee464d 100644 --- a/gtk2_ardour/editor_keys.cc +++ b/gtk2_ardour/editor_keys.cc @@ -21,10 +21,10 @@ #include <cmath> #include <string> -#include <pbd/error.h> +#include "pbd/error.h" -#include <ardour/session.h> -#include <ardour/region.h> +#include "ardour/session.h" +#include "ardour/region.h" #include <gtkmm/treeview.h> #include "ardour_ui.h" diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 0504c08095..6406f04e54 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -25,9 +25,9 @@ #include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/window_title.h> -#include <ardour/location.h> -#include <ardour/profile.h> -#include <pbd/memento_command.h> +#include "ardour/location.h" +#include "ardour/profile.h" +#include "pbd/memento_command.h" #include "editor.h" #include "marker.h" diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 04caa99f28..add7213400 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -21,9 +21,9 @@ #include <gtkmm2ext/utils.h> #include <gtkmm2ext/window_title.h> -#include <pbd/enumwriter.h> +#include "pbd/enumwriter.h" -#include <ardour/audioengine.h> +#include "ardour/audioengine.h" #include "editor.h" #include "mixer_strip.h" diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 49c067746d..051463f200 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -25,11 +25,11 @@ #include <string> #include <algorithm> -#include <pbd/error.h> +#include "pbd/error.h" #include <gtkmm2ext/utils.h> #include <gtkmm2ext/tearoff.h> -#include <pbd/memento_command.h> -#include <pbd/basename.h> +#include "pbd/memento_command.h" +#include "pbd/basename.h" #include "ardour_ui.h" #include "editor.h" @@ -50,20 +50,20 @@ #include "rgb_macros.h" #include "control_point_dialog.h" -#include <ardour/types.h> -#include <ardour/profile.h> -#include <ardour/route.h> -#include <ardour/audio_track.h> -#include <ardour/audio_diskstream.h> -#include <ardour/midi_diskstream.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/region_factory.h> -#include <ardour/source_factory.h> +#include "ardour/types.h" +#include "ardour/profile.h" +#include "ardour/route.h" +#include "ardour/audio_track.h" +#include "ardour/audio_diskstream.h" +#include "ardour/midi_diskstream.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/region_factory.h" +#include "ardour/source_factory.h" #include <bitset> diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index ab53490cff..07fa68f714 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -27,33 +27,33 @@ #include <map> #include <set> -#include <pbd/error.h> -#include <pbd/basename.h> -#include <pbd/pthread_utils.h> -#include <pbd/memento_command.h> -#include <pbd/whitespace.h> +#include "pbd/error.h" +#include "pbd/basename.h" +#include "pbd/pthread_utils.h" +#include "pbd/memento_command.h" +#include "pbd/whitespace.h" #include <gtkmm2ext/utils.h> #include <gtkmm2ext/choice.h> #include <gtkmm2ext/window_title.h> #include <gtkmm2ext/popup.h> -#include <ardour/audioengine.h> -#include <ardour/session.h> -#include <ardour/audioplaylist.h> -#include <ardour/audioregion.h> -#include <ardour/audio_diskstream.h> -#include <ardour/utils.h> -#include <ardour/location.h> -#include <ardour/named_selection.h> -#include <ardour/audio_track.h> -#include <ardour/audioplaylist.h> -#include <ardour/region_factory.h> -#include <ardour/playlist_factory.h> -#include <ardour/reverse.h> -#include <ardour/transient_detector.h> -#include <ardour/dB.h> -#include <ardour/quantize.h> +#include "ardour/audioengine.h" +#include "ardour/session.h" +#include "ardour/audioplaylist.h" +#include "ardour/audioregion.h" +#include "ardour/audio_diskstream.h" +#include "ardour/utils.h" +#include "ardour/location.h" +#include "ardour/named_selection.h" +#include "ardour/audio_track.h" +#include "ardour/audioplaylist.h" +#include "ardour/region_factory.h" +#include "ardour/playlist_factory.h" +#include "ardour/reverse.h" +#include "ardour/transient_detector.h" +#include "ardour/dB.h" +#include "ardour/quantize.h" #include "ardour_ui.h" #include "editor.h" diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc index b97c8acc9e..338dc71221 100644 --- a/gtk2_ardour/editor_region_list.cc +++ b/gtk2_ardour/editor_region_list.cc @@ -23,13 +23,13 @@ #include <string> #include <sstream> -#include <pbd/basename.h> +#include "pbd/basename.h" -#include <ardour/audioregion.h> -#include <ardour/audiofilesource.h> -#include <ardour/silentfilesource.h> -#include <ardour/session_region.h> -#include <ardour/profile.h> +#include "ardour/audioregion.h" +#include "ardour/audiofilesource.h" +#include "ardour/silentfilesource.h" +#include "ardour/session_region.h" +#include "ardour/profile.h" #include <gtkmm2ext/stop_signal.h> diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc index 2847416397..ef6bbde471 100644 --- a/gtk2_ardour/editor_route_list.cc +++ b/gtk2_ardour/editor_route_list.cc @@ -33,9 +33,9 @@ #include "gui_thread.h" #include "actions.h" -#include <pbd/unknown_type.h> +#include "pbd/unknown_type.h" -#include <ardour/route.h> +#include "ardour/route.h" #include "i18n.h" diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 0835cd81ab..0998b86bd9 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -24,8 +24,8 @@ #include <gtk/gtkaction.h> -#include <ardour/tempo.h> -#include <ardour/profile.h> +#include "ardour/tempo.h" +#include "ardour/profile.h" #include <gtkmm2ext/gtk_ui.h> #include "editor.h" diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 305ad77902..05b1296075 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -20,12 +20,12 @@ #include <algorithm> #include <cstdlib> -#include <pbd/stacktrace.h> +#include "pbd/stacktrace.h" -#include <ardour/diskstream.h> -#include <ardour/playlist.h> -#include <ardour/route_group.h> -#include <ardour/profile.h> +#include "ardour/diskstream.h" +#include "ardour/playlist.h" +#include "ardour/route_group.h" +#include "ardour/profile.h" #include "editor.h" #include "actions.h" diff --git a/gtk2_ardour/editor_selection_list.cc b/gtk2_ardour/editor_selection_list.cc index 1d75bf5d13..7f818ebe2b 100644 --- a/gtk2_ardour/editor_selection_list.cc +++ b/gtk2_ardour/editor_selection_list.cc @@ -23,9 +23,9 @@ #include <gtkmm.h> -#include <ardour/named_selection.h> -#include <ardour/session_selection.h> -#include <ardour/playlist.h> +#include "ardour/named_selection.h" +#include "ardour/session_selection.h" +#include "ardour/playlist.h" #include <gtkmm2ext/stop_signal.h> diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 9bef055b57..00d0b94a0e 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -25,14 +25,14 @@ #include <libgnomecanvasmm.h> -#include <pbd/error.h> -#include <pbd/memento_command.h> +#include "pbd/error.h" +#include "pbd/memento_command.h" #include <gtkmm2ext/utils.h> #include <gtkmm2ext/gtk_ui.h> -#include <ardour/session.h> -#include <ardour/tempo.h> +#include "ardour/session.h" +#include "ardour/tempo.h" #include <gtkmm2ext/doi.h> #include <gtkmm2ext/utils.h> diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc index 8192085e96..19d574db27 100644 --- a/gtk2_ardour/editor_timefx.cc +++ b/gtk2_ardour/editor_timefx.cc @@ -23,9 +23,9 @@ #include <string> -#include <pbd/error.h> -#include <pbd/pthread_utils.h> -#include <pbd/memento_command.h> +#include "pbd/error.h" +#include "pbd/pthread_utils.h" +#include "pbd/memento_command.h" #include <gtkmm2ext/window_title.h> #include <gtkmm2ext/utils.h> @@ -35,15 +35,15 @@ #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/audio_diskstream.h> -#include <ardour/stretch.h> -#include <ardour/midi_stretch.h> -#include <ardour/pitch.h> +#include "ardour/session.h" +#include "ardour/region.h" +#include "ardour/audioplaylist.h" +#include "ardour/audio_track.h" +#include "ardour/audioregion.h" +#include "ardour/audio_diskstream.h" +#include "ardour/stretch.h" +#include "ardour/midi_stretch.h" +#include "ardour/pitch.h" #ifdef USE_RUBBERBAND #include <rubberband/RubberBandStretcher.h> diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index f2bde63e0c..8ab92033c2 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -5,7 +5,7 @@ #include <glibmm.h> #include <gtkmm/messagedialog.h> -#include <pbd/xml++.h> +#include "pbd/xml++.h" #ifdef __APPLE__ #include <CoreAudio/CoreAudio.h> @@ -16,15 +16,15 @@ #include <alsa/asoundlib.h> #endif -#include <ardour/profile.h> +#include "ardour/profile.h" #include <jack/jack.h> #include <gtkmm/stock.h> #include <gtkmm2ext/utils.h> -#include <pbd/convert.h> -#include <pbd/error.h> -#include <pbd/pathscanner.h> +#include "pbd/convert.h" +#include "pbd/error.h" +#include "pbd/pathscanner.h" #ifdef __APPLE #include <CFBundle.h> diff --git a/gtk2_ardour/enums.cc b/gtk2_ardour/enums.cc index 9ed5bdfd8c..513be94aef 100644 --- a/gtk2_ardour/enums.cc +++ b/gtk2_ardour/enums.cc @@ -17,7 +17,7 @@ */ -#include <pbd/enumwriter.h> +#include "pbd/enumwriter.h" #include "audio_clock.h" #include "editing.h" diff --git a/gtk2_ardour/enums.h b/gtk2_ardour/enums.h index ebd061cc40..00b7a6e56c 100644 --- a/gtk2_ardour/enums.h +++ b/gtk2_ardour/enums.h @@ -20,7 +20,7 @@ #ifndef __ardour_gtk_enums_h__ #define __ardour_gtk_enums_h__ -#include <ardour/types.h> +#include "ardour/types.h" enum Width { Wide, diff --git a/gtk2_ardour/export_channel_selector.cc b/gtk2_ardour/export_channel_selector.cc index 1f1472d830..509f465b7b 100644 --- a/gtk2_ardour/export_channel_selector.cc +++ b/gtk2_ardour/export_channel_selector.cc @@ -22,16 +22,16 @@ #include <algorithm> -#include <pbd/convert.h> - -#include <ardour/audio_port.h> -#include <ardour/audio_track.h> -#include <ardour/audioengine.h> -#include <ardour/export_channel_configuration.h> -#include <ardour/export_handler.h> -#include <ardour/io.h> -#include <ardour/route.h> -#include <ardour/session.h> +#include "pbd/convert.h" + +#include "ardour/audio_port.h" +#include "ardour/audio_track.h" +#include "ardour/audioengine.h" +#include "ardour/export_channel_configuration.h" +#include "ardour/export_handler.h" +#include "ardour/io.h" +#include "ardour/route.h" +#include "ardour/session.h" #include <sstream> diff --git a/gtk2_ardour/export_channel_selector.h b/gtk2_ardour/export_channel_selector.h index 595dae2562..9f1217c53d 100644 --- a/gtk2_ardour/export_channel_selector.h +++ b/gtk2_ardour/export_channel_selector.h @@ -23,8 +23,8 @@ #include <list> -#include <ardour/export_profile_manager.h> -#include <ardour/export_channel.h> +#include "ardour/export_profile_manager.h" +#include "ardour/export_channel.h" #include <gtkmm.h> #include <sigc++/signal.h> diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index c533e4489e..4f11ad410e 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -22,10 +22,10 @@ #include <sigc++/signal.h> -#include <pbd/filesystem.h> +#include "pbd/filesystem.h" -#include <ardour/export_status.h> -#include <ardour/export_handler.h> +#include "ardour/export_status.h" +#include "ardour/export_handler.h" using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h index 0528c514b6..8e70920b7c 100644 --- a/gtk2_ardour/export_dialog.h +++ b/gtk2_ardour/export_dialog.h @@ -23,8 +23,8 @@ #include <boost/shared_ptr.hpp> -#include <ardour/export_handler.h> -#include <ardour/export_profile_manager.h> +#include "ardour/export_handler.h" +#include "ardour/export_profile_manager.h" #include "public_editor.h" #include "export_timespan_selector.h" diff --git a/gtk2_ardour/export_file_notebook.cc b/gtk2_ardour/export_file_notebook.cc index 456483cae6..b10c0e58c1 100644 --- a/gtk2_ardour/export_file_notebook.cc +++ b/gtk2_ardour/export_file_notebook.cc @@ -20,7 +20,7 @@ #include "export_file_notebook.h" -#include <ardour/export_format_specification.h> +#include "ardour/export_format_specification.h" #include "utils.h" #include "i18n.h" diff --git a/gtk2_ardour/export_file_notebook.h b/gtk2_ardour/export_file_notebook.h index aed9a0fcc2..b6aee9992c 100644 --- a/gtk2_ardour/export_file_notebook.h +++ b/gtk2_ardour/export_file_notebook.h @@ -24,7 +24,7 @@ #include <sigc++/signal.h> #include <gtkmm.h> -#include <ardour/export_profile_manager.h> +#include "ardour/export_profile_manager.h" #include "export_format_selector.h" #include "export_filename_selector.h" diff --git a/gtk2_ardour/export_filename_selector.cc b/gtk2_ardour/export_filename_selector.cc index 66eb389956..a78c0e7890 100644 --- a/gtk2_ardour/export_filename_selector.cc +++ b/gtk2_ardour/export_filename_selector.cc @@ -20,9 +20,9 @@ #include "export_filename_selector.h" -#include <ardour/export_handler.h> -#include <ardour/session.h> -#include <ardour/session_directory.h> +#include "ardour/export_handler.h" +#include "ardour/session.h" +#include "ardour/session_directory.h" #include "i18n.h" diff --git a/gtk2_ardour/export_filename_selector.h b/gtk2_ardour/export_filename_selector.h index c21435bb57..faa508de41 100644 --- a/gtk2_ardour/export_filename_selector.h +++ b/gtk2_ardour/export_filename_selector.h @@ -23,8 +23,8 @@ #include <gtkmm.h> -#include <ardour/export_profile_manager.h> -#include <ardour/export_filename.h> +#include "ardour/export_profile_manager.h" +#include "ardour/export_filename.h" namespace ARDOUR { class Session; diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc index f123c9cbbb..b7688aec10 100644 --- a/gtk2_ardour/export_format_dialog.cc +++ b/gtk2_ardour/export_format_dialog.cc @@ -20,8 +20,8 @@ #include "export_format_dialog.h" -#include <ardour/session.h> -#include <ardour/export_format_specification.h> +#include "ardour/session.h" +#include "ardour/export_format_specification.h" #include "i18n.h" diff --git a/gtk2_ardour/export_format_dialog.h b/gtk2_ardour/export_format_dialog.h index fed081f9f0..acb561b06b 100644 --- a/gtk2_ardour/export_format_dialog.h +++ b/gtk2_ardour/export_format_dialog.h @@ -21,12 +21,12 @@ #ifndef __export_format_dialog_h__ #define __export_format_dialog_h__ -#include <ardour/types.h> -#include <ardour/export_format_manager.h> -#include <ardour/export_format_compatibility.h> -#include <ardour/export_formats.h> +#include "ardour/types.h" +#include "ardour/export_format_manager.h" +#include "ardour/export_format_compatibility.h" +#include "ardour/export_formats.h" -#include <pbd/xml++.h> +#include "pbd/xml++.h" #include "ardour_dialog.h" #include "audio_clock.h" diff --git a/gtk2_ardour/export_format_selector.cc b/gtk2_ardour/export_format_selector.cc index 676373e5c3..122facdd39 100644 --- a/gtk2_ardour/export_format_selector.cc +++ b/gtk2_ardour/export_format_selector.cc @@ -22,9 +22,9 @@ #include "export_format_dialog.h" -#include <ardour/export_format_specification.h> -#include <ardour/export_profile_manager.h> -#include <ardour/session.h> +#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_format_selector.h b/gtk2_ardour/export_format_selector.h index d4e4ae0110..78daf5b5c6 100644 --- a/gtk2_ardour/export_format_selector.h +++ b/gtk2_ardour/export_format_selector.h @@ -21,7 +21,7 @@ #ifndef __export_format_selector_h__ #define __export_format_selector_h__ -#include <ardour/export_profile_manager.h> +#include "ardour/export_profile_manager.h" #include <gtkmm.h> #include <sigc++/signal.h> diff --git a/gtk2_ardour/export_multiplicator.cc b/gtk2_ardour/export_multiplicator.cc index 969548e273..757039dc9d 100644 --- a/gtk2_ardour/export_multiplicator.cc +++ b/gtk2_ardour/export_multiplicator.cc @@ -28,7 +28,7 @@ #include <cassert> -#include <pbd/compose.h> +#include "pbd/compose.h" #include "i18n.h" diff --git a/gtk2_ardour/export_multiplicator.h b/gtk2_ardour/export_multiplicator.h index 20ce96cda0..60c6914bf5 100644 --- a/gtk2_ardour/export_multiplicator.h +++ b/gtk2_ardour/export_multiplicator.h @@ -30,7 +30,7 @@ #include <utility> #include <map> -#include <ardour/export_profile_manager.h> +#include "ardour/export_profile_manager.h" #include <gtkmm.h> #include <boost/shared_ptr.hpp> diff --git a/gtk2_ardour/export_preset_selector.cc b/gtk2_ardour/export_preset_selector.cc index 094fb967ce..fbbc215fb0 100644 --- a/gtk2_ardour/export_preset_selector.cc +++ b/gtk2_ardour/export_preset_selector.cc @@ -20,7 +20,7 @@ #include "export_preset_selector.h" -#include <ardour/export_preset.h> +#include "ardour/export_preset.h" #include "i18n.h" diff --git a/gtk2_ardour/export_preset_selector.h b/gtk2_ardour/export_preset_selector.h index 3022e224bc..ea7e61b32e 100644 --- a/gtk2_ardour/export_preset_selector.h +++ b/gtk2_ardour/export_preset_selector.h @@ -24,7 +24,7 @@ #include <sigc++/signal.h> #include <gtkmm.h> -#include <ardour/export_profile_manager.h> +#include "ardour/export_profile_manager.h" class ExportPresetSelector : public Gtk::HBox { diff --git a/gtk2_ardour/export_range_markers_dialog.cc b/gtk2_ardour/export_range_markers_dialog.cc index cea690f74c..df612a340d 100644 --- a/gtk2_ardour/export_range_markers_dialog.cc +++ b/gtk2_ardour/export_range_markers_dialog.cc @@ -22,8 +22,8 @@ #include <sstream> -#include <ardour/audioengine.h> -#include <ardour/sndfile_helpers.h> +#include "ardour/audioengine.h" +#include "ardour/sndfile_helpers.h" #include "ardour_ui.h" #include "export_range_markers_dialog.h" diff --git a/gtk2_ardour/export_range_markers_dialog.h b/gtk2_ardour/export_range_markers_dialog.h index 9083b87b26..a3a20836b1 100644 --- a/gtk2_ardour/export_range_markers_dialog.h +++ b/gtk2_ardour/export_range_markers_dialog.h @@ -20,7 +20,7 @@ #ifndef __export_range_markers_dialog_h__ #define __export_range_markers_dialog_h__ -#include <ardour/location.h> +#include "ardour/location.h" #include "export_dialog.h" diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc index 29d21b25cb..59875c4872 100644 --- a/gtk2_ardour/export_timespan_selector.cc +++ b/gtk2_ardour/export_timespan_selector.cc @@ -22,14 +22,14 @@ #include "ardour_ui.h" -#include <ardour/location.h> -#include <ardour/types.h> -#include <ardour/session.h> -#include <ardour/export_handler.h> -#include <ardour/export_timespan.h> - -#include <pbd/enumwriter.h> -#include <pbd/convert.h> +#include "ardour/location.h" +#include "ardour/types.h" +#include "ardour/session.h" +#include "ardour/export_handler.h" +#include "ardour/export_timespan.h" + +#include "pbd/enumwriter.h" +#include "pbd/convert.h" #include <sstream> #include <iomanip> diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h index e8a97326bc..db1f4cd0e9 100644 --- a/gtk2_ardour/export_timespan_selector.h +++ b/gtk2_ardour/export_timespan_selector.h @@ -29,8 +29,8 @@ #include <gtkmm.h> #include <boost/shared_ptr.hpp> -#include <ardour/types.h> -#include <ardour/export_profile_manager.h> +#include "ardour/types.h" +#include "ardour/export_profile_manager.h" namespace ARDOUR { class Location; diff --git a/gtk2_ardour/fft.h b/gtk2_ardour/fft.h index 3a4d0f8063..ba191c03cd 100644 --- a/gtk2_ardour/fft.h +++ b/gtk2_ardour/fft.h @@ -30,7 +30,7 @@ #include <fftw3.h> -#include <ardour/types.h> +#include "ardour/types.h" class FFT { diff --git a/gtk2_ardour/fft_graph.cc b/gtk2_ardour/fft_graph.cc index 077c1e162c..aac3143aee 100644 --- a/gtk2_ardour/fft_graph.cc +++ b/gtk2_ardour/fft_graph.cc @@ -29,7 +29,7 @@ #include <gtkmm/treemodel.h> #include <gtkmm/treepath.h> -#include <pbd/stl_delete.h> +#include "pbd/stl_delete.h" #include <math.h> diff --git a/gtk2_ardour/fft_graph.h b/gtk2_ardour/fft_graph.h index bbf7774741..ea91a08ea9 100644 --- a/gtk2_ardour/fft_graph.h +++ b/gtk2_ardour/fft_graph.h @@ -20,7 +20,7 @@ #ifndef __ardour_fft_graph_h #define __ardour_fft_graph_h -#include <ardour/types.h> +#include "ardour/types.h" #include <fftw3.h> #include <gtkmm/drawingarea.h> diff --git a/gtk2_ardour/fft_result.h b/gtk2_ardour/fft_result.h index c6c952db1c..fa2a569108 100644 --- a/gtk2_ardour/fft_result.h +++ b/gtk2_ardour/fft_result.h @@ -21,7 +21,7 @@ #ifndef __ardour_fft_result_h #define __ardour_fft_result_h -#include <ardour/types.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 85562bac0e..3540842a83 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -19,12 +19,12 @@ #include <limits.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/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 <gtkmm/style.h> #include <gdkmm/color.h> @@ -33,9 +33,9 @@ #include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/barcontroller.h> #include <gtkmm2ext/gtk_ui.h> -#include <midi++/manager.h> -#include <pbd/fastlog.h> -#include <pbd/stacktrace.h> +#include "midi++/manager.h" +#include "pbd/fastlog.h" +#include "pbd/stacktrace.h" #include "ardour_ui.h" #include "gain_meter.h" @@ -45,9 +45,9 @@ #include "keyboard.h" #include "public_editor.h" -#include <ardour/session.h> -#include <ardour/route.h> -#include <ardour/meter.h> +#include "ardour/session.h" +#include "ardour/route.h" +#include "ardour/meter.h" #include "i18n.h" diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h index 0c4e52b7c5..1352532331 100644 --- a/gtk2_ardour/gain_meter.h +++ b/gtk2_ardour/gain_meter.h @@ -32,7 +32,7 @@ #include <gtkmm/drawingarea.h> #include <gdkmm/colormap.h> -#include <ardour/types.h> +#include "ardour/types.h" #include <gtkmm2ext/click_box.h> #include <gtkmm2ext/focus_entry.h> diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index c7cecc7130..16dbba523f 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -22,9 +22,9 @@ #include <cmath> #include <string> -#include <pbd/stl_delete.h> -#include <pbd/xml++.h> -#include <pbd/failed_constructor.h> +#include "pbd/stl_delete.h" +#include "pbd/xml++.h" +#include "pbd/failed_constructor.h" #include <gtkmm2ext/click_box.h> #include <gtkmm2ext/fastmeter.h> @@ -33,13 +33,13 @@ #include <gtkmm2ext/doi.h> #include <gtkmm2ext/slider_controller.h> -#include <midi++/manager.h> +#include "midi++/manager.h" -#include <ardour/plugin.h> -#include <ardour/plugin_insert.h> -#include <ardour/ladspa_plugin.h> +#include "ardour/plugin.h" +#include "ardour/plugin_insert.h" +#include "ardour/ladspa_plugin.h" #ifdef HAVE_LV2 -#include <ardour/lv2_plugin.h> +#include "ardour/lv2_plugin.h" #endif #include <lrdf.h> diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc index dd7839612f..27de656089 100644 --- a/gtk2_ardour/ghostregion.cc +++ b/gtk2_ardour/ghostregion.cc @@ -17,7 +17,7 @@ */ -#include <evoral/Note.hpp> +#include "evoral/Note.hpp" #include "ardour_ui.h" #include "automation_time_axis.h" #include "canvas-hit.h" diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h index 885edfde59..8328bc0c06 100644 --- a/gtk2_ardour/ghostregion.h +++ b/gtk2_ardour/ghostregion.h @@ -23,7 +23,7 @@ #include <vector> #include <sigc++/signal.h> #include <libgnomecanvasmm.h> -#include <ardour/configuration.h> +#include "ardour/configuration.h" #include "canvas.h" namespace Gnome { diff --git a/gtk2_ardour/gui_thread.h b/gtk2_ardour/gui_thread.h index ef129ad46d..12071c5558 100644 --- a/gtk2_ardour/gui_thread.h +++ b/gtk2_ardour/gui_thread.h @@ -21,7 +21,7 @@ #define __ardour_gtk_gui_thread_h__ #include <gtkmm2ext/gtk_ui.h> -#include <pbd/crossthread.h> +#include "pbd/crossthread.h" #define ENSURE_GUI_THREAD(slot) \ if (!Gtkmm2ext::UI::instance()->caller_is_ui_thread()) {\ diff --git a/gtk2_ardour/i18n.h b/gtk2_ardour/i18n.h index fa19bbb8a5..8dc13404aa 100644 --- a/gtk2_ardour/i18n.h +++ b/gtk2_ardour/i18n.h @@ -20,8 +20,8 @@ #ifndef __i18n_h__ #define __i18n_h__ -#include <pbd/compose.h> -#include <pbd/convert.h> +#include "pbd/compose.h" +#include "pbd/convert.h" #include "gettext.h" #include <vector> diff --git a/gtk2_ardour/imageframe_socket_handler.cc b/gtk2_ardour/imageframe_socket_handler.cc index dac36c6e2e..2838be6f66 100644 --- a/gtk2_ardour/imageframe_socket_handler.cc +++ b/gtk2_ardour/imageframe_socket_handler.cc @@ -43,8 +43,8 @@ #include "i18n.h" -#include <ardour/session.h> -#include <ardour/session_utils.h> +#include "ardour/session.h" +#include "ardour/session_utils.h" #include <unistd.h> diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc index 735855421f..2f421a1132 100644 --- a/gtk2_ardour/imageframe_time_axis.cc +++ b/gtk2_ardour/imageframe_time_axis.cc @@ -20,15 +20,15 @@ #include <string> #include <algorithm> -#include <pbd/error.h> +#include "pbd/error.h" #include <gtkmm/menu.h> #include <gtkmm2ext/utils.h> #include <gtkmm2ext/gtk_ui.h> -#include <ardour/session.h> -#include <ardour/utils.h> +#include "ardour/session.h" +#include "ardour/utils.h" #include "public_editor.h" #include "imageframe_time_axis.h" diff --git a/gtk2_ardour/imageframe_time_axis_group.h b/gtk2_ardour/imageframe_time_axis_group.h index ba7790c04a..147e6b5295 100644 --- a/gtk2_ardour/imageframe_time_axis_group.h +++ b/gtk2_ardour/imageframe_time_axis_group.h @@ -27,7 +27,7 @@ #include <libgnomecanvas/libgnomecanvas.h> #include <jack/jack.h> -#include <ardour/types.h> +#include "ardour/types.h" #include "imageframe_time_axis_view.h" class PublicEditor ; diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index f31a2a7d3c..fb2c66a4be 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -22,7 +22,7 @@ #include <gtkmm2ext/doi.h> -#include <ardour/port_insert.h> +#include "ardour/port_insert.h" #include "ardour/session.h" #include "ardour/io.h" #include "ardour/audioengine.h" diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index d0fcbea5cf..cd9d51c164 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -18,7 +18,7 @@ */ #include <vector> -#include <ardour/ardour.h> +#include "ardour/ardour.h" #include "ardour_ui.h" @@ -31,10 +31,10 @@ #include <gtkmm/accelmap.h> #include <gdk/gdkkeysyms.h> -#include <pbd/error.h> -#include <pbd/file_utils.h> +#include "pbd/error.h" +#include "pbd/file_utils.h" -#include <ardour/filesystem_paths.h> +#include "ardour/filesystem_paths.h" #include "keyboard.h" #include "gui_thread.h" diff --git a/gtk2_ardour/keyboard.h b/gtk2_ardour/keyboard.h index 5fb696e6a5..a10fdbd6ba 100644 --- a/gtk2_ardour/keyboard.h +++ b/gtk2_ardour/keyboard.h @@ -28,8 +28,8 @@ #include <gtk/gtk.h> #include <gtkmm/accelkey.h> -#include <ardour/types.h> -#include <pbd/stateful.h> +#include "ardour/types.h" +#include "pbd/stateful.h" #include "selection.h" diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc index e44d92943f..742fc7fb69 100644 --- a/gtk2_ardour/keyeditor.cc +++ b/gtk2_ardour/keyeditor.cc @@ -1,6 +1,6 @@ #include <map> -#include <ardour/profile.h> +#include "ardour/profile.h" #include <gtkmm/stock.h> #include <gtkmm/label.h> @@ -8,10 +8,10 @@ #include <gtkmm/accelmap.h> #include <gtkmm/uimanager.h> -#include <pbd/strsplit.h> -#include <pbd/replace_all.h> +#include "pbd/strsplit.h" +#include "pbd/replace_all.h" -#include <ardour/profile.h> +#include "ardour/profile.h" #include "actions.h" #include "keyboard.h" diff --git a/gtk2_ardour/latency_gui.cc b/gtk2_ardour/latency_gui.cc index e7c42fd780..5ca139cd40 100644 --- a/gtk2_ardour/latency_gui.cc +++ b/gtk2_ardour/latency_gui.cc @@ -1,7 +1,7 @@ #define __STDC_FORMAT_MACROS 1 #include <inttypes.h> -#include <ardour/latent.h> +#include "ardour/latent.h" #include <gtkmm2ext/utils.h> #include "latency_gui.h" diff --git a/gtk2_ardour/latency_gui.h b/gtk2_ardour/latency_gui.h index f352f698d7..2e350762ec 100644 --- a/gtk2_ardour/latency_gui.h +++ b/gtk2_ardour/latency_gui.h @@ -10,9 +10,9 @@ #include <gtkmm/adjustment.h> #include <gtkmm2ext/barcontroller.h> -#include <pbd/controllable.h> +#include "pbd/controllable.h" -#include <ardour/types.h> +#include "ardour/types.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index f7b44d1b08..96ad6879ca 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -19,20 +19,20 @@ #include <limits.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/meter.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/meter.h" #include <gtkmm2ext/utils.h> #include <gtkmm2ext/fastmeter.h> #include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/barcontroller.h> -#include <midi++/manager.h> -#include <pbd/fastlog.h> +#include "midi++/manager.h" +#include "pbd/fastlog.h" #include "ardour_ui.h" #include "level_meter.h" @@ -42,8 +42,8 @@ #include "keyboard.h" #include "public_editor.h" -#include <ardour/session.h> -#include <ardour/route.h> +#include "ardour/session.h" +#include "ardour/route.h" #include "i18n.h" diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h index 0273a075c8..ee2f03e3df 100644 --- a/gtk2_ardour/level_meter.h +++ b/gtk2_ardour/level_meter.h @@ -30,7 +30,7 @@ #include <gtkmm/table.h> #include <gtkmm/drawingarea.h> -#include <ardour/types.h> +#include "ardour/types.h" #include <gtkmm2ext/click_box.h> #include <gtkmm2ext/focus_entry.h> diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index b3d2900673..64c551f0d1 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -24,10 +24,10 @@ #include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/window_title.h> -#include <ardour/utils.h> -#include <ardour/configuration.h> -#include <ardour/session.h> -#include <pbd/memento_command.h> +#include "ardour/utils.h" +#include "ardour/configuration.h" +#include "ardour/session.h" +#include "pbd/memento_command.h" #include "ardour_ui.h" #include "prompter.h" diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h index 3c32f02025..dabd945f95 100644 --- a/gtk2_ardour/location_ui.h +++ b/gtk2_ardour/location_ui.h @@ -27,8 +27,8 @@ #include <gtkmm/entry.h> #include <gtkmm/label.h> -#include <ardour/location.h> -#include <ardour/session.h> +#include "ardour/location.h" +#include "ardour/session.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc index 02af81cbf0..d02e83d466 100644 --- a/gtk2_ardour/lv2_plugin_ui.cc +++ b/gtk2_ardour/lv2_plugin_ui.cc @@ -18,8 +18,8 @@ */ -#include <ardour/processor.h> -#include <ardour/lv2_plugin.h> +#include "ardour/processor.h" +#include "ardour/lv2_plugin.h" #include "ardour_ui.h" #include "lv2_plugin_ui.h" diff --git a/gtk2_ardour/lv2_plugin_ui.h b/gtk2_ardour/lv2_plugin_ui.h index fe8dd85cd2..24a6819b37 100644 --- a/gtk2_ardour/lv2_plugin_ui.h +++ b/gtk2_ardour/lv2_plugin_ui.h @@ -29,7 +29,7 @@ #include <gtkmm/widget.h> #include <ardour_dialog.h> -#include <ardour/types.h> +#include "ardour/types.h" #include "plugin_ui.h" #ifdef HAVE_LV2 diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index c7724cff63..6861b178d1 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -23,20 +23,20 @@ #include <sigc++/bind.h> #include <gtkmm/settings.h> -#include <pbd/error.h> -#include <pbd/file_utils.h> -#include <pbd/textreceiver.h> -#include <pbd/failed_constructor.h> -#include <pbd/pthread_utils.h> +#include "pbd/error.h" +#include "pbd/file_utils.h" +#include "pbd/textreceiver.h" +#include "pbd/failed_constructor.h" +#include "pbd/pthread_utils.h" #include <jack/jack.h> -#include <ardour/svn_revision.h> -#include <ardour/version.h> -#include <ardour/ardour.h> -#include <ardour/audioengine.h> -#include <ardour/session_utils.h> -#include <ardour/filesystem_paths.h> +#include "ardour/svn_revision.h" +#include "ardour/version.h" +#include "ardour/ardour.h" +#include "ardour/audioengine.h" +#include "ardour/session_utils.h" +#include "ardour/filesystem_paths.h" #include <gtkmm/main.h> #include <gtkmm2ext/popup.h> diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index e3330c41fb..7e0a846ec9 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -18,7 +18,7 @@ */ #include <sigc++/bind.h> -#include <ardour/tempo.h> +#include "ardour/tempo.h" #include "marker.h" #include "public_editor.h" diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index 1a53726ede..8a82a90271 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -22,8 +22,8 @@ #include <string> #include <glib.h> -#include <ardour/ardour.h> -#include <pbd/destructible.h> +#include "ardour/ardour.h" +#include "pbd/destructible.h" #include "canvas.h" diff --git a/gtk2_ardour/marker_time_axis.cc b/gtk2_ardour/marker_time_axis.cc index df041f8f76..f7867e49b0 100644 --- a/gtk2_ardour/marker_time_axis.cc +++ b/gtk2_ardour/marker_time_axis.cc @@ -19,14 +19,14 @@ #include <string> -#include <pbd/error.h> +#include "pbd/error.h" #include <gtkmm/menu.h> #include <gtkmm2ext/utils.h> -#include <ardour/session.h> -#include <ardour/utils.h> +#include "ardour/session.h" +#include "ardour/utils.h" #include "ardour_ui.h" #include "public_editor.h" diff --git a/gtk2_ardour/marker_time_axis_view.h b/gtk2_ardour/marker_time_axis_view.h index fd23c1de87..ae7cddfd59 100644 --- a/gtk2_ardour/marker_time_axis_view.h +++ b/gtk2_ardour/marker_time_axis_view.h @@ -24,7 +24,7 @@ #include <gdkmm/color.h> #include <libgnomecanvasmm/group.h> -#include <ardour/location.h> +#include "ardour/location.h" #include "simplerect.h" #include "canvas.h" diff --git a/gtk2_ardour/midi_channel_selector.h b/gtk2_ardour/midi_channel_selector.h index 7485f96257..a2b6247c75 100644 --- a/gtk2_ardour/midi_channel_selector.h +++ b/gtk2_ardour/midi_channel_selector.h @@ -27,7 +27,7 @@ #include "gtkmm/button.h" #include "gtkmm/togglebutton.h" #include "gtkmm/label.h" -#include <ardour/types.h> +#include "ardour/types.h" class MidiChannelSelector : public Gtk::Table diff --git a/gtk2_ardour/midi_port_dialog.cc b/gtk2_ardour/midi_port_dialog.cc index 5fa11ce987..6e692c6eac 100644 --- a/gtk2_ardour/midi_port_dialog.cc +++ b/gtk2_ardour/midi_port_dialog.cc @@ -2,7 +2,7 @@ #include <sigc++/bind.h> #include <gtkmm/stock.h> -#include <pbd/convert.h> +#include "pbd/convert.h" #include <gtkmm2ext/utils.h> #include "midi_port_dialog.h" diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index aca13c8c44..2ea8316b37 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -28,16 +28,16 @@ #include <sigc++/signal.h> -#include <ardour/playlist.h> -#include <ardour/tempo.h> -#include <ardour/midi_region.h> -#include <ardour/midi_source.h> -#include <ardour/midi_diskstream.h> -#include <ardour/midi_model.h> -#include <ardour/midi_patch_manager.h> - -#include <evoral/Parameter.hpp> -#include <evoral/Control.hpp> +#include "ardour/playlist.h" +#include "ardour/tempo.h" +#include "ardour/midi_region.h" +#include "ardour/midi_source.h" +#include "ardour/midi_diskstream.h" +#include "ardour/midi_model.h" +#include "ardour/midi_patch_manager.h" + +#include "evoral/Parameter.hpp" +#include "evoral/Control.hpp" #include "streamview.h" #include "midi_region_view.h" diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index 7ee07de02f..adb4a1e316 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -24,11 +24,11 @@ #include <libgnomecanvasmm.h> #include <libgnomecanvasmm/polygon.h> -#include <ardour/midi_track.h> -#include <ardour/midi_region.h> -#include <ardour/midi_model.h> -#include <ardour/diskstream.h> -#include <ardour/types.h> +#include "ardour/midi_track.h" +#include "ardour/midi_region.h" +#include "ardour/midi_model.h" +#include "ardour/diskstream.h" +#include "ardour/types.h" #include "region_view.h" #include "midi_time_axis.h" diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index ed364e7156..047020ea62 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -24,13 +24,13 @@ #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/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_ui.h" #include "canvas-simplerect.h" diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h index 2f8e63ab9d..2780cfa3da 100644 --- a/gtk2_ardour/midi_streamview.h +++ b/gtk2_ardour/midi_streamview.h @@ -22,7 +22,7 @@ #include <list> #include <cmath> -#include <ardour/location.h> +#include "ardour/location.h" #include "enums.h" #include "streamview.h" #include "time_axis_view_item.h" diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 3df63d11f7..18786fe54a 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -25,10 +25,10 @@ #include <sigc++/bind.h> -#include <pbd/error.h> -#include <pbd/stl_delete.h> -#include <pbd/whitespace.h> -#include <pbd/enumwriter.h> +#include "pbd/error.h" +#include "pbd/stl_delete.h" +#include "pbd/whitespace.h" +#include "pbd/enumwriter.h" #include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/selector.h> @@ -36,16 +36,16 @@ #include <gtkmm2ext/bindable_button.h> #include <gtkmm2ext/utils.h> -#include <ardour/midi_playlist.h> -#include <ardour/midi_diskstream.h> -#include <ardour/midi_patch_manager.h> -#include <ardour/processor.h> -#include <ardour/ladspa_plugin.h> -#include <ardour/location.h> -#include <ardour/playlist.h> -#include <ardour/session.h> -#include <ardour/session_playlist.h> -#include <ardour/utils.h> +#include "ardour/midi_playlist.h" +#include "ardour/midi_diskstream.h" +#include "ardour/midi_patch_manager.h" +#include "ardour/processor.h" +#include "ardour/ladspa_plugin.h" +#include "ardour/location.h" +#include "ardour/playlist.h" +#include "ardour/session.h" +#include "ardour/session_playlist.h" +#include "ardour/utils.h" #include "ardour_ui.h" #include "midi_time_axis.h" @@ -74,7 +74,7 @@ #include "ghostregion.h" #include "canvas-note-event.h" -#include <ardour/midi_track.h> +#include "ardour/midi_track.h" #include "i18n.h" diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h index f535fd6322..228e05176b 100644 --- a/gtk2_ardour/midi_time_axis.h +++ b/gtk2_ardour/midi_time_axis.h @@ -30,8 +30,8 @@ #include <gtkmm2ext/selector.h> #include <list> -#include <ardour/types.h> -#include <ardour/region.h> +#include "ardour/types.h" +#include "ardour/region.h" #include "ardour_dialog.h" #include "route_ui.h" diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 39e23a99a4..d9770e4776 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -21,9 +21,9 @@ #include <sigc++/bind.h> -#include <pbd/convert.h> -#include <pbd/enumwriter.h> -#include <pbd/replace_all.h> +#include "pbd/convert.h" +#include "pbd/enumwriter.h" +#include "pbd/replace_all.h" #include <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/utils.h> @@ -33,19 +33,19 @@ #include <gtkmm2ext/slider_controller.h> #include <gtkmm2ext/bindable_button.h> -#include <ardour/ardour.h> -#include <ardour/session.h> -#include <ardour/audioengine.h> -#include <ardour/route.h> -#include <ardour/route_group.h> -#include <ardour/audio_track.h> -#include <ardour/audio_diskstream.h> -#include <ardour/panner.h> -#include <ardour/send.h> -#include <ardour/processor.h> -#include <ardour/profile.h> -#include <ardour/ladspa_plugin.h> -#include <ardour/user_bundle.h> +#include "ardour/ardour.h" +#include "ardour/session.h" +#include "ardour/audioengine.h" +#include "ardour/route.h" +#include "ardour/route_group.h" +#include "ardour/audio_track.h" +#include "ardour/audio_diskstream.h" +#include "ardour/panner.h" +#include "ardour/send.h" +#include "ardour/processor.h" +#include "ardour/profile.h" +#include "ardour/ladspa_plugin.h" +#include "ardour/user_bundle.h" #include "ardour_ui.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index f2191bb418..4793e2de72 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -38,13 +38,13 @@ #include <gtkmm2ext/click_box.h> #include <gtkmm2ext/slider_controller.h> -#include <pbd/stateful.h> +#include "pbd/stateful.h" -#include <ardour/types.h> -#include <ardour/ardour.h> -#include <ardour/processor.h> +#include "ardour/types.h" +#include "ardour/ardour.h" +#include "ardour/processor.h" -#include <pbd/fastlog.h> +#include "pbd/fastlog.h" #include "route_ui.h" #include "gain_meter.h" diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 8da14e2f46..9c9e76d5df 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -22,7 +22,7 @@ #include <gtkmm/accelmap.h> -#include <pbd/convert.h> +#include "pbd/convert.h" #include <glibmm/thread.h> #include <gtkmm2ext/gtk_ui.h> @@ -30,12 +30,12 @@ #include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/window_title.h> -#include <ardour/audio_diskstream.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 "ardour/audio_diskstream.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/mixer_ui.h b/gtk2_ardour/mixer_ui.h index 2dbddc9dd0..b445cc99db 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -32,9 +32,9 @@ #include <gtkmm/menu.h> #include <gtkmm/treeview.h> -#include <pbd/stateful.h> +#include "pbd/stateful.h" -#include <ardour/ardour.h> +#include "ardour/ardour.h" #include "route_processor_selection.h" #include "enums.h" diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc index d239d850c7..4dab7e69b7 100644 --- a/gtk2_ardour/nag.cc +++ b/gtk2_ardour/nag.cc @@ -1,8 +1,8 @@ #include <fstream> #include <gtkmm/stock.h> -#include <ardour/ardour.h> -#include <ardour/filesystem_paths.h> +#include "ardour/ardour.h" +#include "ardour/filesystem_paths.h" #include "nag.h" #include "i18n.h" diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc index c28277b8ab..7e5345290c 100644 --- a/gtk2_ardour/new_session_dialog.cc +++ b/gtk2_ardour/new_session_dialog.cc @@ -17,13 +17,13 @@ */ -#include <pbd/error.h> +#include "pbd/error.h" -#include <ardour/recent_sessions.h> -#include <ardour/session_state_utils.h> -#include <ardour/template_utils.h> -#include <ardour/session.h> -#include <ardour/profile.h> +#include "ardour/recent_sessions.h" +#include "ardour/session_state_utils.h" +#include "ardour/template_utils.h" +#include "ardour/session.h" +#include "ardour/profile.h" #include <gtkmm/entry.h> #include <gtkmm/filechooserbutton.h> diff --git a/gtk2_ardour/new_session_dialog.h b/gtk2_ardour/new_session_dialog.h index 04e30e0a94..465faa797e 100644 --- a/gtk2_ardour/new_session_dialog.h +++ b/gtk2_ardour/new_session_dialog.h @@ -33,7 +33,7 @@ #include <gtkmm/frame.h> #include <gtkmm/expander.h> -#include <ardour/utils.h> +#include "ardour/utils.h" #include <glibmm/refptr.h> diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index 935197a0ca..960f8065bc 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -19,18 +19,18 @@ #include <pango/pangoft2.h> // for fontmap resolution control for GnomeCanvas #include <pango/pangocairo.h> // for fontmap resolution control for GnomeCanvas -#include <pbd/whitespace.h> - -#include <ardour/ardour.h> -#include <ardour/session.h> -#include <ardour/audioengine.h> -#include <ardour/configuration.h> -#include <ardour/auditioner.h> -#include <ardour/sndfilesource.h> -#include <ardour/crossfade.h> -#include <ardour/profile.h> -#include <midi++/manager.h> -#include <midi++/factory.h> +#include "pbd/whitespace.h" + +#include "ardour/ardour.h" +#include "ardour/session.h" +#include "ardour/audioengine.h" +#include "ardour/configuration.h" +#include "ardour/auditioner.h" +#include "ardour/sndfilesource.h" +#include "ardour/crossfade.h" +#include "ardour/profile.h" +#include "midi++/manager.h" +#include "midi++/factory.h" #include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/utils.h> #include <gtkmm2ext/window_title.h> diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h index 1aff7f2bcf..a6b1a74e5c 100644 --- a/gtk2_ardour/option_editor.h +++ b/gtk2_ardour/option_editor.h @@ -34,7 +34,7 @@ #include <gtkmm/radiobutton.h> #include <gtkmm/comboboxtext.h> -#include <ardour/session.h> +#include "ardour/session.h" #include "ardour_dialog.h" #include "editing.h" diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc index aebf7cdd21..4437a9d224 100644 --- a/gtk2_ardour/opts.cc +++ b/gtk2_ardour/opts.cc @@ -21,7 +21,7 @@ #include <iostream> #include <cstdlib> -#include <ardour/session.h> +#include "ardour/session.h" #include "opts.h" diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc index 97f7fcd123..7a081101f6 100644 --- a/gtk2_ardour/panner2d.cc +++ b/gtk2_ardour/panner2d.cc @@ -24,8 +24,8 @@ #include <cairo.h> #include <gtkmm/menu.h> -#include <pbd/error.h> -#include <ardour/panner.h> +#include "pbd/error.h" +#include "ardour/panner.h" #include <gtkmm2ext/gtk_ui.h> #include "panner2d.h" diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc index 728dfcbcfe..636035abd3 100644 --- a/gtk2_ardour/panner_ui.cc +++ b/gtk2_ardour/panner_ui.cc @@ -18,13 +18,13 @@ #include <limits.h> -#include <ardour/io.h> -#include <ardour/dB.h> +#include "ardour/io.h" +#include "ardour/dB.h" #include <gtkmm2ext/utils.h> #include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/barcontroller.h> -#include <midi++/manager.h> -#include <pbd/fastlog.h> +#include "midi++/manager.h" +#include "pbd/fastlog.h" #include "ardour_ui.h" #include "panner_ui.h" @@ -33,9 +33,9 @@ #include "panner.h" #include "gui_thread.h" -#include <ardour/session.h> -#include <ardour/panner.h> -#include <ardour/route.h> +#include "ardour/session.h" +#include "ardour/panner.h" +#include "ardour/route.h" #include "i18n.h" diff --git a/gtk2_ardour/piano_roll_header.cc b/gtk2_ardour/piano_roll_header.cc index 9d0f1e504a..e946aa3dfb 100644 --- a/gtk2_ardour/piano_roll_header.cc +++ b/gtk2_ardour/piano_roll_header.cc @@ -17,8 +17,8 @@ */ #include <iostream> -#include <evoral/midi_events.h> -#include <ardour/midi_track.h> +#include "evoral/midi_events.h" +#include "ardour/midi_track.h" #include "piano_roll_header.h" #include "midi_time_axis.h" diff --git a/gtk2_ardour/piano_roll_header.h b/gtk2_ardour/piano_roll_header.h index 986a7fafc9..f005538d4a 100644 --- a/gtk2_ardour/piano_roll_header.h +++ b/gtk2_ardour/piano_roll_header.h @@ -19,7 +19,7 @@ #ifndef __ardour_piano_roll_header_h__ #define __ardour_piano_roll_header_h__ -#include <ardour/types.h> +#include "ardour/types.h" #include <gtkmm/drawingarea.h> diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc index 0ca9432fcb..dd62240e44 100644 --- a/gtk2_ardour/playlist_selector.cc +++ b/gtk2_ardour/playlist_selector.cc @@ -20,12 +20,12 @@ #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/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 <gtkmm2ext/gtk_ui.h> #include <gtkmm2ext/window_title.h> diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc index a7e6b4261c..2b43927278 100644 --- a/gtk2_ardour/plugin_eq_gui.cc +++ b/gtk2_ardour/plugin_eq_gui.cc @@ -23,8 +23,8 @@ #include "ardour_ui.h" #include "gui_thread.h" -#include <ardour/audio_buffer.h> -#include <ardour/data_type.h> +#include "ardour/audio_buffer.h" +#include "ardour/data_type.h" #include <gtkmm/box.h> #include <gtkmm/button.h> diff --git a/gtk2_ardour/plugin_eq_gui.h b/gtk2_ardour/plugin_eq_gui.h index cd52ed7682..05e09e3214 100644 --- a/gtk2_ardour/plugin_eq_gui.h +++ b/gtk2_ardour/plugin_eq_gui.h @@ -21,9 +21,9 @@ #ifndef __ardour_plugin_eq_gui_h #define __ardour_plugin_eq_gui_h -#include <ardour/buffer_set.h> -#include <ardour/plugin_insert.h> -#include <ardour/plugin.h> +#include "ardour/buffer_set.h" +#include "ardour/plugin_insert.h" +#include "ardour/plugin.h" #include <gtkmm/table.h> #include <gtkmm/drawingarea.h> diff --git a/gtk2_ardour/plugin_interest.h b/gtk2_ardour/plugin_interest.h index 1b7d3c0959..9f6b293325 100644 --- a/gtk2_ardour/plugin_interest.h +++ b/gtk2_ardour/plugin_interest.h @@ -21,7 +21,7 @@ #define __gtkardour_plugin_interest_h__ #include <vector> -#include <ardour/plugin.h> +#include "ardour/plugin.h" typedef std::vector<ARDOUR::PluginPtr> SelectedPlugins; diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc index b49d6a0b77..ac9e785522 100644 --- a/gtk2_ardour/plugin_selector.cc +++ b/gtk2_ardour/plugin_selector.cc @@ -30,11 +30,11 @@ #include <gtkmm2ext/utils.h> -#include <pbd/convert.h> +#include "pbd/convert.h" -#include <ardour/plugin_manager.h> -#include <ardour/plugin.h> -#include <ardour/configuration.h> +#include "ardour/plugin_manager.h" +#include "ardour/plugin.h" +#include "ardour/configuration.h" #include "ardour_ui.h" #include "plugin_selector.h" diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h index e5224b4fa7..bd9bd12008 100644 --- a/gtk2_ardour/plugin_selector.h +++ b/gtk2_ardour/plugin_selector.h @@ -25,7 +25,7 @@ #include <gtkmm/treeview.h> #include <gtkmm2ext/selector.h> -#include <ardour/plugin.h> +#include "ardour/plugin.h" #include "plugin_interest.h" namespace ARDOUR { diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index eae0d91388..4c7ae5b8a0 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -22,9 +22,9 @@ #include <cmath> #include <string> -#include <pbd/stl_delete.h> -#include <pbd/xml++.h> -#include <pbd/failed_constructor.h> +#include "pbd/stl_delete.h" +#include "pbd/xml++.h" +#include "pbd/failed_constructor.h" #include <gtkmm/widget.h> #include <gtkmm/box.h> @@ -35,16 +35,16 @@ #include <gtkmm2ext/doi.h> #include <gtkmm2ext/slider_controller.h> -#include <midi++/manager.h> +#include "midi++/manager.h" -#include <ardour/plugin.h> -#include <ardour/plugin_insert.h> -#include <ardour/ladspa_plugin.h> +#include "ardour/plugin.h" +#include "ardour/plugin_insert.h" +#include "ardour/ladspa_plugin.h" #ifdef VST_SUPPORT -#include <ardour/vst_plugin.h> +#include "ardour/vst_plugin.h" #endif #ifdef HAVE_LV2 -#include <ardour/lv2_plugin.h> +#include "ardour/lv2_plugin.h" #include "lv2_plugin_ui.h" #endif diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h index b5202a9327..fb365409d7 100644 --- a/gtk2_ardour/plugin_ui.h +++ b/gtk2_ardour/plugin_ui.h @@ -41,7 +41,7 @@ #include <gtkmm/comboboxtext.h> #include <gtkmm/socket.h> -#include <ardour/types.h> +#include "ardour/types.h" #include "ardour_dialog.h" #include "latency_gui.h" diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h index c2daae341a..02dd965e1d 100644 --- a/gtk2_ardour/port_group.h +++ b/gtk2_ardour/port_group.h @@ -25,8 +25,8 @@ #include <gtkmm/widget.h> #include <gtkmm/checkbutton.h> #include <boost/shared_ptr.hpp> -#include <ardour/data_type.h> -#include <ardour/types.h> +#include "ardour/data_type.h" +#include "ardour/types.h" namespace ARDOUR { class Session; diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index ce7d0f5567..7ac5c4a598 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -23,7 +23,7 @@ #include <sigc++/bind.h> -#include <pbd/convert.h> +#include "pbd/convert.h" #include <glibmm/miscutils.h> @@ -37,17 +37,17 @@ #include <gtkmm2ext/doi.h> #include <gtkmm2ext/window_title.h> -#include <ardour/ardour.h> -#include <ardour/session.h> -#include <ardour/audioengine.h> -#include <ardour/route.h> -#include <ardour/audio_track.h> -#include <ardour/audio_diskstream.h> -#include <ardour/send.h> -#include <ardour/plugin_insert.h> -#include <ardour/port_insert.h> -#include <ardour/ladspa_plugin.h> -#include <ardour/profile.h> +#include "ardour/ardour.h" +#include "ardour/session.h" +#include "ardour/audioengine.h" +#include "ardour/route.h" +#include "ardour/audio_track.h" +#include "ardour/audio_diskstream.h" +#include "ardour/send.h" +#include "ardour/plugin_insert.h" +#include "ardour/port_insert.h" +#include "ardour/ladspa_plugin.h" +#include "ardour/profile.h" #include "ardour_ui.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index 76c6426686..c04498a599 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -32,15 +32,15 @@ #include <gtkmm2ext/click_box.h> #include <gtkmm2ext/dndtreeview.h> -#include <pbd/stateful.h> +#include "pbd/stateful.h" -#include <ardour/types.h> -#include <ardour/ardour.h> -#include <ardour/plugin_insert.h> -#include <ardour/port_insert.h> -#include <ardour/processor.h> +#include "ardour/types.h" +#include "ardour/ardour.h" +#include "ardour/plugin_insert.h" +#include "ardour/port_insert.h" +#include "ardour/processor.h" -#include <pbd/fastlog.h> +#include "pbd/fastlog.h" #include "plugin_interest.h" #include "route_ui.h" diff --git a/gtk2_ardour/processor_selection.h b/gtk2_ardour/processor_selection.h index 59354c05ac..a7d10894e9 100644 --- a/gtk2_ardour/processor_selection.h +++ b/gtk2_ardour/processor_selection.h @@ -20,7 +20,7 @@ #ifndef __ardour_gtk_processor_selection_h__ #define __ardour_gtk_processor_selection_h__ -#include <pbd/xml++.h> +#include "pbd/xml++.h" class ProcessorSelection { public: diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 97fbdd47b8..ef087fa2cc 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -30,7 +30,7 @@ #include <jack/types.h> #include <sigc++/signal.h> -#include <pbd/statefuldestructible.h> +#include "pbd/statefuldestructible.h" #include "editing.h" #include "canvas.h" diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc index 86ebe7a465..48bc7e7f4b 100644 --- a/gtk2_ardour/region_gain_line.cc +++ b/gtk2_ardour/region_gain_line.cc @@ -17,9 +17,9 @@ */ -#include <evoral/Curve.hpp> -#include <ardour/audioregion.h> -#include <pbd/memento_command.h> +#include "evoral/Curve.hpp" +#include "ardour/audioregion.h" +#include "pbd/memento_command.h" #include "region_gain_line.h" #include "audio_region_view.h" @@ -28,7 +28,7 @@ #include "time_axis_view.h" #include "editor.h" -#include <ardour/session.h> +#include "ardour/session.h" #include "i18n.h" diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h index af23fa37f3..6f446cabfc 100644 --- a/gtk2_ardour/region_gain_line.h +++ b/gtk2_ardour/region_gain_line.h @@ -20,7 +20,7 @@ #ifndef __ardour_gtk_region_gain_line_h__ #define __ardour_gtk_region_gain_line_h__ -#include <ardour/ardour.h> +#include "ardour/ardour.h" #include <libgnomecanvasmm.h> #include "automation_line.h" diff --git a/gtk2_ardour/region_selection.cc b/gtk2_ardour/region_selection.cc index d1970138c5..76dfe33107 100644 --- a/gtk2_ardour/region_selection.cc +++ b/gtk2_ardour/region_selection.cc @@ -18,7 +18,7 @@ #include <algorithm> -#include <ardour/region.h> +#include "ardour/region.h" #include "region_view.h" #include "region_selection.h" diff --git a/gtk2_ardour/region_selection.h b/gtk2_ardour/region_selection.h index 084345a76d..98d2a4eaab 100644 --- a/gtk2_ardour/region_selection.h +++ b/gtk2_ardour/region_selection.h @@ -22,7 +22,7 @@ #include <set> #include <list> #include <sigc++/signal.h> -#include <ardour/types.h> +#include "ardour/types.h" using std::list; using std::set; diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 1819df0401..d307eeaa95 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -24,12 +24,12 @@ #include <gtkmm.h> #include <gtkmm2ext/gtk_ui.h> -#include <pbd/stacktrace.h> +#include "pbd/stacktrace.h" -#include <ardour/playlist.h> -#include <ardour/audioregion.h> -#include <ardour/audiosource.h> -#include <ardour/audio_diskstream.h> +#include "ardour/playlist.h" +#include "ardour/audioregion.h" +#include "ardour/audiosource.h" +#include "ardour/audio_diskstream.h" #include "ardour_ui.h" #include "streamview.h" diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h index 0db41c24f9..fea5cd9588 100644 --- a/gtk2_ardour/region_view.h +++ b/gtk2_ardour/region_view.h @@ -24,8 +24,8 @@ #include <libgnomecanvasmm.h> #include <libgnomecanvasmm/polygon.h> #include <sigc++/signal.h> -#include <ardour/region.h> -#include <ardour/beats_frames_converter.h> +#include "ardour/region.h" +#include "ardour/beats_frames_converter.h" #include "time_axis_view_item.h" #include "automation_line.h" diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc index 2f070f4ccd..ecad24e181 100644 --- a/gtk2_ardour/rhythm_ferret.cc +++ b/gtk2_ardour/rhythm_ferret.cc @@ -1,15 +1,15 @@ #include <gtkmm/stock.h> #include <gtkmm2ext/utils.h> -#include <pbd/memento_command.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/session.h> +#include "pbd/memento_command.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/session.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 30a939022e..37639a9985 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -26,18 +26,18 @@ #include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/window_title.h> -#include <ardour/session.h> -#include <ardour/session_route.h> -#include <ardour/audio_diskstream.h> -#include <ardour/plugin.h> -#include <ardour/plugin_manager.h> -#include <ardour/ardour.h> -#include <ardour/session.h> -#include <ardour/route.h> -#include <ardour/audio_track.h> -#include <ardour/send.h> -#include <ardour/plugin_insert.h> -#include <ardour/port_insert.h> +#include "ardour/session.h" +#include "ardour/session_route.h" +#include "ardour/audio_diskstream.h" +#include "ardour/plugin.h" +#include "ardour/plugin_manager.h" +#include "ardour/ardour.h" +#include "ardour/session.h" +#include "ardour/route.h" +#include "ardour/audio_track.h" +#include "ardour/send.h" +#include "ardour/plugin_insert.h" +#include "ardour/port_insert.h" #include "route_params_ui.h" #include "keyboard.h" diff --git a/gtk2_ardour/route_params_ui.h b/gtk2_ardour/route_params_ui.h index 484c4f28a8..0f9fe6423f 100644 --- a/gtk2_ardour/route_params_ui.h +++ b/gtk2_ardour/route_params_ui.h @@ -32,9 +32,9 @@ #include <gtkmm/togglebutton.h> #include <gtkmm/treeview.h> -#include <pbd/stateful.h> +#include "pbd/stateful.h" -#include <ardour/ardour.h> +#include "ardour/ardour.h" #include "io_selector.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc index 552de1b412..0b02a2837a 100644 --- a/gtk2_ardour/route_processor_selection.cc +++ b/gtk2_ardour/route_processor_selection.cc @@ -19,11 +19,11 @@ #include <algorithm> #include <sigc++/bind.h> -#include <pbd/error.h> +#include "pbd/error.h" -#include <ardour/playlist.h> -#include <ardour/processor.h> -#include <ardour/route.h> +#include "ardour/playlist.h" +#include "ardour/processor.h" +#include "ardour/route.h" #include "route_processor_selection.h" diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 7895a25a8c..f3f27d5183 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -27,10 +27,10 @@ #include <sigc++/bind.h> -#include <pbd/error.h> -#include <pbd/stl_delete.h> -#include <pbd/whitespace.h> -#include <pbd/memento_command.h> +#include "pbd/error.h" +#include "pbd/stl_delete.h" +#include "pbd/whitespace.h" +#include "pbd/memento_command.h" #include <gtkmm/menu.h> #include <gtkmm/menuitem.h> @@ -40,21 +40,21 @@ #include <gtkmm2ext/bindable_button.h> #include <gtkmm2ext/utils.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/route_group.h> -#include <ardour/session.h> -#include <ardour/session_playlist.h> -#include <ardour/utils.h> -#include <evoral/Parameter.hpp> +#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/route_group.h" +#include "ardour/session.h" +#include "ardour/session_playlist.h" +#include "ardour/utils.h" +#include "evoral/Parameter.hpp" #include "ardour_ui.h" #include "route_time_axis.h" @@ -75,7 +75,7 @@ #include "streamview.h" #include "utils.h" -#include <ardour/track.h> +#include "ardour/track.h" #include "i18n.h" diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h index da1ee711d6..cf1e86c0b4 100644 --- a/gtk2_ardour/route_time_axis.h +++ b/gtk2_ardour/route_time_axis.h @@ -35,8 +35,8 @@ #include <gtkmm2ext/selector.h> #include <gtkmm2ext/slider_controller.h> -#include <ardour/playlist.h> -#include <ardour/types.h> +#include "ardour/playlist.h" +#include "ardour/types.h" #include "ardour_dialog.h" #include "route_ui.h" diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index cefe2ac517..facabd9779 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -25,11 +25,11 @@ #include <gtkmm2ext/barcontroller.h> #include <gtkmm2ext/gtk_ui.h> -#include <ardour/route_group.h> -#include <pbd/memento_command.h> -#include <pbd/stacktrace.h> -#include <pbd/shiva.h> -#include <pbd/controllable.h> +#include "ardour/route_group.h" +#include "pbd/memento_command.h" +#include "pbd/stacktrace.h" +#include "pbd/shiva.h" +#include "pbd/controllable.h" #include "route_ui.h" #include "keyboard.h" @@ -40,14 +40,14 @@ #include "latency_gui.h" #include "automation_time_axis.h" -#include <ardour/route.h> -#include <ardour/session.h> -#include <ardour/audioengine.h> -#include <ardour/audio_track.h> -#include <ardour/audio_diskstream.h> -#include <ardour/midi_track.h> -#include <ardour/midi_diskstream.h> -#include <ardour/profile.h> +#include "ardour/route.h" +#include "ardour/session.h" +#include "ardour/audioengine.h" +#include "ardour/audio_track.h" +#include "ardour/audio_diskstream.h" +#include "ardour/midi_track.h" +#include "ardour/midi_diskstream.h" +#include "ardour/profile.h" #include "i18n.h" using namespace sigc; diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index c784b97668..4761acd61a 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -22,10 +22,10 @@ #include <list> -#include <pbd/xml++.h> -#include <ardour/ardour.h> -#include <ardour/route.h> -#include <ardour/track.h> +#include "pbd/xml++.h" +#include "ardour/ardour.h" +#include "ardour/route.h" +#include "ardour/track.h" #include "axis_view.h" diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 3f6c282d3a..da0047eefc 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -19,10 +19,10 @@ #include <algorithm> #include <sigc++/bind.h> -#include <pbd/error.h> -#include <pbd/stacktrace.h> +#include "pbd/error.h" +#include "pbd/stacktrace.h" -#include <ardour/playlist.h> +#include "ardour/playlist.h" #include "region_view.h" #include "selection.h" diff --git a/gtk2_ardour/selection_templates.h b/gtk2_ardour/selection_templates.h index 3ab8505b72..cc7933d879 100644 --- a/gtk2_ardour/selection_templates.h +++ b/gtk2_ardour/selection_templates.h @@ -25,7 +25,7 @@ avoid multiplying dependencies. */ -#include <ardour/region.h> +#include "ardour/region.h" #include "selection.h" #include "region_view.h" diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc index 3fb6e8af47..1014f5a07a 100644 --- a/gtk2_ardour/send_ui.cc +++ b/gtk2_ardour/send_ui.cc @@ -19,8 +19,8 @@ #include <gtkmm2ext/doi.h> -#include <ardour/io.h> -#include <ardour/send.h> +#include "ardour/io.h" +#include "ardour/send.h" #include "utils.h" #include "send_ui.h" diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc index 3776c3c04c..d6f2826abf 100644 --- a/gtk2_ardour/session_import_dialog.cc +++ b/gtk2_ardour/session_import_dialog.cc @@ -20,13 +20,13 @@ #include "session_import_dialog.h" -#include <pbd/failed_constructor.h> +#include "pbd/failed_constructor.h" -#include <ardour/audio_region_importer.h> -#include <ardour/audio_playlist_importer.h> -#include <ardour/audio_track_importer.h> -#include <ardour/location_importer.h> -#include <ardour/tempo_map_importer.h> +#include "ardour/audio_region_importer.h" +#include "ardour/audio_playlist_importer.h" +#include "ardour/audio_track_importer.h" +#include "ardour/location_importer.h" +#include "ardour/tempo_map_importer.h" #include <gtkmm2ext/utils.h> #include <gtkmm2ext/window_title.h> diff --git a/gtk2_ardour/session_import_dialog.h b/gtk2_ardour/session_import_dialog.h index 22cccd1262..e095dbaea0 100644 --- a/gtk2_ardour/session_import_dialog.h +++ b/gtk2_ardour/session_import_dialog.h @@ -28,9 +28,9 @@ #include <boost/shared_ptr.hpp> #include <gtkmm.h> -#include <pbd/xml++.h> -#include <ardour/element_importer.h> -#include <ardour/element_import_handler.h> +#include "pbd/xml++.h" +#include "ardour/element_importer.h" +#include "ardour/element_import_handler.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc index 35920038be..6038b8b5ae 100644 --- a/gtk2_ardour/session_metadata_dialog.cc +++ b/gtk2_ardour/session_metadata_dialog.cc @@ -25,10 +25,10 @@ #include <gtkmm2ext/window_title.h> #include "i18n.h" -#include <pbd/xml++.h> -#include <ardour/session.h> -#include <ardour/session_directory.h> -#include <ardour/session_utils.h> +#include "pbd/xml++.h" +#include "ardour/session.h" +#include "ardour/session_directory.h" +#include "ardour/session_utils.h" #define CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember)) diff --git a/gtk2_ardour/session_metadata_dialog.h b/gtk2_ardour/session_metadata_dialog.h index ffbb7a0930..e06dbe010c 100644 --- a/gtk2_ardour/session_metadata_dialog.h +++ b/gtk2_ardour/session_metadata_dialog.h @@ -28,7 +28,7 @@ #include <string> #include <list> -#include <ardour/session_metadata.h> +#include "ardour/session_metadata.h" using std::string; using Glib::ustring; diff --git a/gtk2_ardour/sfdb_freesound_mootcher.cc b/gtk2_ardour/sfdb_freesound_mootcher.cc index 7daecfc593..d84f34d7cb 100644 --- a/gtk2_ardour/sfdb_freesound_mootcher.cc +++ b/gtk2_ardour/sfdb_freesound_mootcher.cc @@ -39,12 +39,12 @@ *************************************************************************************/
#include "sfdb_freesound_mootcher.h"
-#include <pbd/xml++.h>
+#include "pbd/xml++.h"
#include <sys/stat.h>
#include <sys/types.h>
-#include <ardour/audio_library.h>
+#include "ardour/audio_library.h"
#define TRUE 1
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 0ee8935f1b..dcd041c44b 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -29,26 +29,26 @@ #include <gtkmm/stock.h> #include <glibmm/fileutils.h> -#include <pbd/convert.h> -#include <pbd/tokenizer.h> -#include <pbd/enumwriter.h> -#include <pbd/pthread_utils.h> -#include <pbd/xml++.h> +#include "pbd/convert.h" +#include "pbd/tokenizer.h" +#include "pbd/enumwriter.h" +#include "pbd/pthread_utils.h" +#include "pbd/xml++.h" #include <gtkmm2ext/utils.h> -#include <evoral/SMFReader.hpp> - -#include <ardour/audio_library.h> -#include <ardour/auditioner.h> -#include <ardour/audioregion.h> -#include <ardour/audiofilesource.h> -#include <ardour/smf_source.h> -#include <ardour/region_factory.h> -#include <ardour/source_factory.h> -#include <ardour/session.h> -#include <ardour/session_directory.h> -#include <ardour/profile.h> +#include "evoral/SMFReader.hpp" + +#include "ardour/audio_library.h" +#include "ardour/auditioner.h" +#include "ardour/audioregion.h" +#include "ardour/audiofilesource.h" +#include "ardour/smf_source.h" +#include "ardour/region_factory.h" +#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/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h index 24cb08cc1b..52676c2d4b 100644 --- a/gtk2_ardour/sfdb_ui.h +++ b/gtk2_ardour/sfdb_ui.h @@ -37,8 +37,8 @@ #include <gtkmm/frame.h> #include <gtkmm/label.h> -#include <ardour/session.h> -#include <ardour/audiofilesource.h> +#include "ardour/session.h" +#include "ardour/audiofilesource.h" #include "ardour_dialog.h" #include "editing.h" diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc index 8846c9f4e6..e81a987aa1 100644 --- a/gtk2_ardour/splash.cc +++ b/gtk2_ardour/splash.cc @@ -1,9 +1,9 @@ #include <string> -#include <pbd/failed_constructor.h> -#include <pbd/file_utils.h> -#include <ardour/ardour.h> -#include <ardour/filesystem_paths.h> +#include "pbd/failed_constructor.h" +#include "pbd/file_utils.h" +#include "ardour/ardour.h" +#include "ardour/filesystem_paths.h" #include "gui_thread.h" #include "splash.h" diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index c211804fc4..8d36427a0b 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -22,11 +22,11 @@ #include <gtkmm2ext/gtk_ui.h> -#include <ardour/playlist.h> -#include <ardour/region.h> -#include <ardour/source.h> -#include <ardour/diskstream.h> -#include <ardour/track.h> +#include "ardour/playlist.h" +#include "ardour/region.h" +#include "ardour/source.h" +#include "ardour/diskstream.h" +#include "ardour/track.h" #include "streamview.h" #include "region_view.h" diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h index fa5657f866..24a81f4847 100644 --- a/gtk2_ardour/streamview.h +++ b/gtk2_ardour/streamview.h @@ -22,7 +22,7 @@ #include <list> #include <cmath> -#include <ardour/location.h> +#include "ardour/location.h" #include "enums.h" #include "simplerect.h" #include "canvas.h" diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc index 21bc41800e..f036ea455c 100644 --- a/gtk2_ardour/tape_region_view.cc +++ b/gtk2_ardour/tape_region_view.cc @@ -24,10 +24,10 @@ #include <gtkmm2ext/gtk_ui.h> -#include <ardour/playlist.h> -#include <ardour/audioregion.h> -#include <ardour/audiosource.h> -#include <ardour/audio_diskstream.h> +#include "ardour/playlist.h" +#include "ardour/audioregion.h" +#include "ardour/audiosource.h" +#include "ardour/audio_diskstream.h" #include "tape_region_view.h" #include "audio_time_axis.h" diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h index cbb237abb8..3cdc29a347 100644 --- a/gtk2_ardour/tempo_dialog.h +++ b/gtk2_ardour/tempo_dialog.h @@ -30,8 +30,8 @@ #include <gtkmm/spinbutton.h> #include <gtkmm/comboboxtext.h> -#include <ardour/types.h> -#include <ardour/tempo.h> +#include "ardour/types.h" +#include "ardour/tempo.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/tempo_lines.h b/gtk2_ardour/tempo_lines.h index d5040bd90f..275db7c85e 100644 --- a/gtk2_ardour/tempo_lines.h +++ b/gtk2_ardour/tempo_lines.h @@ -22,7 +22,7 @@ #include <map> #include <boost/pool/pool.hpp> #include <boost/pool/pool_alloc.hpp> -#include <ardour/tempo.h> +#include "ardour/tempo.h" #include "canvas.h" #include "simpleline.h" diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index 0d13200513..8270c7bcb6 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -27,11 +27,11 @@ #include <gtkmm2ext/window_title.h> #include <gtkmm/settings.h> -#include <pbd/file_utils.h> +#include "pbd/file_utils.h" -#include <ardour/configuration.h> -#include <ardour/filesystem_paths.h> -#include <ardour/profile.h> +#include "ardour/configuration.h" +#include "ardour/filesystem_paths.h" +#include "ardour/profile.h" #include "theme_manager.h" #include "rgb_macros.h" diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index be3c0655b8..056135e70c 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -27,17 +27,17 @@ #include <libgnomecanvasmm/canvas.h> #include <libgnomecanvasmm/item.h> -#include <pbd/error.h> +#include "pbd/error.h" #include <gtkmm2ext/utils.h> #include <gtkmm2ext/selector.h> #include <gtkmm2ext/stop_signal.h> -#include <ardour/session.h> -#include <ardour/utils.h> -#include <ardour/ladspa_plugin.h> -#include <ardour/processor.h> -#include <ardour/location.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 "public_editor.h" diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index 980ff2cdd8..6f0b3310eb 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -33,11 +33,11 @@ #include <gtkmm2ext/focus_entry.h> -#include <pbd/stateful.h> +#include "pbd/stateful.h" -#include <ardour/types.h> -#include <ardour/region.h> -#include <evoral/Parameter.hpp> +#include "ardour/types.h" +#include "ardour/region.h" +#include "evoral/Parameter.hpp" #include "prompter.h" #include "axis_view.h" diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 8de294deb2..98c8b7cce9 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -17,11 +17,11 @@ */ -#include <pbd/error.h> -#include <pbd/stacktrace.h> +#include "pbd/error.h" +#include "pbd/stacktrace.h" -#include <ardour/types.h> -#include <ardour/ardour.h> +#include "ardour/types.h" +#include "ardour/ardour.h" #include <gtkmm2ext/utils.h> diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc index eac7bd70f5..f9e45f7f6b 100644 --- a/gtk2_ardour/time_selection.cc +++ b/gtk2_ardour/time_selection.cc @@ -19,8 +19,8 @@ #include <algorithm> -#include <pbd/error.h> -#include <ardour/ardour.h> +#include "pbd/error.h" +#include "ardour/ardour.h" #include "time_selection.h" diff --git a/gtk2_ardour/time_selection.h b/gtk2_ardour/time_selection.h index 1783e16046..ba4250ad7f 100644 --- a/gtk2_ardour/time_selection.h +++ b/gtk2_ardour/time_selection.h @@ -21,7 +21,7 @@ #define __ardour_gtk_time_selection_h__ #include <list> -#include <ardour/types.h> +#include "ardour/types.h" namespace ARDOUR { class RouteGroup; diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index 8f8d586e1f..c6dd70c992 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -22,14 +22,14 @@ #include <glibmm/miscutils.h> -#include <pbd/failed_constructor.h> -#include <pbd/xml++.h> -#include <pbd/filesystem.h> -#include <pbd/file_utils.h> -#include <pbd/error.h> - -#include <ardour/ardour.h> -#include <ardour/filesystem_paths.h> +#include "pbd/failed_constructor.h" +#include "pbd/xml++.h" +#include "pbd/filesystem.h" +#include "pbd/file_utils.h" +#include "pbd/error.h" + +#include "ardour/ardour.h" +#include "ardour/filesystem_paths.h" #include "ui_config.h" diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h index 5d4b72056d..e3b7d26cd3 100644 --- a/gtk2_ardour/ui_config.h +++ b/gtk2_ardour/ui_config.h @@ -24,8 +24,8 @@ #include <ostream> #include <iostream> -#include <pbd/stateful.h> -#include <pbd/xml++.h> +#include "pbd/stateful.h" +#include "pbd/xml++.h" template<class T> class UIConfigVariable diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 5b83cddbc9..9378b6727c 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -32,13 +32,13 @@ #include <gtkmm/paned.h> #include <gtk/gtkpaned.h> -#include <pbd/file_utils.h> +#include "pbd/file_utils.h" #include <gtkmm2ext/utils.h> -#include <ardour/configuration.h> -#include <ardour/configuration.h> +#include "ardour/configuration.h" +#include "ardour/configuration.h" -#include <ardour/filesystem_paths.h> +#include "ardour/filesystem_paths.h" #include "ardour_ui.h" #include "keyboard.h" diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h index 42494c8f6b..b6ce0160ea 100644 --- a/gtk2_ardour/utils.h +++ b/gtk2_ardour/utils.h @@ -23,7 +23,7 @@ #include <string> #include <cmath> #include <vector> -#include <ardour/types.h> +#include "ardour/types.h" #include <libgnomecanvasmm/line.h> #include <gdkmm/types.h> #include <glibmm/ustring.h> diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc index 999f4c81f5..2b811e6c58 100644 --- a/gtk2_ardour/visual_time_axis.cc +++ b/gtk2_ardour/visual_time_axis.cc @@ -23,9 +23,9 @@ #include <string> #include <vector> -#include <pbd/error.h> -#include <pbd/stl_delete.h> -#include <pbd/whitespace.h> +#include "pbd/error.h" +#include "pbd/stl_delete.h" +#include "pbd/whitespace.h" #include <gtkmm2ext/utils.h> #include <gtkmm2ext/selector.h> @@ -33,10 +33,10 @@ #include <gtkmm2ext/stop_signal.h> #include <gtkmm2ext/choice.h> -#include <ardour/session.h> -#include <ardour/utils.h> -#include <ardour/processor.h> -#include <ardour/location.h> +#include "ardour/session.h" +#include "ardour/utils.h" +#include "ardour/processor.h" +#include "ardour/location.h" #include "ardour_ui.h" #include "public_editor.h" diff --git a/gtk2_ardour/vst_pluginui.cc b/gtk2_ardour/vst_pluginui.cc index aba100a97c..299c2f5681 100644 --- a/gtk2_ardour/vst_pluginui.cc +++ b/gtk2_ardour/vst_pluginui.cc @@ -19,8 +19,8 @@ #include <fst.h> #include <gtk/gtksocket.h> -#include <ardour/processor.h> -#include <ardour/vst_plugin.h> +#include "ardour/processor.h" +#include "ardour/vst_plugin.h" #include "plugin_ui.h" diff --git a/libs/ardour/amp.cc b/libs/ardour/amp.cc index a2ad70e8b1..263ce82086 100644 --- a/libs/ardour/amp.cc +++ b/libs/ardour/amp.cc @@ -19,9 +19,9 @@ #include <cstring> #include <cmath> #include <algorithm> -#include <ardour/amp.h> -#include <ardour/buffer_set.h> -#include <ardour/audio_buffer.h> +#include "ardour/amp.h" +#include "ardour/buffer_set.h" +#include "ardour/audio_buffer.h" namespace ARDOUR { diff --git a/libs/ardour/analyser.cc b/libs/ardour/analyser.cc index 6d2392eb20..9309b4d03b 100644 --- a/libs/ardour/analyser.cc +++ b/libs/ardour/analyser.cc @@ -17,12 +17,12 @@ */ -#include <ardour/analyser.h> -#include <ardour/audiofilesource.h> -#include <ardour/transient_detector.h> +#include "ardour/analyser.h" +#include "ardour/audiofilesource.h" +#include "ardour/transient_detector.h" -#include <pbd/pthread_utils.h> -#include <pbd/convert.h> +#include "pbd/pthread_utils.h" +#include "pbd/convert.h" using namespace std; using namespace sigc; diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h index cdbcacbd91..402a29542d 100644 --- a/libs/ardour/ardour/amp.h +++ b/libs/ardour/ardour/amp.h @@ -19,7 +19,7 @@ #ifndef __ardour_amp_h__ #define __ardour_amp_h__ -#include <ardour/types.h> +#include "ardour/types.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 7321daf097..7358a7bddb 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -26,11 +26,11 @@ #include <limits.h> #include <signal.h> -#include <pbd/error.h> -#include <pbd/failed_constructor.h> +#include "pbd/error.h" +#include "pbd/failed_constructor.h" -#include <ardour/configuration.h> -#include <ardour/types.h> +#include "ardour/configuration.h" +#include "ardour/types.h" // #include <jack/jack.h> need this to inline jack_get_microseconds diff --git a/libs/ardour/ardour/audio_buffer.h b/libs/ardour/ardour/audio_buffer.h index 829288a7af..adcfb962f0 100644 --- a/libs/ardour/ardour/audio_buffer.h +++ b/libs/ardour/ardour/audio_buffer.h @@ -20,7 +20,7 @@ #define __ardour_audio_buffer_h__ #include <cstring> -#include <ardour/buffer.h> +#include "ardour/buffer.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h index 8f081ab58d..8acb3e2806 100644 --- a/libs/ardour/ardour/audio_diskstream.h +++ b/libs/ardour/ardour/audio_diskstream.h @@ -29,17 +29,17 @@ #include <time.h> -#include <pbd/fastlog.h> -#include <pbd/ringbufferNPT.h> -#include <pbd/stateful.h> -#include <pbd/rcu.h> - -#include <ardour/ardour.h> -#include <ardour/configuration.h> -#include <ardour/utils.h> -#include <ardour/diskstream.h> -#include <ardour/audioplaylist.h> -#include <ardour/port.h> +#include "pbd/fastlog.h" +#include "pbd/ringbufferNPT.h" +#include "pbd/stateful.h" +#include "pbd/rcu.h" + +#include "ardour/ardour.h" +#include "ardour/configuration.h" +#include "ardour/utils.h" +#include "ardour/diskstream.h" +#include "ardour/audioplaylist.h" +#include "ardour/port.h" struct tm; diff --git a/libs/ardour/ardour/audio_playlist_importer.h b/libs/ardour/ardour/audio_playlist_importer.h index 3a54367495..52d715bcc0 100644 --- a/libs/ardour/ardour/audio_playlist_importer.h +++ b/libs/ardour/ardour/audio_playlist_importer.h @@ -25,12 +25,12 @@ #include <boost/shared_ptr.hpp> -#include <pbd/xml++.h> -#include <pbd/id.h> +#include "pbd/xml++.h" +#include "pbd/id.h" -#include <ardour/element_importer.h> -#include <ardour/element_import_handler.h> -#include <ardour/types.h> +#include "ardour/element_importer.h" +#include "ardour/element_import_handler.h" +#include "ardour/types.h" #include "i18n.h" diff --git a/libs/ardour/ardour/audio_port.h b/libs/ardour/ardour/audio_port.h index 02454655a9..b928a3587d 100644 --- a/libs/ardour/ardour/audio_port.h +++ b/libs/ardour/ardour/audio_port.h @@ -21,8 +21,8 @@ #ifndef __ardour_audio_port_h__ #define __ardour_audio_port_h__ -#include <ardour/port.h> -#include <ardour/audio_buffer.h> +#include "ardour/port.h" +#include "ardour/audio_buffer.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/audio_region_importer.h b/libs/ardour/ardour/audio_region_importer.h index c968fc8129..03067c465d 100644 --- a/libs/ardour/ardour/audio_region_importer.h +++ b/libs/ardour/ardour/audio_region_importer.h @@ -27,12 +27,12 @@ #include <boost/shared_ptr.hpp> -#include <pbd/xml++.h> -#include <pbd/id.h> -#include <pbd/filesystem.h> -#include <ardour/types.h> -#include <ardour/element_importer.h> -#include <ardour/element_import_handler.h> +#include "pbd/xml++.h" +#include "pbd/id.h" +#include "pbd/filesystem.h" +#include "ardour/types.h" +#include "ardour/element_importer.h" +#include "ardour/element_import_handler.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h index fe7dcb58ff..04dd5f4798 100644 --- a/libs/ardour/ardour/audio_track.h +++ b/libs/ardour/ardour/audio_track.h @@ -20,7 +20,7 @@ #ifndef __ardour_audio_track_h__ #define __ardour_audio_track_h__ -#include <ardour/track.h> +#include "ardour/track.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/audio_track_importer.h b/libs/ardour/ardour/audio_track_importer.h index 87b3b25177..6e30f6e25b 100644 --- a/libs/ardour/ardour/audio_track_importer.h +++ b/libs/ardour/ardour/audio_track_importer.h @@ -23,11 +23,11 @@ #include <list> -#include <pbd/xml++.h> -#include <pbd/id.h> +#include "pbd/xml++.h" +#include "pbd/id.h" -#include <ardour/element_importer.h> -#include <ardour/element_import_handler.h> +#include "ardour/element_importer.h" +#include "ardour/element_import_handler.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h index 6333ece5d0..a356da81ca 100644 --- a/libs/ardour/ardour/audio_unit.h +++ b/libs/ardour/ardour/audio_unit.h @@ -29,7 +29,7 @@ #include <string> #include <vector> -#include <ardour/plugin.h> +#include "ardour/plugin.h" #include <AudioUnit/AudioUnit.h> #include <appleutility/AUParamInfo.h> diff --git a/libs/ardour/ardour/audioanalyser.h b/libs/ardour/ardour/audioanalyser.h index 7bb12b2b63..fefcd23a0e 100644 --- a/libs/ardour/ardour/audioanalyser.h +++ b/libs/ardour/ardour/audioanalyser.h @@ -26,7 +26,7 @@ #include <fstream> #include <vamp-sdk/Plugin.h> #include <boost/utility.hpp> -#include <ardour/audioregion.h> +#include "ardour/audioregion.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index e38fcb2e56..5c9317ae7b 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -30,13 +30,13 @@ #include <glibmm/thread.h> -#include <pbd/rcu.h> +#include "pbd/rcu.h" -#include <ardour/ardour.h> +#include "ardour/ardour.h" #include <jack/jack.h> #include <jack/transport.h> -#include <ardour/types.h> -#include <ardour/data_type.h> +#include "ardour/types.h" +#include "ardour/data_type.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h index 0d5f888dd8..b161bcada1 100644 --- a/libs/ardour/ardour/audiofilesource.h +++ b/libs/ardour/ardour/audiofilesource.h @@ -22,8 +22,8 @@ #include <exception> #include <time.h> -#include <ardour/audiosource.h> -#include <ardour/file_source.h> +#include "ardour/audiosource.h" +#include "ardour/file_source.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h index 4acbc9ad51..31cdd2ecd4 100644 --- a/libs/ardour/ardour/audioplaylist.h +++ b/libs/ardour/ardour/audioplaylist.h @@ -23,8 +23,8 @@ #include <vector> #include <list> -#include <ardour/ardour.h> -#include <ardour/playlist.h> +#include "ardour/ardour.h" +#include "ardour/playlist.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index 9be2defaa7..917578191f 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -23,14 +23,14 @@ #include <vector> #include <list> -#include <pbd/fastlog.h> -#include <pbd/undo.h> - -#include <ardour/ardour.h> -#include <ardour/automatable_controls.h> -#include <ardour/gain.h> -#include <ardour/logcurve.h> -#include <ardour/region.h> +#include "pbd/fastlog.h" +#include "pbd/undo.h" + +#include "ardour/ardour.h" +#include "ardour/automatable_controls.h" +#include "ardour/gain.h" +#include "ardour/logcurve.h" +#include "ardour/region.h" class XMLNode; diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h index 4f2ad0eee1..56a24ab4a5 100644 --- a/libs/ardour/ardour/audiosource.h +++ b/libs/ardour/ardour/audiosource.h @@ -33,10 +33,10 @@ #include <sigc++/signal.h> -#include <ardour/source.h> -#include <ardour/ardour.h> -#include <pbd/stateful.h> -#include <pbd/xml++.h> +#include "ardour/source.h" +#include "ardour/ardour.h" +#include "pbd/stateful.h" +#include "pbd/xml++.h" using std::list; using std::vector; diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h index 06d521ea21..6114da0552 100644 --- a/libs/ardour/ardour/auditioner.h +++ b/libs/ardour/ardour/auditioner.h @@ -24,8 +24,8 @@ #include <glibmm/thread.h> -#include <ardour/ardour.h> -#include <ardour/audio_track.h> +#include "ardour/ardour.h" +#include "ardour/audio_track.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h index 61a94d469b..5eacfa14b2 100644 --- a/libs/ardour/ardour/automatable.h +++ b/libs/ardour/ardour/automatable.h @@ -24,8 +24,8 @@ #include <set> #include <string> #include <boost/shared_ptr.hpp> -#include <evoral/ControlSet.hpp> -#include <ardour/types.h> +#include "evoral/ControlSet.hpp" +#include "ardour/types.h" class XMLNode; diff --git a/libs/ardour/ardour/automatable_controls.h b/libs/ardour/ardour/automatable_controls.h index 39633c0133..38df144694 100644 --- a/libs/ardour/ardour/automatable_controls.h +++ b/libs/ardour/ardour/automatable_controls.h @@ -20,8 +20,8 @@ #ifndef __ardour_automatable_controls_h__ #define __ardour_automatable_controls_h__ -#include <evoral/ControlSet.hpp> -#include <ardour/automatable.h> +#include "evoral/ControlSet.hpp" +#include "ardour/automatable.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/automatable_sequence.h b/libs/ardour/ardour/automatable_sequence.h index 9259234f81..a1d34ae92d 100644 --- a/libs/ardour/ardour/automatable_sequence.h +++ b/libs/ardour/ardour/automatable_sequence.h @@ -20,8 +20,8 @@ #ifndef __ardour_automatable_sequence_h__ #define __ardour_automatable_sequence_h__ -#include <evoral/Sequence.hpp> -#include <ardour/automatable.h> +#include "evoral/Sequence.hpp" +#include "ardour/automatable.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h index e4b024a290..74b8a54aad 100644 --- a/libs/ardour/ardour/automation_control.h +++ b/libs/ardour/ardour/automation_control.h @@ -22,9 +22,9 @@ #define __ardour_automation_control_h__ #include <boost/shared_ptr.hpp> -#include <pbd/controllable.h> -#include <evoral/Control.hpp> -#include <ardour/automation_list.h> +#include "pbd/controllable.h" +#include "evoral/Control.hpp" +#include "ardour/automation_list.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h index 7ede9f019a..7d34fe72b9 100644 --- a/libs/ardour/ardour/automation_list.h +++ b/libs/ardour/ardour/automation_list.h @@ -27,13 +27,13 @@ #include <sigc++/signal.h> #include <glibmm/thread.h> -#include <pbd/undo.h> -#include <pbd/xml++.h> -#include <pbd/statefuldestructible.h> +#include "pbd/undo.h" +#include "pbd/xml++.h" +#include "pbd/statefuldestructible.h" -#include <ardour/ardour.h> +#include "ardour/ardour.h" -#include <evoral/ControlList.hpp> +#include "evoral/ControlList.hpp" namespace ARDOUR { diff --git a/libs/ardour/ardour/beats_frames_converter.h b/libs/ardour/ardour/beats_frames_converter.h index e612830ce9..381ea6c3d8 100644 --- a/libs/ardour/ardour/beats_frames_converter.h +++ b/libs/ardour/ardour/beats_frames_converter.h @@ -19,8 +19,8 @@ $Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $ */ -#include <evoral/TimeConverter.hpp> -#include <ardour/types.h> +#include "evoral/TimeConverter.hpp" +#include "ardour/types.h" #ifndef __ardour_beats_frames_converter_h__ #define __ardour_beats_frames_converter_h__ diff --git a/libs/ardour/ardour/broadcast_info.h b/libs/ardour/ardour/broadcast_info.h index ff042dfbbb..dbad062b2b 100644 --- a/libs/ardour/ardour/broadcast_info.h +++ b/libs/ardour/ardour/broadcast_info.h @@ -26,7 +26,7 @@ #include <sndfile.h> -#include <ardour/types.h> +#include "ardour/types.h" using std::string; diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h index 02d6975fad..1b673503e3 100644 --- a/libs/ardour/ardour/buffer.h +++ b/libs/ardour/ardour/buffer.h @@ -25,9 +25,9 @@ #include <iostream> #include <boost/utility.hpp> -#include <ardour/types.h> -#include <ardour/data_type.h> -#include <ardour/runtime_functions.h> +#include "ardour/types.h" +#include "ardour/data_type.h" +#include "ardour/runtime_functions.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/buffer_set.h b/libs/ardour/ardour/buffer_set.h index dbdf41b87a..28350d8d2f 100644 --- a/libs/ardour/ardour/buffer_set.h +++ b/libs/ardour/ardour/buffer_set.h @@ -21,9 +21,9 @@ #include <cassert> #include <vector> -#include <ardour/chan_count.h> -#include <ardour/data_type.h> -#include <ardour/types.h> +#include "ardour/chan_count.h" +#include "ardour/data_type.h" +#include "ardour/types.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/caimportable.h b/libs/ardour/ardour/caimportable.h index dc7f5769ae..bb3e2ae191 100644 --- a/libs/ardour/ardour/caimportable.h +++ b/libs/ardour/ardour/caimportable.h @@ -20,9 +20,9 @@ #ifndef __ardour_ca_importable_source_h__ #define __ardour_ca_importable_source_h__ -#include <pbd/failed_constructor.h> -#include <ardour/types.h> -#include <ardour/importable_source.h> +#include "pbd/failed_constructor.h" +#include "ardour/types.h" +#include "ardour/importable_source.h" #include <appleutility/CAAudioFile.h> diff --git a/libs/ardour/ardour/chan_count.h b/libs/ardour/ardour/chan_count.h index e4981d11ef..38cc04b977 100644 --- a/libs/ardour/ardour/chan_count.h +++ b/libs/ardour/ardour/chan_count.h @@ -20,7 +20,7 @@ #ifndef __ardour_chan_count_h__ #define __ardour_chan_count_h__ -#include <ardour/data_type.h> +#include "ardour/data_type.h" #include <cassert> namespace ARDOUR { diff --git a/libs/ardour/ardour/click.h b/libs/ardour/ardour/click.h index 60499b98da..e50e0a29cb 100644 --- a/libs/ardour/ardour/click.h +++ b/libs/ardour/ardour/click.h @@ -20,7 +20,7 @@ #ifndef __ardour_click_h__ #define __ardour_click_h__ -#include <ardour/io.h> +#include "ardour/io.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h index 7b890500d8..e8d2685aa1 100644 --- a/libs/ardour/ardour/configuration.h +++ b/libs/ardour/ardour/configuration.h @@ -26,11 +26,11 @@ #include <sys/types.h> #include <string> -#include <pbd/stateful.h> +#include "pbd/stateful.h" -#include <ardour/types.h> -#include <ardour/utils.h> -#include <ardour/configuration_variable.h> +#include "ardour/types.h" +#include "ardour/utils.h" +#include "ardour/configuration_variable.h" class XMLNode; diff --git a/libs/ardour/ardour/configuration_variable.h b/libs/ardour/ardour/configuration_variable.h index a61283ecd0..57db525017 100644 --- a/libs/ardour/ardour/configuration_variable.h +++ b/libs/ardour/ardour/configuration_variable.h @@ -24,7 +24,7 @@ #include <ostream> #include <iostream> -#include <pbd/xml++.h> +#include "pbd/xml++.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h index c61513e117..359e1e8540 100644 --- a/libs/ardour/ardour/control_protocol_manager.h +++ b/libs/ardour/ardour/control_protocol_manager.h @@ -27,7 +27,7 @@ #include <glibmm/thread.h> -#include <pbd/stateful.h> +#include "pbd/stateful.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/control_protocol_search_path.h b/libs/ardour/ardour/control_protocol_search_path.h index f9a8103c0c..a8cd5b3178 100644 --- a/libs/ardour/ardour/control_protocol_search_path.h +++ b/libs/ardour/ardour/control_protocol_search_path.h @@ -20,7 +20,7 @@ #ifndef ARDOUR_CONTROL_PROTOCOL_SEARCH_PATH_INCLUDED #define ARDOUR_CONTROL_PROTOCOL_SEARCH_PATH_INCLUDED -#include <pbd/search_path.h> +#include "pbd/search_path.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h index d7282b35bd..7e9f975d03 100644 --- a/libs/ardour/ardour/coreaudiosource.h +++ b/libs/ardour/ardour/coreaudiosource.h @@ -21,7 +21,7 @@ #define __coreaudio_source_h__ #include <appleutility/CAAudioFile.h> -#include <ardour/audiofilesource.h> +#include "ardour/audiofilesource.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h index 4ad2ab551d..bd3ee914f9 100644 --- a/libs/ardour/ardour/crossfade.h +++ b/libs/ardour/ardour/crossfade.h @@ -26,13 +26,13 @@ #include <sigc++/signal.h> -#include <pbd/undo.h> -#include <pbd/statefuldestructible.h> +#include "pbd/undo.h" +#include "pbd/statefuldestructible.h" -#include <ardour/ardour.h> -#include <ardour/audioregion.h> -#include <ardour/crossfade_compare.h> -#include <evoral/Curve.hpp> +#include "ardour/ardour.h" +#include "ardour/audioregion.h" +#include "ardour/crossfade_compare.h" +#include "evoral/Curve.hpp" namespace ARDOUR { diff --git a/libs/ardour/ardour/cycle_timer.h b/libs/ardour/ardour/cycle_timer.h index 4e1a50e602..2fccec84cf 100644 --- a/libs/ardour/ardour/cycle_timer.h +++ b/libs/ardour/ardour/cycle_timer.h @@ -23,7 +23,7 @@ #include <string> #include <iostream> -#include <ardour/cycles.h> +#include "ardour/cycles.h" class CycleTimer { private: diff --git a/libs/ardour/ardour/dB.h b/libs/ardour/ardour/dB.h index b67e581067..6ee6279b12 100644 --- a/libs/ardour/ardour/dB.h +++ b/libs/ardour/ardour/dB.h @@ -20,7 +20,7 @@ #ifndef __ardour_dB_h__ #define __ardour_dB_h__ -#include <pbd/fastlog.h> +#include "pbd/fastlog.h" static inline float dB_to_coefficient (float dB) { return dB > -318.8f ? pow (10.0f, dB * 0.05f) : 0.0f; diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index e74687dcaf..a835e4b571 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -31,20 +31,20 @@ #include <boost/utility.hpp> -#include <evoral/types.hpp> - -#include <pbd/fastlog.h> -#include <pbd/ringbufferNPT.h> -#include <pbd/stateful.h> -#include <pbd/statefuldestructible.h> - -#include <ardour/ardour.h> -#include <ardour/configuration.h> -#include <ardour/location.h> -#include <ardour/session_object.h> -#include <ardour/types.h> -#include <ardour/utils.h> -#include <ardour/chan_count.h> +#include "evoral/types.hpp" + +#include "pbd/fastlog.h" +#include "pbd/ringbufferNPT.h" +#include "pbd/stateful.h" +#include "pbd/statefuldestructible.h" + +#include "ardour/ardour.h" +#include "ardour/configuration.h" +#include "ardour/location.h" +#include "ardour/session_object.h" +#include "ardour/types.h" +#include "ardour/utils.h" +#include "ardour/chan_count.h" struct tm; diff --git a/libs/ardour/ardour/element_importer.h b/libs/ardour/ardour/element_importer.h index 7979fbd0a4..0a2d5d3fb3 100644 --- a/libs/ardour/ardour/element_importer.h +++ b/libs/ardour/ardour/element_importer.h @@ -26,7 +26,7 @@ #include <sigc++/signal.h> -#include <ardour/types.h> +#include "ardour/types.h" using std::string; diff --git a/libs/ardour/ardour/event_type_map.h b/libs/ardour/ardour/event_type_map.h index feddc45968..371adfc0ee 100644 --- a/libs/ardour/ardour/event_type_map.h +++ b/libs/ardour/ardour/event_type_map.h @@ -22,8 +22,8 @@ #define __ardour_event_type_map_h__ #include <string> -#include <evoral/TypeMap.hpp> -#include <evoral/ControlList.hpp> +#include "evoral/TypeMap.hpp" +#include "evoral/ControlList.hpp" namespace ARDOUR { diff --git a/libs/ardour/ardour/export.h b/libs/ardour/ardour/export.h index 141786873d..e2dfa17e02 100644 --- a/libs/ardour/ardour/export.h +++ b/libs/ardour/ardour/export.h @@ -29,8 +29,8 @@ #include <sndfile.h> #include <samplerate.h> -#include <ardour/ardour.h> -#include <ardour/gdither.h> +#include "ardour/ardour.h" +#include "ardour/gdither.h" using std::map; using std::vector; diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h index d7c363860c..326d1fd9a4 100644 --- a/libs/ardour/ardour/export_channel.h +++ b/libs/ardour/ardour/export_channel.h @@ -21,8 +21,8 @@ #ifndef __ardour_export_channel_h__ #define __ardour_export_channel_h__ -#include <ardour/audioregion.h> -#include <ardour/buffer_set.h> +#include "ardour/audioregion.h" +#include "ardour/buffer_set.h" #include <set> diff --git a/libs/ardour/ardour/export_channel_configuration.h b/libs/ardour/ardour/export_channel_configuration.h index 7223e29110..28e5e8e533 100644 --- a/libs/ardour/ardour/export_channel_configuration.h +++ b/libs/ardour/ardour/export_channel_configuration.h @@ -26,11 +26,11 @@ #include <glibmm/ustring.h> #include <sigc++/signal.h> -#include <ardour/export_channel.h> -#include <ardour/export_status.h> -#include <ardour/ardour.h> +#include "ardour/export_channel.h" +#include "ardour/export_status.h" +#include "ardour/ardour.h" -#include <pbd/xml++.h> +#include "pbd/xml++.h" using Glib::ustring; diff --git a/libs/ardour/ardour/export_failed.h b/libs/ardour/ardour/export_failed.h index 1b375f3cb8..f6ea1c1323 100644 --- a/libs/ardour/ardour/export_failed.h +++ b/libs/ardour/ardour/export_failed.h @@ -23,7 +23,7 @@ #include <exception> #include <string> -#include <pbd/error.h> +#include "pbd/error.h" #include "i18n.h" diff --git a/libs/ardour/ardour/export_file_io.h b/libs/ardour/ardour/export_file_io.h index 0e15981c25..0b314819de 100644 --- a/libs/ardour/ardour/export_file_io.h +++ b/libs/ardour/ardour/export_file_io.h @@ -26,13 +26,13 @@ #include <boost/shared_ptr.hpp> #include <glibmm/ustring.h> -#include <ardour/sndfile_helpers.h> +#include "ardour/sndfile_helpers.h" -#include <ardour/graph.h> -#include <ardour/types.h> -#include <ardour/ardour.h> -#include <ardour/export_format_specification.h> -#include <ardour/export_utilities.h> +#include "ardour/graph.h" +#include "ardour/types.h" +#include "ardour/ardour.h" +#include "ardour/export_format_specification.h" +#include "ardour/export_utilities.h" using Glib::ustring; diff --git a/libs/ardour/ardour/export_filename.h b/libs/ardour/ardour/export_filename.h index fb9f5dcbbc..94b13b65f0 100644 --- a/libs/ardour/ardour/export_filename.h +++ b/libs/ardour/ardour/export_filename.h @@ -23,7 +23,7 @@ #include <boost/shared_ptr.hpp> #include <glibmm/ustring.h> -#include <pbd/statefuldestructible.h> +#include "pbd/statefuldestructible.h" using Glib::ustring; diff --git a/libs/ardour/ardour/export_format_base.h b/libs/ardour/ardour/export_format_base.h index 210452add2..7806a7d093 100644 --- a/libs/ardour/ardour/export_format_base.h +++ b/libs/ardour/ardour/export_format_base.h @@ -29,8 +29,8 @@ #include <sndfile.h> #include <samplerate.h> -#include <ardour/gdither_types.h> -#include <ardour/ardour.h> +#include "ardour/gdither_types.h" +#include "ardour/ardour.h" using std::string; diff --git a/libs/ardour/ardour/export_format_compatibility.h b/libs/ardour/ardour/export_format_compatibility.h index 617b5ee1d0..895937dc98 100644 --- a/libs/ardour/ardour/export_format_compatibility.h +++ b/libs/ardour/ardour/export_format_compatibility.h @@ -21,7 +21,7 @@ #ifndef __ardour_export_format_compatibility_h__ #define __ardour_export_format_compatibility_h__ -#include <ardour/export_format_base.h> +#include "ardour/export_format_base.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/export_format_manager.h b/libs/ardour/ardour/export_format_manager.h index 8c54c9cd45..4cf68edaa8 100644 --- a/libs/ardour/ardour/export_format_manager.h +++ b/libs/ardour/ardour/export_format_manager.h @@ -29,7 +29,7 @@ #include <sigc++/signal.h> #include <sigc++/trackable.h> -#include <ardour/export_formats.h> +#include "ardour/export_formats.h" using std::string; diff --git a/libs/ardour/ardour/export_format_specification.h b/libs/ardour/ardour/export_format_specification.h index 6c195ff131..9a3c8c43f8 100644 --- a/libs/ardour/ardour/export_format_specification.h +++ b/libs/ardour/ardour/export_format_specification.h @@ -23,10 +23,10 @@ #include <glibmm/ustring.h> -#include <pbd/uuid.h> +#include "pbd/uuid.h" -#include <ardour/types.h> -#include <ardour/export_format_base.h> +#include "ardour/types.h" +#include "ardour/export_format_base.h" using std::string; diff --git a/libs/ardour/ardour/export_formats.h b/libs/ardour/ardour/export_formats.h index fc6dc0a5f7..1b571e91fb 100644 --- a/libs/ardour/ardour/export_formats.h +++ b/libs/ardour/ardour/export_formats.h @@ -21,12 +21,12 @@ #ifndef __ardour_export_formats_h__ #define __ardour_export_formats_h__ -#include <ardour/export_format_base.h> -#include <ardour/export_format_compatibility.h> +#include "ardour/export_format_base.h" +#include "ardour/export_format_compatibility.h" #include <list> #include <boost/weak_ptr.hpp> -#include <pbd/failed_constructor.h> +#include "pbd/failed_constructor.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h index b918963ae8..b37ce0ce12 100644 --- a/libs/ardour/ardour/export_handler.h +++ b/libs/ardour/ardour/export_handler.h @@ -27,9 +27,9 @@ #include <boost/shared_ptr.hpp> -#include <ardour/ardour.h> -#include <ardour/types.h> -#include <ardour/session.h> +#include "ardour/ardour.h" +#include "ardour/types.h" +#include "ardour/session.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/export_preset.h b/libs/ardour/ardour/export_preset.h index de321aacd6..56054ae220 100644 --- a/libs/ardour/ardour/export_preset.h +++ b/libs/ardour/ardour/export_preset.h @@ -23,8 +23,8 @@ #include <string> -#include <pbd/uuid.h> -#include <pbd/xml++.h> +#include "pbd/uuid.h" +#include "pbd/xml++.h" using std::string; diff --git a/libs/ardour/ardour/export_processor.h b/libs/ardour/ardour/export_processor.h index 5034831da4..ed1690a170 100644 --- a/libs/ardour/ardour/export_processor.h +++ b/libs/ardour/ardour/export_processor.h @@ -26,9 +26,9 @@ #include <boost/smart_ptr.hpp> #include <glibmm/ustring.h> -#include <ardour/graph.h> -#include <ardour/export_file_io.h> -#include <ardour/export_utilities.h> +#include "ardour/graph.h" +#include "ardour/export_file_io.h" +#include "ardour/export_utilities.h" using Glib::ustring; using std::list; diff --git a/libs/ardour/ardour/export_profile_manager.h b/libs/ardour/ardour/export_profile_manager.h index 74035572b0..0f0144c0c7 100644 --- a/libs/ardour/ardour/export_profile_manager.h +++ b/libs/ardour/ardour/export_profile_manager.h @@ -32,13 +32,13 @@ #include <sigc++/signal.h> #include <glibmm/ustring.h> -#include <pbd/uuid.h> -#include <pbd/file_utils.h> -#include <pbd/xml++.h> +#include "pbd/uuid.h" +#include "pbd/file_utils.h" +#include "pbd/xml++.h" -#include <ardour/filesystem_paths.h> -#include <ardour/location.h> -#include <ardour/types.h> +#include "ardour/filesystem_paths.h" +#include "ardour/location.h" +#include "ardour/types.h" using std::string; using std::list; diff --git a/libs/ardour/ardour/export_timespan.h b/libs/ardour/ardour/export_timespan.h index 38f449a1a5..6e410cbfae 100644 --- a/libs/ardour/ardour/export_timespan.h +++ b/libs/ardour/ardour/export_timespan.h @@ -26,9 +26,9 @@ #include <glibmm/ustring.h> -#include <ardour/export_status.h> -#include <ardour/export_channel.h> -#include <ardour/ardour.h> +#include "ardour/export_status.h" +#include "ardour/export_channel.h" +#include "ardour/ardour.h" using Glib::ustring; diff --git a/libs/ardour/ardour/export_utilities.h b/libs/ardour/ardour/export_utilities.h index e5660e3b75..1da79a8d39 100644 --- a/libs/ardour/ardour/export_utilities.h +++ b/libs/ardour/ardour/export_utilities.h @@ -23,11 +23,11 @@ #include <samplerate.h> -#include <ardour/graph.h> -#include <ardour/types.h> -#include <ardour/ardour.h> -#include <ardour/export_format_base.h> -#include <ardour/runtime_functions.h> +#include "ardour/graph.h" +#include "ardour/types.h" +#include "ardour/ardour.h" +#include "ardour/export_format_base.h" +#include "ardour/runtime_functions.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index 0d6cae9b18..91a6988335 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -22,7 +22,7 @@ #include <exception> #include <time.h> -#include <ardour/source.h> +#include "ardour/source.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/filesystem_paths.h b/libs/ardour/ardour/filesystem_paths.h index 12995bd818..cebb8c1e4e 100644 --- a/libs/ardour/ardour/filesystem_paths.h +++ b/libs/ardour/ardour/filesystem_paths.h @@ -20,8 +20,8 @@ #ifndef ARDOUR_FILESYSTEM_PATHS_INCLUDED #define ARDOUR_FILESYSTEM_PATHS_INCLUDED -#include <pbd/filesystem.h> -#include <pbd/search_path.h> +#include "pbd/filesystem.h" +#include "pbd/search_path.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/filter.h b/libs/ardour/ardour/filter.h index b659873bdb..ad0c7d268c 100644 --- a/libs/ardour/ardour/filter.h +++ b/libs/ardour/ardour/filter.h @@ -22,7 +22,7 @@ #define __ardour_filter_h__ #include <vector> -#include <ardour/region.h> +#include "ardour/region.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h index 80b5a9fe11..c0e29b6735 100644 --- a/libs/ardour/ardour/graph.h +++ b/libs/ardour/ardour/graph.h @@ -23,7 +23,7 @@ #include <boost/shared_ptr.hpp> -#include <ardour/types.h> +#include "ardour/types.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/importable_source.h b/libs/ardour/ardour/importable_source.h index a33cf567e7..f55c9a5711 100644 --- a/libs/ardour/ardour/importable_source.h +++ b/libs/ardour/ardour/importable_source.h @@ -20,8 +20,8 @@ #ifndef __ardour_importable_source_h__ #define __ardour_importable_source_h__ -#include <pbd/failed_constructor.h> -#include <ardour/types.h> +#include "pbd/failed_constructor.h" +#include "ardour/types.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index 3ba56708ac..2058e2e079 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -28,22 +28,22 @@ #include <glibmm/thread.h> -#include <pbd/fastlog.h> -#include <pbd/undo.h> -#include <pbd/statefuldestructible.h> -#include <pbd/controllable.h> - -#include <ardour/ardour.h> -#include <ardour/automatable_controls.h> -#include <ardour/automation_control.h> -#include <ardour/bundle.h> -#include <ardour/chan_count.h> -#include <ardour/data_type.h> -#include <ardour/latent.h> -#include <ardour/port_set.h> -#include <ardour/session_object.h> -#include <ardour/types.h> -#include <ardour/utils.h> +#include "pbd/fastlog.h" +#include "pbd/undo.h" +#include "pbd/statefuldestructible.h" +#include "pbd/controllable.h" + +#include "ardour/ardour.h" +#include "ardour/automatable_controls.h" +#include "ardour/automation_control.h" +#include "ardour/bundle.h" +#include "ardour/chan_count.h" +#include "ardour/data_type.h" +#include "ardour/latent.h" +#include "ardour/port_set.h" +#include "ardour/session_object.h" +#include "ardour/types.h" +#include "ardour/utils.h" using std::string; using std::vector; diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h index 985a2c387c..d571821080 100644 --- a/libs/ardour/ardour/io_processor.h +++ b/libs/ardour/ardour/io_processor.h @@ -26,10 +26,10 @@ #include <glibmm/thread.h> -#include <pbd/undo.h> +#include "pbd/undo.h" -#include <ardour/ardour.h> -#include <ardour/processor.h> +#include "ardour/ardour.h" +#include "ardour/processor.h" using std::string; diff --git a/libs/ardour/ardour/jack_port.h b/libs/ardour/ardour/jack_port.h index e19af25fd1..30ffdd9d76 100644 --- a/libs/ardour/ardour/jack_port.h +++ b/libs/ardour/ardour/jack_port.h @@ -21,8 +21,8 @@ #define __ardour_jack_port_h__ #include <sigc++/signal.h> -#include <pbd/failed_constructor.h> -#include <ardour/port.h> +#include "pbd/failed_constructor.h" +#include "ardour/port.h" #include <jack/jack.h> namespace ARDOUR { diff --git a/libs/ardour/ardour/ladspa_plugin.h b/libs/ardour/ardour/ladspa_plugin.h index 1e7a53a65a..855aa7189b 100644 --- a/libs/ardour/ardour/ladspa_plugin.h +++ b/libs/ardour/ardour/ladspa_plugin.h @@ -27,11 +27,11 @@ #include <sigc++/signal.h> -#include <pbd/stateful.h> +#include "pbd/stateful.h" #include <jack/types.h> -#include <ardour/ladspa.h> -#include <ardour/plugin.h> +#include "ardour/ladspa.h" +#include "ardour/plugin.h" namespace ARDOUR { class AudioEngine; diff --git a/libs/ardour/ardour/latent.h b/libs/ardour/ardour/latent.h index 11bdf11370..53a6882a3c 100644 --- a/libs/ardour/ardour/latent.h +++ b/libs/ardour/ardour/latent.h @@ -1,7 +1,7 @@ #ifndef __ardour_latent_h__ #define __ardour_latent_h__ -#include <ardour/types.h> +#include "ardour/types.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index 692d6d11c2..5585711272 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -30,11 +30,11 @@ #include <glibmm/thread.h> -#include <pbd/undo.h> -#include <pbd/stateful.h> -#include <pbd/statefuldestructible.h> +#include "pbd/undo.h" +#include "pbd/stateful.h" +#include "pbd/statefuldestructible.h" -#include <ardour/ardour.h> +#include "ardour/ardour.h" using std::string; diff --git a/libs/ardour/ardour/location_importer.h b/libs/ardour/ardour/location_importer.h index 589bc2e94e..2924a1de92 100644 --- a/libs/ardour/ardour/location_importer.h +++ b/libs/ardour/ardour/location_importer.h @@ -21,14 +21,14 @@ #ifndef __ardour_location_importer_h__ #define __ardour_location_importer_h__ -#include <ardour/element_importer.h> -#include <ardour/element_import_handler.h> +#include "ardour/element_importer.h" +#include "ardour/element_import_handler.h" #include <boost/shared_ptr.hpp> -#include <pbd/xml++.h> -#include <ardour/location.h> -#include <ardour/types.h> +#include "pbd/xml++.h" +#include "ardour/location.h" +#include "ardour/types.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/logcurve.h b/libs/ardour/ardour/logcurve.h index dd58263313..b3f3b2a90a 100644 --- a/libs/ardour/ardour/logcurve.h +++ b/libs/ardour/ardour/logcurve.h @@ -20,7 +20,7 @@ #ifndef __ardour_logcurve_h__ #define __ardour_logcurve_h__ -#include <pbd/fastlog.h> +#include "pbd/fastlog.h" #include <glibmm/thread.h> namespace ARDOUR { diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h index 3ec2def947..f235a0b4c2 100644 --- a/libs/ardour/ardour/lv2_plugin.h +++ b/libs/ardour/ardour/lv2_plugin.h @@ -28,11 +28,11 @@ #include <sigc++/signal.h> -#include <pbd/stateful.h> +#include "pbd/stateful.h" #include <jack/types.h> #include <slv2/slv2.h> -#include <ardour/plugin.h> +#include "ardour/plugin.h" namespace ARDOUR { class AudioEngine; diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h index 2cf474afba..99aacfeb15 100644 --- a/libs/ardour/ardour/meter.h +++ b/libs/ardour/ardour/meter.h @@ -20,9 +20,9 @@ #define __ardour_meter_h__ #include <vector> -#include <ardour/types.h> -#include <ardour/processor.h> -#include <pbd/fastlog.h> +#include "ardour/types.h" +#include "ardour/processor.h" +#include "pbd/fastlog.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h index 4cd4cfea6b..9c2ee466d3 100644 --- a/libs/ardour/ardour/midi_buffer.h +++ b/libs/ardour/ardour/midi_buffer.h @@ -20,10 +20,10 @@ #ifndef __ardour_midi_buffer_h__ #define __ardour_midi_buffer_h__ -#include <evoral/midi_util.h> -#include <midi++/event.h> -#include <ardour/buffer.h> -#include <ardour/event_type_map.h> +#include "evoral/midi_util.h" +#include "midi++/event.h" +#include "ardour/buffer.h" +#include "ardour/event_type_map.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index eddeaa451a..9632c1566a 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -32,16 +32,16 @@ #include <time.h> -#include <pbd/fastlog.h> -#include <pbd/ringbufferNPT.h> - -#include <ardour/ardour.h> -#include <ardour/configuration.h> -#include <ardour/diskstream.h> -#include <ardour/midi_playlist.h> -#include <ardour/midi_ring_buffer.h> -#include <ardour/midi_state_tracker.h> -#include <ardour/utils.h> +#include "pbd/fastlog.h" +#include "pbd/ringbufferNPT.h" + +#include "ardour/ardour.h" +#include "ardour/configuration.h" +#include "ardour/diskstream.h" +#include "ardour/midi_playlist.h" +#include "ardour/midi_ring_buffer.h" +#include "ardour/midi_state_tracker.h" +#include "ardour/utils.h" struct tm; diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index 16d972c3cc..3feda1a22c 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -26,14 +26,14 @@ #include <utility> #include <boost/utility.hpp> #include <glibmm/thread.h> -#include <pbd/command.h> -#include <ardour/types.h> -#include <ardour/midi_buffer.h> -#include <ardour/midi_ring_buffer.h> -#include <ardour/automatable_sequence.h> -#include <ardour/types.h> -#include <evoral/Note.hpp> -#include <evoral/Sequence.hpp> +#include "pbd/command.h" +#include "ardour/types.h" +#include "ardour/midi_buffer.h" +#include "ardour/midi_ring_buffer.h" +#include "ardour/automatable_sequence.h" +#include "ardour/types.h" +#include "evoral/Note.hpp" +#include "evoral/Sequence.hpp" namespace ARDOUR { diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h index 10d0f99a7a..2c1df39aa5 100644 --- a/libs/ardour/ardour/midi_patch_manager.h +++ b/libs/ardour/ardour/midi_patch_manager.h @@ -21,7 +21,7 @@ #ifndef MIDI_PATCH_MANAGER_H_ #define MIDI_PATCH_MANAGER_H_ -#include <midi++/midnam_patch.h> +#include "midi++/midnam_patch.h" namespace ARDOUR { class Session; diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h index a956878348..cd1b44ae95 100644 --- a/libs/ardour/ardour/midi_playlist.h +++ b/libs/ardour/ardour/midi_playlist.h @@ -23,9 +23,9 @@ #include <vector> #include <list> -#include <ardour/ardour.h> -#include <ardour/playlist.h> -#include <evoral/Parameter.hpp> +#include "ardour/ardour.h" +#include "ardour/playlist.h" +#include "evoral/Parameter.hpp" namespace ARDOUR { diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h index 1a0115cb1f..f27789da5f 100644 --- a/libs/ardour/ardour/midi_port.h +++ b/libs/ardour/ardour/midi_port.h @@ -21,8 +21,8 @@ #ifndef __ardour_midi_port_h__ #define __ardour_midi_port_h__ -#include <ardour/port.h> -#include <ardour/midi_buffer.h> +#include "ardour/port.h" +#include "ardour/midi_buffer.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 9f4041060e..6ad3f44169 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -23,15 +23,15 @@ #include <vector> -#include <pbd/fastlog.h> -#include <pbd/undo.h> - -#include <ardour/ardour.h> -#include <ardour/gain.h> -#include <ardour/logcurve.h> -#include <ardour/midi_model.h> -#include <ardour/midi_source.h> -#include <ardour/region.h> +#include "pbd/fastlog.h" +#include "pbd/undo.h" + +#include "ardour/ardour.h" +#include "ardour/gain.h" +#include "ardour/logcurve.h" +#include "ardour/midi_model.h" +#include "ardour/midi_source.h" +#include "ardour/region.h" class XMLNode; diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 0c18b096bd..e84c21f638 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -24,13 +24,13 @@ #include <time.h> #include <sigc++/signal.h> #include <glibmm/thread.h> -#include <pbd/stateful.h> -#include <pbd/xml++.h> -#include <evoral/Sequence.hpp> -#include <ardour/ardour.h> -#include <ardour/buffer.h> -#include <ardour/source.h> -#include <ardour/beats_frames_converter.h> +#include "pbd/stateful.h" +#include "pbd/xml++.h" +#include "evoral/Sequence.hpp" +#include "ardour/ardour.h" +#include "ardour/buffer.h" +#include "ardour/source.h" +#include "ardour/beats_frames_converter.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/midi_state_tracker.h b/libs/ardour/ardour/midi_state_tracker.h index 0bc7897b53..3f74d67b17 100644 --- a/libs/ardour/ardour/midi_state_tracker.h +++ b/libs/ardour/ardour/midi_state_tracker.h @@ -22,7 +22,7 @@ #include <bitset> -#include <ardour/midi_buffer.h> +#include "ardour/midi_buffer.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/midi_stretch.h b/libs/ardour/ardour/midi_stretch.h index f4b8f1c618..53f73578eb 100644 --- a/libs/ardour/ardour/midi_stretch.h +++ b/libs/ardour/ardour/midi_stretch.h @@ -20,7 +20,7 @@ #ifndef __ardour_midi_stretch_h__ #define __ardour_midi_stretch_h__ -#include <ardour/filter.h> +#include "ardour/filter.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index 04f3d055c3..9ffa4dcebd 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -20,8 +20,8 @@ #ifndef __ardour_midi_track_h__ #define __ardour_midi_track_h__ -#include <ardour/track.h> -#include <ardour/midi_ring_buffer.h> +#include "ardour/track.h" +#include "ardour/midi_ring_buffer.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/mix.h b/libs/ardour/ardour/mix.h index c9bf9a605a..fed0f467b2 100644 --- a/libs/ardour/ardour/mix.h +++ b/libs/ardour/ardour/mix.h @@ -19,8 +19,8 @@ #ifndef __ardour_mix_h__ #define __ardour_mix_h__ -#include <ardour/types.h> -#include <ardour/utils.h> +#include "ardour/types.h" +#include "ardour/utils.h" #if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS) diff --git a/libs/ardour/ardour/named_selection.h b/libs/ardour/ardour/named_selection.h index 39ab524d4f..0c13bcedc1 100644 --- a/libs/ardour/ardour/named_selection.h +++ b/libs/ardour/ardour/named_selection.h @@ -24,7 +24,7 @@ #include <list> #include <boost/shared_ptr.hpp> -#include <pbd/stateful.h> +#include "pbd/stateful.h" class XMLNode; diff --git a/libs/ardour/ardour/onset_detector.h b/libs/ardour/ardour/onset_detector.h index 9243653d94..1724f216b6 100644 --- a/libs/ardour/ardour/onset_detector.h +++ b/libs/ardour/ardour/onset_detector.h @@ -20,7 +20,7 @@ #ifndef __ardour_onset_detector_h__ #define __ardour_onset_detector_h__ -#include <ardour/audioanalyser.h> +#include "ardour/audioanalyser.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h index f6839f6d29..7bdb33056c 100644 --- a/libs/ardour/ardour/panner.h +++ b/libs/ardour/ardour/panner.h @@ -27,12 +27,12 @@ #include <iostream> #include <sigc++/signal.h> -#include <pbd/stateful.h> -#include <pbd/controllable.h> +#include "pbd/stateful.h" +#include "pbd/controllable.h" -#include <ardour/types.h> -#include <ardour/automation_control.h> -#include <ardour/processor.h> +#include "ardour/types.h" +#include "ardour/automation_control.h" +#include "ardour/processor.h" using std::istream; using std::ostream; diff --git a/libs/ardour/ardour/peak.h b/libs/ardour/ardour/peak.h index bbec40eea7..3d380b2b03 100644 --- a/libs/ardour/ardour/peak.h +++ b/libs/ardour/ardour/peak.h @@ -21,8 +21,8 @@ #define __ardour_peak_h__ #include <cmath> -#include <ardour/types.h> -#include <ardour/utils.h> +#include "ardour/types.h" +#include "ardour/utils.h" static inline float default_compute_peak (const ARDOUR::Sample * const buf, nframes_t nsamples, float current) diff --git a/libs/ardour/ardour/pitch.h b/libs/ardour/ardour/pitch.h index 38d8380f5d..3173f9ff23 100644 --- a/libs/ardour/ardour/pitch.h +++ b/libs/ardour/ardour/pitch.h @@ -20,7 +20,7 @@ #ifndef __ardour_pitch_h__ #define __ardour_pitch_h__ -#include <ardour/filter.h> +#include "ardour/filter.h" namespace ARDOUR { class AudioRegion; @@ -28,7 +28,7 @@ namespace ARDOUR { #ifdef USE_RUBBERBAND -#include <ardour/rb_effect.h> +#include "ardour/rb_effect.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 151d240b4c..a88687cbbb 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -34,17 +34,17 @@ #include <sigc++/signal.h> -#include <pbd/undo.h> -#include <pbd/stateful.h> -#include <pbd/statefuldestructible.h> +#include "pbd/undo.h" +#include "pbd/stateful.h" +#include "pbd/statefuldestructible.h" -#include <evoral/types.hpp> +#include "evoral/types.hpp" -#include <ardour/ardour.h> -#include <ardour/session_object.h> -#include <ardour/crossfade_compare.h> -#include <ardour/location.h> -#include <ardour/data_type.h> +#include "ardour/ardour.h" +#include "ardour/session_object.h" +#include "ardour/crossfade_compare.h" +#include "ardour/location.h" +#include "ardour/data_type.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/playlist_factory.h b/libs/ardour/ardour/playlist_factory.h index 239fa49a04..e0533526c9 100644 --- a/libs/ardour/ardour/playlist_factory.h +++ b/libs/ardour/ardour/playlist_factory.h @@ -20,7 +20,7 @@ #ifndef __ardour_playlist_factory_h__ #define __ardour_playlist_factory_h__ -#include <ardour/playlist.h> +#include "ardour/playlist.h" class XMLNode; diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index 68671287ff..ecf22443ad 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -25,15 +25,15 @@ #include <sigc++/signal.h> #include <glibmm/ustring.h> -#include <pbd/statefuldestructible.h> -#include <pbd/controllable.h> +#include "pbd/statefuldestructible.h" +#include "pbd/controllable.h" #include <jack/types.h> -#include <ardour/chan_count.h> -#include <ardour/cycles.h> -#include <ardour/latent.h> -#include <ardour/plugin_insert.h> -#include <ardour/types.h> +#include "ardour/chan_count.h" +#include "ardour/cycles.h" +#include "ardour/latent.h" +#include "ardour/plugin_insert.h" +#include "ardour/types.h" #include <vector> #include <set> diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h index ee5c7405fb..bc213dcb95 100644 --- a/libs/ardour/ardour/plugin_insert.h +++ b/libs/ardour/ardour/plugin_insert.h @@ -26,10 +26,10 @@ #include <boost/weak_ptr.hpp> #include <sigc++/signal.h> -#include <ardour/ardour.h> -#include <ardour/types.h> -#include <ardour/processor.h> -#include <ardour/automation_control.h> +#include "ardour/ardour.h" +#include "ardour/types.h" +#include "ardour/processor.h" +#include "ardour/automation_control.h" class XMLNode; diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h index abf4c884cc..7c17378df2 100644 --- a/libs/ardour/ardour/plugin_manager.h +++ b/libs/ardour/ardour/plugin_manager.h @@ -26,11 +26,11 @@ #include <set> #include <boost/utility.hpp> -#include <ardour/types.h> -#include <ardour/plugin.h> +#include "ardour/types.h" +#include "ardour/plugin.h" #ifdef HAVE_SLV2 -#include <ardour/lv2_plugin.h> +#include "ardour/lv2_plugin.h" #endif namespace ARDOUR { diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h index 78ff09124b..dcf2e8dfb2 100644 --- a/libs/ardour/ardour/port_insert.h +++ b/libs/ardour/ardour/port_insert.h @@ -25,9 +25,9 @@ #include <exception> #include <sigc++/signal.h> -#include <ardour/ardour.h> -#include <ardour/io_processor.h> -#include <ardour/types.h> +#include "ardour/ardour.h" +#include "ardour/io_processor.h" +#include "ardour/types.h" class XMLNode; diff --git a/libs/ardour/ardour/port_set.h b/libs/ardour/ardour/port_set.h index 92591389d9..86da79df72 100644 --- a/libs/ardour/ardour/port_set.h +++ b/libs/ardour/ardour/port_set.h @@ -20,7 +20,7 @@ #define __ardour_port_set_h__ #include <vector> -#include <ardour/chan_count.h> +#include "ardour/chan_count.h" #include <boost/utility.hpp> namespace ARDOUR { diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h index 5cfa51eb2a..dce55e018e 100644 --- a/libs/ardour/ardour/processor.h +++ b/libs/ardour/ardour/processor.h @@ -24,16 +24,16 @@ #include <string> #include <exception> -#include <pbd/statefuldestructible.h> +#include "pbd/statefuldestructible.h" #include <sigc++/signal.h> -#include <ardour/ardour.h> -#include <ardour/automatable_controls.h> -#include <ardour/buffer_set.h> -#include <ardour/latent.h> -#include <ardour/session_object.h> -#include <ardour/types.h> +#include "ardour/ardour.h" +#include "ardour/automatable_controls.h" +#include "ardour/buffer_set.h" +#include "ardour/latent.h" +#include "ardour/session_object.h" +#include "ardour/types.h" class XMLNode; diff --git a/libs/ardour/ardour/quantize.h b/libs/ardour/ardour/quantize.h index 143652dc63..f7307c194c 100644 --- a/libs/ardour/ardour/quantize.h +++ b/libs/ardour/ardour/quantize.h @@ -21,7 +21,7 @@ #ifndef __ardour_quantize_h__ #define __ardour_quantize_h__ -#include <ardour/filter.h> +#include "ardour/filter.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/rb_effect.h b/libs/ardour/ardour/rb_effect.h index a536a309b3..f7ad6af9a5 100644 --- a/libs/ardour/ardour/rb_effect.h +++ b/libs/ardour/ardour/rb_effect.h @@ -20,7 +20,7 @@ #ifndef __ardour_rbeffect_h__ #define __ardour_rbeffect_h__ -#include <ardour/filter.h> +#include "ardour/filter.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/readable.h b/libs/ardour/ardour/readable.h index a65af23312..1ca6a7dbb2 100644 --- a/libs/ardour/ardour/readable.h +++ b/libs/ardour/ardour/readable.h @@ -1,7 +1,7 @@ #ifndef __ardour_readable_h__ #define __ardour_readable_h__ -#include <ardour/types.h> +#include "ardour/types.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 2696c7da91..d9a8945bae 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -25,13 +25,13 @@ #include <boost/enable_shared_from_this.hpp> #include <boost/utility.hpp> -#include <pbd/undo.h> +#include "pbd/undo.h" -#include <ardour/ardour.h> -#include <ardour/data_type.h> -#include <ardour/automatable.h> -#include <ardour/readable.h> -#include <ardour/session_object.h> +#include "ardour/ardour.h" +#include "ardour/data_type.h" +#include "ardour/automatable.h" +#include "ardour/readable.h" +#include "ardour/session_object.h" class XMLNode; diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index ed16477310..8cdf7df955 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -20,8 +20,8 @@ #ifndef __ardour_region_factory_h__ #define __ardour_region_factory_h__ -#include <ardour/types.h> -#include <ardour/region.h> +#include "ardour/types.h" +#include "ardour/region.h" class XMLNode; diff --git a/libs/ardour/ardour/resampled_source.h b/libs/ardour/ardour/resampled_source.h index 6eca4cda98..c8fff0d594 100644 --- a/libs/ardour/ardour/resampled_source.h +++ b/libs/ardour/ardour/resampled_source.h @@ -22,8 +22,8 @@ #include <samplerate.h> -#include <ardour/types.h> -#include <ardour/importable_source.h> +#include "ardour/types.h" +#include "ardour/importable_source.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/reverse.h b/libs/ardour/ardour/reverse.h index 7870b5aa2e..79f8880e56 100644 --- a/libs/ardour/ardour/reverse.h +++ b/libs/ardour/ardour/reverse.h @@ -20,7 +20,7 @@ #ifndef __ardour_reverse_h__ #define __ardour_reverse_h__ -#include <ardour/filter.h> +#include "ardour/filter.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 217ce36fe9..9bf2eb8710 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -31,16 +31,16 @@ #include <boost/weak_ptr.hpp> #include <glibmm/thread.h> -#include <pbd/fastlog.h> -#include <pbd/xml++.h> -#include <pbd/undo.h> -#include <pbd/stateful.h> -#include <pbd/controllable.h> -#include <pbd/destructible.h> - -#include <ardour/ardour.h> -#include <ardour/io.h> -#include <ardour/types.h> +#include "pbd/fastlog.h" +#include "pbd/xml++.h" +#include "pbd/undo.h" +#include "pbd/stateful.h" +#include "pbd/controllable.h" +#include "pbd/destructible.h" + +#include "ardour/ardour.h" +#include "ardour/io.h" +#include "ardour/types.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h index ae16394289..832d709a33 100644 --- a/libs/ardour/ardour/route_group.h +++ b/libs/ardour/ardour/route_group.h @@ -25,8 +25,8 @@ #include <string> #include <stdint.h> #include <sigc++/signal.h> -#include <pbd/stateful.h> -#include <ardour/types.h> +#include "pbd/stateful.h" +#include "ardour/types.h" using std::string; using std::list; @@ -88,7 +88,7 @@ class RouteGroup : public PBD::Stateful, public sigc::trackable { } } - /* to use these, #include <ardour/route_group_specialized.h> */ + /* to use these, #include "ardour/route_group_specialized.h" */ template<class T> void apply (void (Track::*func)(T, void *), T val, void *src); diff --git a/libs/ardour/ardour/route_group_specialized.h b/libs/ardour/ardour/route_group_specialized.h index d2ad734b9d..73b6c74ee7 100644 --- a/libs/ardour/ardour/route_group_specialized.h +++ b/libs/ardour/ardour/route_group_specialized.h @@ -20,8 +20,8 @@ #ifndef __ardour_route_group_specialized_h__ #define __ardour_route_group_specialized_h__ -#include <ardour/route_group.h> -#include <ardour/track.h> +#include "ardour/route_group.h" +#include "ardour/track.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/runtime_functions.h b/libs/ardour/ardour/runtime_functions.h index c1dab4ebc7..be39702a2f 100644 --- a/libs/ardour/ardour/runtime_functions.h +++ b/libs/ardour/ardour/runtime_functions.h @@ -20,7 +20,7 @@ #ifndef __ardour_runtime_functions_h__ #define __ardour_runtime_functions_h__ -#include <ardour/types.h> +#include "ardour/types.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h index dc1cbb8209..ed37094bf3 100644 --- a/libs/ardour/ardour/send.h +++ b/libs/ardour/ardour/send.h @@ -24,10 +24,10 @@ #include <string> -#include <pbd/stateful.h> -#include <ardour/ardour.h> -#include <ardour/audioengine.h> -#include <ardour/io_processor.h> +#include "pbd/stateful.h" +#include "ardour/ardour.h" +#include "ardour/audioengine.h" +#include "ardour/io_processor.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index b42699d964..6e09bbd4ed 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -37,23 +37,23 @@ #include <glibmm/thread.h> -#include <pbd/error.h> -#include <pbd/pool.h> -#include <pbd/rcu.h> -#include <pbd/statefuldestructible.h> -#include <pbd/undo.h> - -#include <midi++/mmc.h> -#include <midi++/types.h> - -#include <pbd/destructible.h> -#include <pbd/stateful.h> - -#include <ardour/ardour.h> -#include <ardour/chan_count.h> -#include <ardour/configuration.h> -#include <ardour/location.h> -#include <ardour/smpte.h> +#include "pbd/error.h" +#include "pbd/pool.h" +#include "pbd/rcu.h" +#include "pbd/statefuldestructible.h" +#include "pbd/undo.h" + +#include "midi++/mmc.h" +#include "midi++/types.h" + +#include "pbd/destructible.h" +#include "pbd/stateful.h" + +#include "ardour/ardour.h" +#include "ardour/chan_count.h" +#include "ardour/configuration.h" +#include "ardour/location.h" +#include "ardour/smpte.h" class XMLTree; class XMLNode; diff --git a/libs/ardour/ardour/session_directory.h b/libs/ardour/ardour/session_directory.h index 5c976374e3..3e35c42de2 100644 --- a/libs/ardour/ardour/session_directory.h +++ b/libs/ardour/ardour/session_directory.h @@ -22,7 +22,7 @@ #include <string> #include <vector> -#include <pbd/filesystem.h> +#include "pbd/filesystem.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/session_metadata.h b/libs/ardour/ardour/session_metadata.h index 2163a3dfef..e579c5102b 100644 --- a/libs/ardour/ardour/session_metadata.h +++ b/libs/ardour/ardour/session_metadata.h @@ -26,8 +26,8 @@ #include <map> #include <utility> -#include <pbd/statefuldestructible.h> -#include <pbd/xml++.h> +#include "pbd/statefuldestructible.h" +#include "pbd/xml++.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/session_object.h b/libs/ardour/ardour/session_object.h index bb726cb0d0..1a6a79ceee 100644 --- a/libs/ardour/ardour/session_object.h +++ b/libs/ardour/ardour/session_object.h @@ -21,7 +21,7 @@ #define __ardour_session_object_h__ #include <string> -#include <pbd/statefuldestructible.h> +#include "pbd/statefuldestructible.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/session_playlist.h b/libs/ardour/ardour/session_playlist.h index baeb74916d..0641d442a8 100644 --- a/libs/ardour/ardour/session_playlist.h +++ b/libs/ardour/ardour/session_playlist.h @@ -20,8 +20,8 @@ #ifndef __ardour_session_playlist_h__ #define __ardour_session_playlist_h__ -#include <ardour/session.h> -#include <ardour/playlist.h> +#include "ardour/session.h" +#include "ardour/playlist.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/session_region.h b/libs/ardour/ardour/session_region.h index 254bbfe1a3..c4a6f64889 100644 --- a/libs/ardour/ardour/session_region.h +++ b/libs/ardour/ardour/session_region.h @@ -20,8 +20,8 @@ #ifndef __ardour_session_region_h__ #define __ardour_session_region_h__ -#include <ardour/session.h> -#include <ardour/audioregion.h> +#include "ardour/session.h" +#include "ardour/audioregion.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/session_route.h b/libs/ardour/ardour/session_route.h index 0c70bf407d..c7e911abb5 100644 --- a/libs/ardour/ardour/session_route.h +++ b/libs/ardour/ardour/session_route.h @@ -24,8 +24,8 @@ #include <glibmm/thread.h> -#include <ardour/session.h> -#include <ardour/route.h> +#include "ardour/session.h" +#include "ardour/route.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/session_selection.h b/libs/ardour/ardour/session_selection.h index 4169a3a511..b92cb475a0 100644 --- a/libs/ardour/ardour/session_selection.h +++ b/libs/ardour/ardour/session_selection.h @@ -20,8 +20,8 @@ #ifndef __ardour_session_named_selection_h__ #define __ardour_session_named_selection_h__ -#include <ardour/session.h> -#include <ardour/named_selection.h> +#include "ardour/session.h" +#include "ardour/named_selection.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/session_state_utils.h b/libs/ardour/ardour/session_state_utils.h index 8825b041f3..f9b1cdb63f 100644 --- a/libs/ardour/ardour/session_state_utils.h +++ b/libs/ardour/ardour/session_state_utils.h @@ -22,7 +22,7 @@ #include <vector> #include <string> -#include <pbd/filesystem.h> +#include "pbd/filesystem.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/silentfilesource.h b/libs/ardour/ardour/silentfilesource.h index 58460b9c21..c76af3fbcf 100644 --- a/libs/ardour/ardour/silentfilesource.h +++ b/libs/ardour/ardour/silentfilesource.h @@ -21,7 +21,7 @@ #define __ardour_silentfilesource_h__ #include <cstring> -#include <ardour/audiofilesource.h> +#include "ardour/audiofilesource.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 5384a3b452..43418c576d 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -25,9 +25,9 @@ #include <jack/jack.h> #include <sigc++/signal.h> -#include <ardour/ardour.h> -#include <midi++/parser.h> -#include <midi++/types.h> +#include "ardour/ardour.h" +#include "midi++/parser.h" +#include "midi++/types.h" namespace MIDI { class Port; diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h index e61b3f9737..3321a089b7 100644 --- a/libs/ardour/ardour/smf_source.h +++ b/libs/ardour/ardour/smf_source.h @@ -23,9 +23,9 @@ #include <cstdio> #include <time.h> -#include <evoral/SMF.hpp> -#include <ardour/midi_source.h> -#include <ardour/file_source.h> +#include "evoral/SMF.hpp" +#include "ardour/midi_source.h" +#include "ardour/file_source.h" namespace Evoral { template<typename T> class Event; } diff --git a/libs/ardour/ardour/sndfileimportable.h b/libs/ardour/ardour/sndfileimportable.h index 5cd84f4f5f..9eb67c0dea 100644 --- a/libs/ardour/ardour/sndfileimportable.h +++ b/libs/ardour/ardour/sndfileimportable.h @@ -22,9 +22,9 @@ #include <boost/shared_ptr.hpp> #include <sndfile.h> -#include <pbd/failed_constructor.h> -#include <ardour/types.h> -#include <ardour/importable_source.h> +#include "pbd/failed_constructor.h" +#include "ardour/types.h" +#include "ardour/importable_source.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h index 66544eec8c..6c4e61d569 100644 --- a/libs/ardour/ardour/sndfilesource.h +++ b/libs/ardour/ardour/sndfilesource.h @@ -22,8 +22,8 @@ #include <sndfile.h> -#include <ardour/audiofilesource.h> -#include <ardour/broadcast_info.h> +#include "ardour/audiofilesource.h" +#include "ardour/broadcast_info.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h index 7905debbcc..162f4400a4 100644 --- a/libs/ardour/ardour/source.h +++ b/libs/ardour/ardour/source.h @@ -25,12 +25,12 @@ #include <boost/utility.hpp> #include <sigc++/signal.h> -#include <pbd/statefuldestructible.h> +#include "pbd/statefuldestructible.h" -#include <ardour/ardour.h> -#include <ardour/session_object.h> -#include <ardour/data_type.h> -#include <ardour/readable.h> +#include "ardour/ardour.h" +#include "ardour/session_object.h" +#include "ardour/data_type.h" +#include "ardour/readable.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h index 69aa641657..c5d5a410e9 100644 --- a/libs/ardour/ardour/source_factory.h +++ b/libs/ardour/ardour/source_factory.h @@ -25,7 +25,7 @@ #include <sigc++/sigc++.h> #include <boost/shared_ptr.hpp> -#include <ardour/source.h> +#include "ardour/source.h" class XMLNode; diff --git a/libs/ardour/ardour/stretch.h b/libs/ardour/ardour/stretch.h index b01a9ae208..d0c05ac6d1 100644 --- a/libs/ardour/ardour/stretch.h +++ b/libs/ardour/ardour/stretch.h @@ -20,11 +20,11 @@ #ifndef __ardour_stretch_h__ #define __ardour_stretch_h__ -#include <ardour/filter.h> +#include "ardour/filter.h" #ifdef USE_RUBBERBAND -#include <ardour/rb_effect.h> +#include "ardour/rb_effect.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/template_utils.h b/libs/ardour/ardour/template_utils.h index 0676d5b245..6ba0683e1e 100644 --- a/libs/ardour/ardour/template_utils.h +++ b/libs/ardour/ardour/template_utils.h @@ -4,7 +4,7 @@ #include <vector> -#include <pbd/filesystem.h> +#include "pbd/filesystem.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index ffe79fc1c8..6a42762fa0 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -26,13 +26,13 @@ #include <cmath> #include <glibmm/thread.h> -#include <pbd/undo.h> -#include <pbd/stateful.h> -#include <pbd/statefuldestructible.h> +#include "pbd/undo.h" +#include "pbd/stateful.h" +#include "pbd/statefuldestructible.h" #include <sigc++/signal.h> -#include <ardour/ardour.h> +#include "ardour/ardour.h" class XMLNode; diff --git a/libs/ardour/ardour/tempo_map_importer.h b/libs/ardour/ardour/tempo_map_importer.h index 40ad126900..6351596f74 100644 --- a/libs/ardour/ardour/tempo_map_importer.h +++ b/libs/ardour/ardour/tempo_map_importer.h @@ -23,12 +23,12 @@ #include <boost/shared_ptr.hpp> -#include <pbd/xml++.h> +#include "pbd/xml++.h" -#include <ardour/element_importer.h> -#include <ardour/element_import_handler.h> -#include <ardour/tempo.h> -#include <ardour/types.h> +#include "ardour/element_importer.h" +#include "ardour/element_import_handler.h" +#include "ardour/tempo.h" +#include "ardour/types.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 566153d02f..40a266b50a 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -21,7 +21,7 @@ #include <boost/shared_ptr.hpp> -#include <ardour/route.h> +#include "ardour/route.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/transient_detector.h b/libs/ardour/ardour/transient_detector.h index 259b79176f..2f4fc4c4f7 100644 --- a/libs/ardour/ardour/transient_detector.h +++ b/libs/ardour/ardour/transient_detector.h @@ -20,7 +20,7 @@ #ifndef __ardour_transient_detector_h__ #define __ardour_transient_detector_h__ -#include <ardour/audioanalyser.h> +#include "ardour/audioanalyser.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 264d0666a7..09ccf15624 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -32,7 +32,7 @@ #include <jack/types.h> #include <jack/midiport.h> #include <control_protocol/smpte.h> -#include <pbd/id.h> +#include "pbd/id.h" #include <map> diff --git a/libs/ardour/ardour/vst_plugin.h b/libs/ardour/ardour/vst_plugin.h index e41d000f9c..ba936b9721 100644 --- a/libs/ardour/ardour/vst_plugin.h +++ b/libs/ardour/ardour/vst_plugin.h @@ -28,9 +28,9 @@ #include <dlfcn.h> #include <sigc++/signal.h> -#include <pbd/stateful.h> +#include "pbd/stateful.h" #include <jack/types.h> -#include <ardour/plugin.h> +#include "ardour/plugin.h" using std::string; using std::vector; diff --git a/libs/ardour/audio_buffer.cc b/libs/ardour/audio_buffer.cc index 506b34eb04..7a6767dd32 100644 --- a/libs/ardour/audio_buffer.cc +++ b/libs/ardour/audio_buffer.cc @@ -16,8 +16,8 @@ 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ardour/audio_buffer.h> -#include <pbd/error.h> +#include "ardour/audio_buffer.h" +#include "pbd/error.h" #include <errno.h> #include "i18n.h" diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index e08118c0fc..4c36100c82 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -30,31 +30,31 @@ #include <sys/stat.h> #include <sys/mman.h> -#include <pbd/error.h> +#include "pbd/error.h" #include <glibmm/thread.h> -#include <pbd/xml++.h> -#include <pbd/memento_command.h> -#include <pbd/enumwriter.h> -#include <pbd/stacktrace.h> - -#include <ardour/ardour.h> -#include <ardour/audioengine.h> -#include <ardour/analyser.h> -#include <ardour/audio_diskstream.h> -#include <ardour/utils.h> -#include <ardour/configuration.h> -#include <ardour/audiofilesource.h> -#include <ardour/send.h> -#include <ardour/region_factory.h> -#include <ardour/audioplaylist.h> -#include <ardour/playlist_factory.h> -#include <ardour/cycle_timer.h> -#include <ardour/audioregion.h> -#include <ardour/audio_port.h> -#include <ardour/source_factory.h> -#include <ardour/audio_buffer.h> -#include <ardour/session.h> -#include <ardour/io.h> +#include "pbd/xml++.h" +#include "pbd/memento_command.h" +#include "pbd/enumwriter.h" +#include "pbd/stacktrace.h" + +#include "ardour/ardour.h" +#include "ardour/audioengine.h" +#include "ardour/analyser.h" +#include "ardour/audio_diskstream.h" +#include "ardour/utils.h" +#include "ardour/configuration.h" +#include "ardour/audiofilesource.h" +#include "ardour/send.h" +#include "ardour/region_factory.h" +#include "ardour/audioplaylist.h" +#include "ardour/playlist_factory.h" +#include "ardour/cycle_timer.h" +#include "ardour/audioregion.h" +#include "ardour/audio_port.h" +#include "ardour/source_factory.h" +#include "ardour/audio_buffer.h" +#include "ardour/session.h" +#include "ardour/io.h" #include "i18n.h" #include <locale.h> diff --git a/libs/ardour/audio_library.cc b/libs/ardour/audio_library.cc index 42ec537830..b64a9ee08d 100644 --- a/libs/ardour/audio_library.cc +++ b/libs/ardour/audio_library.cc @@ -26,11 +26,11 @@ #include <glibmm/convert.h> -#include <pbd/compose.h> +#include "pbd/compose.h" -#include <ardour/audio_library.h> -#include <ardour/utils.h> -#include <ardour/filesystem_paths.h> +#include "ardour/audio_library.h" +#include "ardour/utils.h" +#include "ardour/filesystem_paths.h" #include "i18n.h" diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index a17ab1036f..4953cdf702 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -23,14 +23,14 @@ #include <sigc++/bind.h> -#include <ardour/types.h> -#include <ardour/configuration.h> -#include <ardour/audioplaylist.h> -#include <ardour/audioregion.h> -#include <ardour/crossfade.h> -#include <ardour/crossfade_compare.h> -#include <ardour/session.h> -#include <pbd/enumwriter.h> +#include "ardour/types.h" +#include "ardour/configuration.h" +#include "ardour/audioplaylist.h" +#include "ardour/audioregion.h" +#include "ardour/crossfade.h" +#include "ardour/crossfade_compare.h" +#include "ardour/session.h" +#include "pbd/enumwriter.h" #include "i18n.h" diff --git a/libs/ardour/audio_playlist_importer.cc b/libs/ardour/audio_playlist_importer.cc index 50aa6f2225..aaa237c860 100644 --- a/libs/ardour/audio_playlist_importer.cc +++ b/libs/ardour/audio_playlist_importer.cc @@ -18,18 +18,18 @@ */ -#include <ardour/audio_playlist_importer.h> +#include "ardour/audio_playlist_importer.h" #include <sstream> -#include <pbd/failed_constructor.h> -#include <pbd/compose.h> -#include <pbd/error.h> +#include "pbd/failed_constructor.h" +#include "pbd/compose.h" +#include "pbd/error.h" -#include <ardour/audio_region_importer.h> -#include <ardour/session.h> -#include <ardour/playlist.h> -#include <ardour/playlist_factory.h> +#include "ardour/audio_region_importer.h" +#include "ardour/session.h" +#include "ardour/playlist.h" +#include "ardour/playlist_factory.h" using namespace PBD; using namespace ARDOUR; diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc index 558ae72a97..c9d28dcb41 100644 --- a/libs/ardour/audio_port.cc +++ b/libs/ardour/audio_port.cc @@ -17,10 +17,10 @@ */ #include <cassert> -#include <ardour/audio_port.h> -#include <ardour/audioengine.h> -#include <ardour/data_type.h> -#include <ardour/audio_buffer.h> +#include "ardour/audio_port.h" +#include "ardour/audioengine.h" +#include "ardour/data_type.h" +#include "ardour/audio_buffer.h" using namespace ARDOUR; using namespace std; diff --git a/libs/ardour/audio_region_importer.cc b/libs/ardour/audio_region_importer.cc index 23f3bfd6c6..bea61d81e3 100644 --- a/libs/ardour/audio_region_importer.cc +++ b/libs/ardour/audio_region_importer.cc @@ -18,19 +18,19 @@ */ -#include <ardour/audio_region_importer.h> +#include "ardour/audio_region_importer.h" #include <sstream> -#include <pbd/failed_constructor.h> -#include <pbd/compose.h> -#include <pbd/error.h> +#include "pbd/failed_constructor.h" +#include "pbd/compose.h" +#include "pbd/error.h" -#include <ardour/session.h> -#include <ardour/region.h> -#include <ardour/source_factory.h> -#include <ardour/region_factory.h> -#include <ardour/session_directory.h> +#include "ardour/session.h" +#include "ardour/region.h" +#include "ardour/source_factory.h" +#include "ardour/region_factory.h" +#include "ardour/session_directory.h" #include "i18n.h" diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 2e1a266577..bfabeb7e17 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -21,27 +21,27 @@ #include <sigc++/retype_return.h> #include <sigc++/bind.h> -#include <pbd/error.h> -#include <pbd/enumwriter.h> - -#include <evoral/Curve.hpp> - -#include <ardour/audio_track.h> -#include <ardour/audio_diskstream.h> -#include <ardour/session.h> -#include <ardour/io_processor.h> -#include <ardour/audioregion.h> -#include <ardour/audiosource.h> -#include <ardour/region_factory.h> -#include <ardour/route_group_specialized.h> -#include <ardour/processor.h> -#include <ardour/plugin_insert.h> -#include <ardour/audioplaylist.h> -#include <ardour/playlist_factory.h> -#include <ardour/panner.h> -#include <ardour/utils.h> -#include <ardour/buffer_set.h> -#include <ardour/audio_buffer.h> +#include "pbd/error.h" +#include "pbd/enumwriter.h" + +#include "evoral/Curve.hpp" + +#include "ardour/audio_track.h" +#include "ardour/audio_diskstream.h" +#include "ardour/session.h" +#include "ardour/io_processor.h" +#include "ardour/audioregion.h" +#include "ardour/audiosource.h" +#include "ardour/region_factory.h" +#include "ardour/route_group_specialized.h" +#include "ardour/processor.h" +#include "ardour/plugin_insert.h" +#include "ardour/audioplaylist.h" +#include "ardour/playlist_factory.h" +#include "ardour/panner.h" +#include "ardour/utils.h" +#include "ardour/buffer_set.h" +#include "ardour/audio_buffer.h" #include "i18n.h" using namespace std; diff --git a/libs/ardour/audio_track_importer.cc b/libs/ardour/audio_track_importer.cc index 997acde3cd..f822cfb832 100644 --- a/libs/ardour/audio_track_importer.cc +++ b/libs/ardour/audio_track_importer.cc @@ -18,14 +18,14 @@ */ -#include <ardour/audio_track_importer.h> +#include "ardour/audio_track_importer.h" -#include <ardour/audio_playlist_importer.h> -#include <ardour/audio_diskstream.h> -#include <ardour/session.h> +#include "ardour/audio_playlist_importer.h" +#include "ardour/audio_diskstream.h" +#include "ardour/session.h" -#include <pbd/failed_constructor.h> -#include <pbd/convert.h> +#include "pbd/failed_constructor.h" +#include "pbd/convert.h" #include <sstream> #include <algorithm> diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index 4a432ba544..f837ff8832 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -19,20 +19,20 @@ #include <sstream> -#include <pbd/transmitter.h> -#include <pbd/xml++.h> -#include <pbd/whitespace.h> +#include "pbd/transmitter.h" +#include "pbd/xml++.h" +#include "pbd/whitespace.h" #include <glibmm/thread.h> #include <glibmm/fileutils.h> #include <glibmm/miscutils.h> -#include <ardour/ardour.h> -#include <ardour/audioengine.h> -#include <ardour/io.h> -#include <ardour/audio_unit.h> -#include <ardour/session.h> -#include <ardour/utils.h> +#include "ardour/ardour.h" +#include "ardour/audioengine.h" +#include "ardour/io.h" +#include "ardour/audio_unit.h" +#include "ardour/session.h" +#include "ardour/utils.h" #include <appleutility/CAAudioUnit.h> #include <appleutility/CAAUParameter.h> diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc index dcbd2847fe..a4b2d3d3a5 100644 --- a/libs/ardour/audioanalyser.cc +++ b/libs/ardour/audioanalyser.cc @@ -4,11 +4,11 @@ #include <glibmm/fileutils.h> #include <glib/gstdio.h> // for g_remove() -#include <pbd/error.h> +#include "pbd/error.h" -#include <ardour/audioanalyser.h> -#include <ardour/readable.h> -#include <ardour/readable.h> +#include "ardour/audioanalyser.h" +#include "ardour/readable.h" +#include "ardour/readable.h" #include <cstring> diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 1be774a963..4a0b73524e 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -25,27 +25,27 @@ #include <sstream> #include <glibmm/timer.h> -#include <pbd/pthread_utils.h> -#include <pbd/stacktrace.h> -#include <pbd/unknown_type.h> - -#include <midi++/jack.h> - -#include <ardour/audioengine.h> -#include <ardour/buffer.h> -#include <ardour/port.h> -#include <ardour/audio_port.h> -#include <ardour/midi_port.h> -#include <ardour/session.h> -#include <ardour/cycle_timer.h> -#include <ardour/utils.h> -#include <ardour/event_type_map.h> -#include <ardour/io.h> +#include "pbd/pthread_utils.h" +#include "pbd/stacktrace.h" +#include "pbd/unknown_type.h" + +#include "midi++/jack.h" + +#include "ardour/audioengine.h" +#include "ardour/buffer.h" +#include "ardour/port.h" +#include "ardour/audio_port.h" +#include "ardour/midi_port.h" +#include "ardour/session.h" +#include "ardour/cycle_timer.h" +#include "ardour/utils.h" +#include "ardour/event_type_map.h" +#include "ardour/io.h" #ifdef VST_SUPPORT #include <fst.h> #endif -#include <ardour/timestamps.h> +#include "ardour/timestamps.h" #include "i18n.h" diff --git a/libs/ardour/audiofile_tagger.cc b/libs/ardour/audiofile_tagger.cc index 7391bf9ae3..7cd76e43c9 100644 --- a/libs/ardour/audiofile_tagger.cc +++ b/libs/ardour/audiofile_tagger.cc @@ -18,11 +18,11 @@ */ -#include <ardour/audiofile_tagger.h> +#include "ardour/audiofile_tagger.h" -#include <ardour/session_metadata.h> +#include "ardour/session_metadata.h" -#include <pbd/convert.h> +#include "pbd/convert.h" #include <taglib/fileref.h> #include <taglib/oggfile.h> diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index d1371ad0fb..48aaeb8d08 100644 --- a/libs/ardour/audiofilesource.cc +++ b/libs/ardour/audiofilesource.cc @@ -26,13 +26,13 @@ #include <fcntl.h> #include <errno.h> -#include <pbd/convert.h> -#include <pbd/basename.h> -#include <pbd/mountpoint.h> -#include <pbd/stl_delete.h> -#include <pbd/strsplit.h> -#include <pbd/shortpath.h> -#include <pbd/enumwriter.h> +#include "pbd/convert.h" +#include "pbd/basename.h" +#include "pbd/mountpoint.h" +#include "pbd/stl_delete.h" +#include "pbd/strsplit.h" +#include "pbd/shortpath.h" +#include "pbd/enumwriter.h" #include <sndfile.h> @@ -40,18 +40,18 @@ #include <glibmm/fileutils.h> #include <glibmm/thread.h> -#include <ardour/audiofilesource.h> -#include <ardour/sndfile_helpers.h> -#include <ardour/sndfilesource.h> -#include <ardour/session.h> -#include <ardour/session_directory.h> -#include <ardour/source_factory.h> -#include <ardour/filename_extensions.h> +#include "ardour/audiofilesource.h" +#include "ardour/sndfile_helpers.h" +#include "ardour/sndfilesource.h" +#include "ardour/session.h" +#include "ardour/session_directory.h" +#include "ardour/source_factory.h" +#include "ardour/filename_extensions.h" // if these headers come before sigc++ is included // the parser throws ObjC++ errors. (nil is a keyword) #ifdef HAVE_COREAUDIO -#include <ardour/coreaudiosource.h> +#include "ardour/coreaudiosource.h" #include <AudioToolbox/ExtendedAudioFile.h> #include <AudioToolbox/AudioFormat.h> #endif // HAVE_COREAUDIO diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 3ea00deb59..b5d733aea1 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -29,23 +29,23 @@ #include <glibmm/thread.h> -#include <pbd/basename.h> -#include <pbd/xml++.h> -#include <pbd/stacktrace.h> -#include <pbd/enumwriter.h> -#include <pbd/convert.h> - -#include <evoral/Curve.hpp> - -#include <ardour/audioregion.h> -#include <ardour/session.h> -#include <ardour/gain.h> -#include <ardour/dB.h> -#include <ardour/playlist.h> -#include <ardour/audiofilesource.h> -#include <ardour/region_factory.h> -#include <ardour/runtime_functions.h> -#include <ardour/transient_detector.h> +#include "pbd/basename.h" +#include "pbd/xml++.h" +#include "pbd/stacktrace.h" +#include "pbd/enumwriter.h" +#include "pbd/convert.h" + +#include "evoral/Curve.hpp" + +#include "ardour/audioregion.h" +#include "ardour/session.h" +#include "ardour/gain.h" +#include "ardour/dB.h" +#include "ardour/playlist.h" +#include "ardour/audiofilesource.h" +#include "ardour/region_factory.h" +#include "ardour/runtime_functions.h" +#include "ardour/transient_detector.h" #include "i18n.h" #include <locale.h> diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index 24ca406b38..25094389a0 100644 --- a/libs/ardour/audiosource.cc +++ b/libs/ardour/audiosource.cc @@ -34,14 +34,14 @@ #include <glibmm/fileutils.h> #include <glibmm/miscutils.h> -#include <pbd/xml++.h> -#include <pbd/pthread_utils.h> - -#include <ardour/audiosource.h> -#include <ardour/cycle_timer.h> -#include <ardour/session.h> -#include <ardour/transient_detector.h> -#include <ardour/runtime_functions.h> +#include "pbd/xml++.h" +#include "pbd/pthread_utils.h" + +#include "ardour/audiosource.h" +#include "ardour/cycle_timer.h" +#include "ardour/session.h" +#include "ardour/transient_detector.h" +#include "ardour/runtime_functions.h" #include "i18n.h" diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index d6f63c2f9d..f499bbf612 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -19,18 +19,18 @@ #include <glibmm/thread.h> -#include <pbd/error.h> - -#include <ardour/audio_diskstream.h> -#include <ardour/audioregion.h> -#include <ardour/audioengine.h> -#include <ardour/route.h> -#include <ardour/session.h> -#include <ardour/auditioner.h> -#include <ardour/audioplaylist.h> -#include <ardour/panner.h> -#include <ardour/data_type.h> -#include <ardour/region_factory.h> +#include "pbd/error.h" + +#include "ardour/audio_diskstream.h" +#include "ardour/audioregion.h" +#include "ardour/audioengine.h" +#include "ardour/route.h" +#include "ardour/session.h" +#include "ardour/auditioner.h" +#include "ardour/audioplaylist.h" +#include "ardour/panner.h" +#include "ardour/data_type.h" +#include "ardour/region_factory.h" using namespace std; using namespace ARDOUR; diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc index ce5d37ab4b..c43623b358 100644 --- a/libs/ardour/automatable.cc +++ b/libs/ardour/automatable.cc @@ -17,20 +17,20 @@ */ -#include <ardour/ardour.h> +#include "ardour/ardour.h" #include <fstream> #include <inttypes.h> #include <cstdio> #include <errno.h> -#include <pbd/error.h> -#include <pbd/enumwriter.h> -#include <midi++/names.h> -#include <ardour/automatable.h> -#include <ardour/event_type_map.h> -#include <ardour/midi_track.h> -#include <ardour/panner.h> -#include <ardour/plugin_insert.h> -#include <ardour/session.h> +#include "pbd/error.h" +#include "pbd/enumwriter.h" +#include "midi++/names.h" +#include "ardour/automatable.h" +#include "ardour/event_type_map.h" +#include "ardour/midi_track.h" +#include "ardour/panner.h" +#include "ardour/plugin_insert.h" +#include "ardour/session.h" #include "i18n.h" diff --git a/libs/ardour/automation_control.cc b/libs/ardour/automation_control.cc index 85dea59324..ef54705e03 100644 --- a/libs/ardour/automation_control.cc +++ b/libs/ardour/automation_control.cc @@ -19,10 +19,10 @@ */ #include <iostream> -#include <ardour/automatable.h> -#include <ardour/automation_control.h> -#include <ardour/event_type_map.h> -#include <ardour/session.h> +#include "ardour/automatable.h" +#include "ardour/automation_control.h" +#include "ardour/event_type_map.h" +#include "ardour/session.h" using namespace std; using namespace ARDOUR; diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index 7493df26ac..4098301eaa 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -24,11 +24,11 @@ #include <sstream> #include <algorithm> #include <sigc++/bind.h> -#include <ardour/automation_list.h> -#include <ardour/event_type_map.h> -#include <evoral/Curve.hpp> -#include <pbd/stacktrace.h> -#include <pbd/enumwriter.h> +#include "ardour/automation_list.h" +#include "ardour/event_type_map.h" +#include "evoral/Curve.hpp" +#include "pbd/stacktrace.h" +#include "pbd/enumwriter.h" #include "i18n.h" diff --git a/libs/ardour/beats_frames_converter.cc b/libs/ardour/beats_frames_converter.cc index d6f7ab8a9e..f3d4840f34 100644 --- a/libs/ardour/beats_frames_converter.cc +++ b/libs/ardour/beats_frames_converter.cc @@ -19,10 +19,10 @@ $Id: midiregion.h 733 2006-08-01 17:19:38Z drobilla $ */ -#include <ardour/audioengine.h> -#include <ardour/beats_frames_converter.h> -#include <ardour/session.h> -#include <ardour/tempo.h> +#include "ardour/audioengine.h" +#include "ardour/beats_frames_converter.h" +#include "ardour/session.h" +#include "ardour/tempo.h" namespace ARDOUR { diff --git a/libs/ardour/broadcast_info.cc b/libs/ardour/broadcast_info.cc index b4a5427945..bf8c0b5260 100644 --- a/libs/ardour/broadcast_info.cc +++ b/libs/ardour/broadcast_info.cc @@ -18,18 +18,18 @@ */ -#include <ardour/broadcast_info.h> +#include "ardour/broadcast_info.h" #include <sstream> #include <iomanip> #include <glibmm.h> -#include <ardour/svn_revision.h> -#include <ardour/ardour.h> -#include <ardour/session.h> +#include "ardour/svn_revision.h" +#include "ardour/ardour.h" +#include "ardour/session.h" -#include <pbd/convert.h> +#include "pbd/convert.h" using namespace PBD; diff --git a/libs/ardour/buffer.cc b/libs/ardour/buffer.cc index 8abe238a47..14154810da 100644 --- a/libs/ardour/buffer.cc +++ b/libs/ardour/buffer.cc @@ -16,9 +16,9 @@ 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ardour/buffer.h> -#include <ardour/audio_buffer.h> -#include <ardour/midi_buffer.h> +#include "ardour/buffer.h" +#include "ardour/audio_buffer.h" +#include "ardour/midi_buffer.h" #ifdef __x86_64__ static const int CPU_CACHE_ALIGN = 64; diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc index 09fd880451..a2dd110941 100644 --- a/libs/ardour/buffer_set.cc +++ b/libs/ardour/buffer_set.cc @@ -18,10 +18,10 @@ #include <iostream> #include <algorithm> -#include <ardour/buffer_set.h> -#include <ardour/buffer.h> -#include <ardour/port.h> -#include <ardour/port_set.h> +#include "ardour/buffer_set.h" +#include "ardour/buffer.h" +#include "ardour/port.h" +#include "ardour/port_set.h" namespace ARDOUR { diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc index fc109c33a9..98d056a8f1 100644 --- a/libs/ardour/bundle.cc +++ b/libs/ardour/bundle.cc @@ -19,12 +19,12 @@ #include <algorithm> -#include <pbd/failed_constructor.h> -#include <ardour/ardour.h> -#include <ardour/bundle.h> -#include <ardour/audioengine.h> -#include <ardour/port.h> -#include <pbd/xml++.h> +#include "pbd/failed_constructor.h" +#include "ardour/ardour.h" +#include "ardour/bundle.h" +#include "ardour/audioengine.h" +#include "ardour/port.h" +#include "pbd/xml++.h" #include "i18n.h" diff --git a/libs/ardour/caimportable.cc b/libs/ardour/caimportable.cc index 229bfa8809..37e8f487f2 100644 --- a/libs/ardour/caimportable.cc +++ b/libs/ardour/caimportable.cc @@ -1,6 +1,6 @@ -#include <ardour/caimportable.h> +#include "ardour/caimportable.h" #include <sndfile.h> -#include <pbd/error.h> +#include "pbd/error.h" #include "i18n.h" diff --git a/libs/ardour/chan_count.cc b/libs/ardour/chan_count.cc index b6f51a4d95..eb5033bcfc 100644 --- a/libs/ardour/chan_count.cc +++ b/libs/ardour/chan_count.cc @@ -20,7 +20,7 @@ #define __STDC_LIMIT_MACROS 1 #include <stdint.h> -#include <ardour/chan_count.h> +#include "ardour/chan_count.h" namespace ARDOUR { diff --git a/libs/ardour/configuration.cc b/libs/ardour/configuration.cc index d322ab4e49..bf8facd1a4 100644 --- a/libs/ardour/configuration.cc +++ b/libs/ardour/configuration.cc @@ -24,18 +24,18 @@ #include <glib/gstdio.h> /* for g_stat() */ #include <glibmm/miscutils.h> -#include <pbd/failed_constructor.h> -#include <pbd/xml++.h> -#include <pbd/filesystem.h> -#include <pbd/file_utils.h> - -#include <midi++/manager.h> - -#include <ardour/ardour.h> -#include <ardour/configuration.h> -#include <ardour/audio_diskstream.h> -#include <ardour/control_protocol_manager.h> -#include <ardour/filesystem_paths.h> +#include "pbd/failed_constructor.h" +#include "pbd/xml++.h" +#include "pbd/filesystem.h" +#include "pbd/file_utils.h" + +#include "midi++/manager.h" + +#include "ardour/ardour.h" +#include "ardour/configuration.h" +#include "ardour/audio_diskstream.h" +#include "ardour/control_protocol_manager.h" +#include "ardour/filesystem_paths.h" #include "i18n.h" diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 11c18175d1..9ac0b360f9 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -19,15 +19,15 @@ #include <dlfcn.h> -#include <pbd/compose.h> -#include <pbd/file_utils.h> -#include <pbd/error.h> +#include "pbd/compose.h" +#include "pbd/file_utils.h" +#include "pbd/error.h" #include <control_protocol/control_protocol.h> -#include <ardour/session.h> -#include <ardour/control_protocol_manager.h> -#include <ardour/control_protocol_search_path.h> +#include "ardour/session.h" +#include "ardour/control_protocol_manager.h" +#include "ardour/control_protocol_search_path.h" using namespace ARDOUR; using namespace std; diff --git a/libs/ardour/control_protocol_search_path.cc b/libs/ardour/control_protocol_search_path.cc index 713ef30e65..e2b4137565 100644 --- a/libs/ardour/control_protocol_search_path.cc +++ b/libs/ardour/control_protocol_search_path.cc @@ -19,9 +19,9 @@ #include <glibmm/miscutils.h> -#include <ardour/control_protocol_search_path.h> -#include <ardour/directory_names.h> -#include <ardour/filesystem_paths.h> +#include "ardour/control_protocol_search_path.h" +#include "ardour/directory_names.h" +#include "ardour/filesystem_paths.h" namespace { const char * const surfaces_env_variable_name = "ARDOUR_SURFACES_PATH"; diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc index 18b9a82ec6..95cae8c4ee 100644 --- a/libs/ardour/coreaudiosource.cc +++ b/libs/ardour/coreaudiosource.cc @@ -22,9 +22,9 @@ #define __STDC_FORMAT_MACROS #include <inttypes.h> -#include <pbd/error.h> -#include <ardour/coreaudiosource.h> -#include <ardour/utils.h> +#include "pbd/error.h" +#include "ardour/coreaudiosource.h" +#include "ardour/utils.h" #include <appleutility/CAAudioFile.h> #include <appleutility/CAStreamBasicDescription.h> diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc index 9d10f1d1cc..8aad53765a 100644 --- a/libs/ardour/crossfade.cc +++ b/libs/ardour/crossfade.cc @@ -19,16 +19,16 @@ #include <sigc++/bind.h> -#include <pbd/stacktrace.h> - -#include <ardour/types.h> -#include <ardour/crossfade.h> -#include <ardour/crossfade_compare.h> -#include <ardour/audioregion.h> -#include <ardour/playlist.h> -#include <ardour/utils.h> -#include <ardour/session.h> -#include <ardour/source.h> +#include "pbd/stacktrace.h" + +#include "ardour/types.h" +#include "ardour/crossfade.h" +#include "ardour/crossfade_compare.h" +#include "ardour/audioregion.h" +#include "ardour/playlist.h" +#include "ardour/utils.h" +#include "ardour/session.h" +#include "ardour/source.h" #include "i18n.h" #include <locale.h> diff --git a/libs/ardour/cycle_timer.cc b/libs/ardour/cycle_timer.cc index 143cb841ec..e7cfc9402c 100644 --- a/libs/ardour/cycle_timer.cc +++ b/libs/ardour/cycle_timer.cc @@ -18,8 +18,8 @@ */ #include <cstdio> -#include <pbd/error.h> -#include <ardour/cycle_timer.h> +#include "pbd/error.h" +#include "ardour/cycle_timer.h" #include "i18n.h" diff --git a/libs/ardour/default_click.cc b/libs/ardour/default_click.cc index 5bdbeb2ac5..585d660809 100644 --- a/libs/ardour/default_click.cc +++ b/libs/ardour/default_click.cc @@ -18,8 +18,8 @@ */ -#include <ardour/ardour.h> -#include <ardour/session.h> +#include "ardour/ardour.h" +#include "ardour/session.h" using namespace ARDOUR; diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc index 0480ddc8ba..6afcfb4353 100644 --- a/libs/ardour/directory_names.cc +++ b/libs/ardour/directory_names.cc @@ -1,4 +1,4 @@ -#include <ardour/directory_names.h> +#include "ardour/directory_names.h" #include "i18n.h" diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index d277e4c37e..4cce7d4dc3 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -33,26 +33,26 @@ #include <sigc++/bind.h> -#include <pbd/error.h> -#include <pbd/basename.h> +#include "pbd/error.h" +#include "pbd/basename.h" #include <glibmm/thread.h> -#include <pbd/xml++.h> -#include <pbd/memento_command.h> - -#include <ardour/ardour.h> -#include <ardour/audioengine.h> -#include <ardour/diskstream.h> -#include <ardour/utils.h> -#include <ardour/configuration.h> -#include <ardour/audiofilesource.h> -#include <ardour/send.h> -#include <ardour/playlist.h> -#include <ardour/cycle_timer.h> -#include <ardour/region.h> -#include <ardour/panner.h> -#include <ardour/session.h> -#include <ardour/io.h> -#include <ardour/route.h> +#include "pbd/xml++.h" +#include "pbd/memento_command.h" + +#include "ardour/ardour.h" +#include "ardour/audioengine.h" +#include "ardour/diskstream.h" +#include "ardour/utils.h" +#include "ardour/configuration.h" +#include "ardour/audiofilesource.h" +#include "ardour/send.h" +#include "ardour/playlist.h" +#include "ardour/cycle_timer.h" +#include "ardour/region.h" +#include "ardour/panner.h" +#include "ardour/session.h" +#include "ardour/io.h" +#include "ardour/route.h" #include "i18n.h" #include <locale.h> diff --git a/libs/ardour/element_import_handler.cc b/libs/ardour/element_import_handler.cc index 3169da436e..53b5741622 100644 --- a/libs/ardour/element_import_handler.cc +++ b/libs/ardour/element_import_handler.cc @@ -18,7 +18,7 @@ */ -#include <ardour/element_import_handler.h> +#include "ardour/element_import_handler.h" #include <algorithm> diff --git a/libs/ardour/element_importer.cc b/libs/ardour/element_importer.cc index 580c2876ad..500ad87147 100644 --- a/libs/ardour/element_importer.cc +++ b/libs/ardour/element_importer.cc @@ -18,13 +18,13 @@ */ -#include <ardour/element_importer.h> +#include "ardour/element_importer.h" #include <sstream> #include <iomanip> -#include <pbd/convert.h> -#include <ardour/session.h> +#include "pbd/convert.h" +#include "ardour/session.h" #include "i18n.h" diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index 48a78fe508..c61f38c922 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -17,21 +17,21 @@ */ -#include <pbd/enumwriter.h> - -#include <ardour/types.h> -#include <ardour/session.h> -#include <ardour/location.h> -#include <ardour/audiofilesource.h> -#include <ardour/diskstream.h> -#include <ardour/audioregion.h> -#include <ardour/route_group.h> -#include <ardour/panner.h> -#include <ardour/track.h> -#include <ardour/midi_track.h> -#include <ardour/export_filename.h> -#include <ardour/export_format_base.h> -#include <ardour/export_profile_manager.h> +#include "pbd/enumwriter.h" + +#include "ardour/types.h" +#include "ardour/session.h" +#include "ardour/location.h" +#include "ardour/audiofilesource.h" +#include "ardour/diskstream.h" +#include "ardour/audioregion.h" +#include "ardour/route_group.h" +#include "ardour/panner.h" +#include "ardour/track.h" +#include "ardour/midi_track.h" +#include "ardour/export_filename.h" +#include "ardour/export_format_base.h" +#include "ardour/export_profile_manager.h" using namespace std; using namespace PBD; diff --git a/libs/ardour/event_type_map.cc b/libs/ardour/event_type_map.cc index 063090cef9..e23a69ebbc 100644 --- a/libs/ardour/event_type_map.cc +++ b/libs/ardour/event_type_map.cc @@ -18,13 +18,13 @@ */ -#include <ardour/types.h> -#include <ardour/event_type_map.h> -#include <evoral/Parameter.hpp> -#include <evoral/midi_events.h> -#include <evoral/MIDIParameters.hpp> -#include <pbd/error.h> -#include <pbd/compose.h> +#include "ardour/types.h" +#include "ardour/event_type_map.h" +#include "evoral/Parameter.hpp" +#include "evoral/midi_events.h" +#include "evoral/MIDIParameters.hpp" +#include "pbd/error.h" +#include "pbd/compose.h" using namespace std; diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index 42138453e6..58110ea5a9 100644 --- a/libs/ardour/export_channel.cc +++ b/libs/ardour/export_channel.cc @@ -18,13 +18,13 @@ */ -#include <ardour/audio_buffer.h> -#include <ardour/audio_port.h> -#include <ardour/audio_track.h> -#include <ardour/audioengine.h> -#include <ardour/export_channel.h> -#include <ardour/export_failed.h> -#include <ardour/session.h> +#include "ardour/audio_buffer.h" +#include "ardour/audio_port.h" +#include "ardour/audio_track.h" +#include "ardour/audioengine.h" +#include "ardour/export_channel.h" +#include "ardour/export_failed.h" +#include "ardour/session.h" using namespace ARDOUR; diff --git a/libs/ardour/export_channel_configuration.cc b/libs/ardour/export_channel_configuration.cc index c8db1a6b0d..b835cca559 100644 --- a/libs/ardour/export_channel_configuration.cc +++ b/libs/ardour/export_channel_configuration.cc @@ -18,21 +18,21 @@ */ -#include <ardour/export_channel_configuration.h> +#include "ardour/export_channel_configuration.h" -#include <ardour/export_handler.h> -#include <ardour/export_filename.h> -#include <ardour/export_processor.h> -#include <ardour/export_timespan.h> +#include "ardour/export_handler.h" +#include "ardour/export_filename.h" +#include "ardour/export_processor.h" +#include "ardour/export_timespan.h" -#include <ardour/audio_port.h> -#include <ardour/export_failed.h> -#include <ardour/midi_port.h> -#include <ardour/session.h> -#include <ardour/audioengine.h> +#include "ardour/audio_port.h" +#include "ardour/export_failed.h" +#include "ardour/midi_port.h" +#include "ardour/session.h" +#include "ardour/audioengine.h" -#include <pbd/convert.h> -#include <pbd/pthread_utils.h> +#include "pbd/convert.h" +#include "pbd/pthread_utils.h" namespace ARDOUR { diff --git a/libs/ardour/export_file_io.cc b/libs/ardour/export_file_io.cc index 793b1dbea4..ebf6ff53b8 100644 --- a/libs/ardour/export_file_io.cc +++ b/libs/ardour/export_file_io.cc @@ -20,10 +20,10 @@ #include <string.h> -#include <ardour/export_file_io.h> +#include "ardour/export_file_io.h" -#include <ardour/export_failed.h> -#include <pbd/failed_constructor.h> +#include "ardour/export_failed.h" +#include "pbd/failed_constructor.h" #include "i18n.h" diff --git a/libs/ardour/export_filename.cc b/libs/ardour/export_filename.cc index b6f59d1a93..d2453caf37 100644 --- a/libs/ardour/export_filename.cc +++ b/libs/ardour/export_filename.cc @@ -18,18 +18,18 @@ */ -#include <ardour/export_filename.h> +#include "ardour/export_filename.h" -#include <pbd/xml++.h> -#include <pbd/convert.h> -#include <pbd/enumwriter.h> +#include "pbd/xml++.h" +#include "pbd/convert.h" +#include "pbd/enumwriter.h" -#include <ardour/session.h> -#include <ardour/session_directory.h> -#include <ardour/export_timespan.h> -#include <ardour/export_format_specification.h> -#include <ardour/export_channel_configuration.h> -#include <ardour/export_failed.h> +#include "ardour/session.h" +#include "ardour/session_directory.h" +#include "ardour/export_timespan.h" +#include "ardour/export_format_specification.h" +#include "ardour/export_channel_configuration.h" +#include "ardour/export_failed.h" #include "i18n.h" diff --git a/libs/ardour/export_format_base.cc b/libs/ardour/export_format_base.cc index bddd61d0ab..f2570f8f65 100644 --- a/libs/ardour/export_format_base.cc +++ b/libs/ardour/export_format_base.cc @@ -18,7 +18,7 @@ */ -#include <ardour/export_format_base.h> +#include "ardour/export_format_base.h" namespace ARDOUR { diff --git a/libs/ardour/export_format_manager.cc b/libs/ardour/export_format_manager.cc index 2a41a8b150..924b294583 100644 --- a/libs/ardour/export_format_manager.cc +++ b/libs/ardour/export_format_manager.cc @@ -18,11 +18,11 @@ */ -#include <ardour/export_format_manager.h> +#include "ardour/export_format_manager.h" -#include <ardour/types.h> -#include <ardour/export_format_specification.h> -#include <ardour/export_format_compatibility.h> +#include "ardour/types.h" +#include "ardour/export_format_specification.h" +#include "ardour/export_format_compatibility.h" #include "i18n.h" diff --git a/libs/ardour/export_format_specification.cc b/libs/ardour/export_format_specification.cc index c317b38b17..c0325509b1 100644 --- a/libs/ardour/export_format_specification.cc +++ b/libs/ardour/export_format_specification.cc @@ -18,18 +18,18 @@ */ -#include <ardour/export_format_specification.h> +#include "ardour/export_format_specification.h" #include <sstream> -#include <ardour/export_format_compatibility.h> -#include <ardour/export_formats.h> -#include <ardour/session.h> +#include "ardour/export_format_compatibility.h" +#include "ardour/export_formats.h" +#include "ardour/session.h" -#include <pbd/error.h> -#include <pbd/xml++.h> -#include <pbd/enumwriter.h> -#include <pbd/convert.h> +#include "pbd/error.h" +#include "pbd/xml++.h" +#include "pbd/enumwriter.h" +#include "pbd/convert.h" #include "i18n.h" diff --git a/libs/ardour/export_formats.cc b/libs/ardour/export_formats.cc index 9e77bb2f1d..d6337b0a5f 100644 --- a/libs/ardour/export_formats.cc +++ b/libs/ardour/export_formats.cc @@ -18,7 +18,7 @@ */ -#include <ardour/export_formats.h> +#include "ardour/export_formats.h" #include "i18n.h" diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index b48522670b..c26ba7e1b3 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -18,20 +18,20 @@ */ -#include <ardour/export_handler.h> - -#include <pbd/convert.h> -#include <pbd/filesystem.h> - -#include <ardour/ardour.h> -#include <ardour/configuration.h> -#include <ardour/export_timespan.h> -#include <ardour/export_channel_configuration.h> -#include <ardour/export_status.h> -#include <ardour/export_format_specification.h> -#include <ardour/export_filename.h> -#include <ardour/export_processor.h> -#include <ardour/export_failed.h> +#include "ardour/export_handler.h" + +#include "pbd/convert.h" +#include "pbd/filesystem.h" + +#include "ardour/ardour.h" +#include "ardour/configuration.h" +#include "ardour/export_timespan.h" +#include "ardour/export_channel_configuration.h" +#include "ardour/export_status.h" +#include "ardour/export_format_specification.h" +#include "ardour/export_filename.h" +#include "ardour/export_processor.h" +#include "ardour/export_failed.h" using namespace PBD; using std::ofstream; diff --git a/libs/ardour/export_preset.cc b/libs/ardour/export_preset.cc index 69c5775d12..b8e5098767 100644 --- a/libs/ardour/export_preset.cc +++ b/libs/ardour/export_preset.cc @@ -18,9 +18,9 @@ */ -#include <ardour/export_preset.h> +#include "ardour/export_preset.h" -#include <ardour/session.h> +#include "ardour/session.h" using namespace ARDOUR; diff --git a/libs/ardour/export_processor.cc b/libs/ardour/export_processor.cc index 8659514dbf..19ff9ac001 100644 --- a/libs/ardour/export_processor.cc +++ b/libs/ardour/export_processor.cc @@ -18,18 +18,18 @@ */ -#include <ardour/export_processor.h> +#include "ardour/export_processor.h" -#include <pbd/error.h> -#include <pbd/filesystem.h> +#include "pbd/error.h" +#include "pbd/filesystem.h" -#include <ardour/session.h> -#include <ardour/audiofile_tagger.h> -#include <ardour/broadcast_info.h> -#include <ardour/export_failed.h> -#include <ardour/export_filename.h> -#include <ardour/export_status.h> -#include <ardour/export_format_specification.h> +#include "ardour/session.h" +#include "ardour/audiofile_tagger.h" +#include "ardour/broadcast_info.h" +#include "ardour/export_failed.h" +#include "ardour/export_filename.h" +#include "ardour/export_status.h" +#include "ardour/export_format_specification.h" #include "i18n.h" diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc index 2576620ec2..c0a537b927 100644 --- a/libs/ardour/export_profile_manager.cc +++ b/libs/ardour/export_profile_manager.cc @@ -18,27 +18,27 @@ */ -#include <ardour/export_profile_manager.h> +#include "ardour/export_profile_manager.h" #include <cassert> #include <stdexcept> #include <glibmm/fileutils.h> -#include <pbd/enumwriter.h> -#include <pbd/xml++.h> -#include <pbd/convert.h> - -#include <ardour/export_failed.h> -#include <ardour/export_file_io.h> -#include <ardour/export_format_specification.h> -#include <ardour/export_timespan.h> -#include <ardour/export_channel_configuration.h> -#include <ardour/export_filename.h> -#include <ardour/export_preset.h> -#include <ardour/export_handler.h> -#include <ardour/filename_extensions.h> -#include <ardour/session.h> +#include "pbd/enumwriter.h" +#include "pbd/xml++.h" +#include "pbd/convert.h" + +#include "ardour/export_failed.h" +#include "ardour/export_file_io.h" +#include "ardour/export_format_specification.h" +#include "ardour/export_timespan.h" +#include "ardour/export_channel_configuration.h" +#include "ardour/export_filename.h" +#include "ardour/export_preset.h" +#include "ardour/export_handler.h" +#include "ardour/filename_extensions.h" +#include "ardour/session.h" #include "i18n.h" diff --git a/libs/ardour/export_status.cc b/libs/ardour/export_status.cc index af144746f7..c575ee79be 100644 --- a/libs/ardour/export_status.cc +++ b/libs/ardour/export_status.cc @@ -18,7 +18,7 @@ */ -#include <ardour/export_status.h> +#include "ardour/export_status.h" namespace ARDOUR { diff --git a/libs/ardour/export_timespan.cc b/libs/ardour/export_timespan.cc index 4eb5b5a475..60654cf06a 100644 --- a/libs/ardour/export_timespan.cc +++ b/libs/ardour/export_timespan.cc @@ -18,12 +18,12 @@ */ -#include <ardour/export_timespan.h> +#include "ardour/export_timespan.h" -#include <ardour/export_channel_configuration.h> -#include <ardour/export_filename.h> -#include <ardour/export_file_io.h> -#include <ardour/export_failed.h> +#include "ardour/export_channel_configuration.h" +#include "ardour/export_filename.h" +#include "ardour/export_file_io.h" +#include "ardour/export_failed.h" namespace ARDOUR { diff --git a/libs/ardour/export_utilities.cc b/libs/ardour/export_utilities.cc index a15a110731..79934f19e7 100644 --- a/libs/ardour/export_utilities.cc +++ b/libs/ardour/export_utilities.cc @@ -35,14 +35,14 @@ /* ...*/ -#include <ardour/export_utilities.h> +#include "ardour/export_utilities.h" #include <string.h> -#include <ardour/export_failed.h> -#include <ardour/gdither.h> -#include <ardour/dB.h> -#include <pbd/failed_constructor.h> +#include "ardour/export_failed.h" +#include "ardour/gdither.h" +#include "ardour/dB.h" +#include "pbd/failed_constructor.h" #include "i18n.h" diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc index 649fc6156b..38c968a589 100644 --- a/libs/ardour/file_source.cc +++ b/libs/ardour/file_source.cc @@ -26,23 +26,23 @@ #include <fcntl.h> #include <errno.h> -#include <pbd/convert.h> -#include <pbd/basename.h> -#include <pbd/mountpoint.h> -#include <pbd/stl_delete.h> -#include <pbd/strsplit.h> -#include <pbd/shortpath.h> -#include <pbd/enumwriter.h> +#include "pbd/convert.h" +#include "pbd/basename.h" +#include "pbd/mountpoint.h" +#include "pbd/stl_delete.h" +#include "pbd/strsplit.h" +#include "pbd/shortpath.h" +#include "pbd/enumwriter.h" #include <glibmm/miscutils.h> #include <glibmm/fileutils.h> #include <glibmm/thread.h> -#include <ardour/file_source.h> -#include <ardour/session.h> -#include <ardour/session_directory.h> -#include <ardour/source_factory.h> -#include <ardour/filename_extensions.h> +#include "ardour/file_source.h" +#include "ardour/session.h" +#include "ardour/session_directory.h" +#include "ardour/source_factory.h" +#include "ardour/filename_extensions.h" #include "i18n.h" diff --git a/libs/ardour/filename_extensions.cc b/libs/ardour/filename_extensions.cc index d018dc7f4a..c4ca3b07d4 100644 --- a/libs/ardour/filename_extensions.cc +++ b/libs/ardour/filename_extensions.cc @@ -1,4 +1,4 @@ -#include <ardour/filename_extensions.h> +#include "ardour/filename_extensions.h" #include "i18n.h" diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc index d36bce2146..a13b7fc45f 100644 --- a/libs/ardour/filesystem_paths.cc +++ b/libs/ardour/filesystem_paths.cc @@ -17,13 +17,13 @@ */ -#include <pbd/error.h> -#include <pbd/filesystem_paths.h> +#include "pbd/error.h" +#include "pbd/filesystem_paths.h" #include <glibmm/miscutils.h> -#include <ardour/directory_names.h> -#include <ardour/filesystem_paths.h> +#include "ardour/directory_names.h" +#include "ardour/filesystem_paths.h" #define WITH_STATIC_PATHS 1 diff --git a/libs/ardour/filter.cc b/libs/ardour/filter.cc index 30393a145d..14cec979a9 100644 --- a/libs/ardour/filter.cc +++ b/libs/ardour/filter.cc @@ -20,15 +20,15 @@ #include <time.h> #include <cerrno> -#include <pbd/basename.h> -#include <ardour/sndfilesource.h> -#include <ardour/smf_source.h> -#include <ardour/session.h> -#include <ardour/region.h> -#include <ardour/filter.h> -#include <ardour/region_factory.h> -#include <ardour/source_factory.h> -#include <ardour/analyser.h> +#include "pbd/basename.h" +#include "ardour/sndfilesource.h" +#include "ardour/smf_source.h" +#include "ardour/session.h" +#include "ardour/region.h" +#include "ardour/filter.h" +#include "ardour/region_factory.h" +#include "ardour/source_factory.h" +#include "ardour/analyser.h" #include "i18n.h" diff --git a/libs/ardour/find_session.cc b/libs/ardour/find_session.cc index 4388d8e299..417902b805 100644 --- a/libs/ardour/find_session.cc +++ b/libs/ardour/find_session.cc @@ -5,12 +5,12 @@ #include <climits> #include <cerrno> -#include <pbd/compose.h> -#include <pbd/error.h> +#include "pbd/compose.h" +#include "pbd/error.h" -#include <ardour/session_utils.h> -#include <ardour/filename_extensions.h> -#include <ardour/utils.h> +#include "ardour/session_utils.h" +#include "ardour/filename_extensions.h" +#include "ardour/utils.h" #include "i18n.h" diff --git a/libs/ardour/gain.cc b/libs/ardour/gain.cc index dd385e513c..62b96d345e 100644 --- a/libs/ardour/gain.cc +++ b/libs/ardour/gain.cc @@ -17,7 +17,7 @@ */ -#include <ardour/gain.h> +#include "ardour/gain.h" using namespace ARDOUR; diff --git a/libs/ardour/gdither.cc b/libs/ardour/gdither.cc index ac47a0a61e..7ad9bebd6d 100644 --- a/libs/ardour/gdither.cc +++ b/libs/ardour/gdither.cc @@ -17,9 +17,9 @@ * */ -#include <ardour/gdither_types_internal.h> -#include <ardour/gdither.h> -#include <ardour/noise.h> +#include "ardour/gdither_types_internal.h" +#include "ardour/gdither.h" +#include "ardour/noise.h" /* this monstrosity is necessary to get access to lrintf() and random(). whoever is writing the glibc headers <cmath> and <cstdlib> should be diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index c6c56f99a4..b1b934c43f 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -31,7 +31,7 @@ #endif #ifdef HAVE_AUDIOUNITS -#include <ardour/audio_unit.h> +#include "ardour/audio_unit.h" #endif #ifdef __SSE__ @@ -43,32 +43,32 @@ #include <lrdf.h> -#include <pbd/error.h> -#include <pbd/id.h> -#include <pbd/strsplit.h> -#include <pbd/fpu.h> -#include <pbd/file_utils.h> - -#include <midi++/port.h> -#include <midi++/manager.h> -#include <midi++/mmc.h> - -#include <ardour/ardour.h> -#include <ardour/analyser.h> -#include <ardour/audio_library.h> -#include <ardour/configuration.h> -#include <ardour/profile.h> -#include <ardour/plugin_manager.h> -#include <ardour/audiosource.h> -#include <ardour/utils.h> -#include <ardour/session.h> -#include <ardour/source_factory.h> -#include <ardour/control_protocol_manager.h> -#include <ardour/audioengine.h> -#include <ardour/filesystem_paths.h> - -#include <ardour/mix.h> -#include <ardour/runtime_functions.h> +#include "pbd/error.h" +#include "pbd/id.h" +#include "pbd/strsplit.h" +#include "pbd/fpu.h" +#include "pbd/file_utils.h" + +#include "midi++/port.h" +#include "midi++/manager.h" +#include "midi++/mmc.h" + +#include "ardour/ardour.h" +#include "ardour/analyser.h" +#include "ardour/audio_library.h" +#include "ardour/configuration.h" +#include "ardour/profile.h" +#include "ardour/plugin_manager.h" +#include "ardour/audiosource.h" +#include "ardour/utils.h" +#include "ardour/session.h" +#include "ardour/source_factory.h" +#include "ardour/control_protocol_manager.h" +#include "ardour/audioengine.h" +#include "ardour/filesystem_paths.h" + +#include "ardour/mix.h" +#include "ardour/runtime_functions.h" #if defined (__APPLE__) #include <Carbon/Carbon.h> // For Gestalt diff --git a/libs/ardour/i18n.h b/libs/ardour/i18n.h index 5d68c79edd..dcbbfcf52e 100644 --- a/libs/ardour/i18n.h +++ b/libs/ardour/i18n.h @@ -1,8 +1,8 @@ #ifndef __i18n_h__ #define __i18n_h__ -#include <pbd/compose.h> -#include <pbd/convert.h> +#include "pbd/compose.h" +#include "pbd/convert.h" #include "gettext.h" #include <vector> diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index 306247f009..410d085142 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -34,30 +34,30 @@ #include <boost/scoped_array.hpp> #include <boost/shared_array.hpp> -#include <pbd/basename.h> -#include <pbd/convert.h> - -#include <evoral/SMF.hpp> - -#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/region_factory.h> -#include <ardour/source_factory.h> -#include <ardour/resampled_source.h> -#include <ardour/sndfileimportable.h> -#include <ardour/analyser.h> -#include <ardour/smf_source.h> -#include <ardour/tempo.h> +#include "pbd/basename.h" +#include "pbd/convert.h" + +#include "evoral/SMF.hpp" + +#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/region_factory.h" +#include "ardour/source_factory.h" +#include "ardour/resampled_source.h" +#include "ardour/sndfileimportable.h" +#include "ardour/analyser.h" +#include "ardour/smf_source.h" +#include "ardour/tempo.h" #ifdef HAVE_COREAUDIO #ifdef USE_COREAUDIO_FOR_FILE_IO -#include <ardour/caimportable.h> +#include "ardour/caimportable.h" #endif #endif diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 5e5f630ecb..8f7aac9029 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -27,23 +27,23 @@ #include <glibmm.h> #include <glibmm/thread.h> -#include <pbd/xml++.h> -#include <pbd/replace_all.h> -#include <pbd/unknown_type.h> - -#include <ardour/audioengine.h> -#include <ardour/io.h> -#include <ardour/route.h> -#include <ardour/port.h> -#include <ardour/audio_port.h> -#include <ardour/midi_port.h> -#include <ardour/session.h> -#include <ardour/cycle_timer.h> -#include <ardour/panner.h> -#include <ardour/buffer_set.h> -#include <ardour/meter.h> -#include <ardour/amp.h> -#include <ardour/user_bundle.h> +#include "pbd/xml++.h" +#include "pbd/replace_all.h" +#include "pbd/unknown_type.h" + +#include "ardour/audioengine.h" +#include "ardour/io.h" +#include "ardour/route.h" +#include "ardour/port.h" +#include "ardour/audio_port.h" +#include "ardour/midi_port.h" +#include "ardour/session.h" +#include "ardour/cycle_timer.h" +#include "ardour/panner.h" +#include "ardour/buffer_set.h" +#include "ardour/meter.h" +#include "ardour/amp.h" +#include "ardour/user_bundle.h" #include "i18n.h" diff --git a/libs/ardour/io_processor.cc b/libs/ardour/io_processor.cc index cf28e52ac3..0210f1d2d4 100644 --- a/libs/ardour/io_processor.cc +++ b/libs/ardour/io_processor.cc @@ -26,16 +26,16 @@ #include <sigc++/bind.h> -#include <pbd/xml++.h> -#include <pbd/enumwriter.h> - -#include <ardour/io_processor.h> -#include <ardour/session.h> -#include <ardour/utils.h> -#include <ardour/send.h> -#include <ardour/port_insert.h> -#include <ardour/plugin_insert.h> -#include <ardour/io.h> +#include "pbd/xml++.h" +#include "pbd/enumwriter.h" + +#include "ardour/io_processor.h" +#include "ardour/session.h" +#include "ardour/utils.h" +#include "ardour/send.h" +#include "ardour/port_insert.h" +#include "ardour/plugin_insert.h" +#include "ardour/io.h" #include "i18n.h" diff --git a/libs/ardour/jack_slave.cc b/libs/ardour/jack_slave.cc index b7160489ff..ebf309ac3b 100644 --- a/libs/ardour/jack_slave.cc +++ b/libs/ardour/jack_slave.cc @@ -23,8 +23,8 @@ #include <jack/jack.h> #include <jack/transport.h> -#include <ardour/slave.h> -#include <ardour/session.h> +#include "ardour/slave.h" +#include "ardour/session.h" #include "i18n.h" diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc index e7cdcc274d..a765be9861 100644 --- a/libs/ardour/ladspa_plugin.cc +++ b/libs/ardour/ladspa_plugin.cc @@ -32,20 +32,20 @@ #include <lrdf.h> -#include <pbd/compose.h> -#include <pbd/error.h> -#include <pbd/xml++.h> +#include "pbd/compose.h" +#include "pbd/error.h" +#include "pbd/xml++.h" -#include <midi++/manager.h> +#include "midi++/manager.h" -#include <ardour/ardour.h> -#include <ardour/session.h> -#include <ardour/audioengine.h> -#include <ardour/ladspa_plugin.h> -#include <ardour/buffer_set.h> -#include <ardour/audio_buffer.h> +#include "ardour/ardour.h" +#include "ardour/session.h" +#include "ardour/audioengine.h" +#include "ardour/ladspa_plugin.h" +#include "ardour/buffer_set.h" +#include "ardour/audio_buffer.h" -#include <pbd/stl_delete.h> +#include "pbd/stl_delete.h" #include "i18n.h" #include <locale.h> diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index be34e34349..ca0a56972e 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -25,13 +25,13 @@ #include <ctime> #include <sigc++/bind.h> -#include <pbd/stl_delete.h> -#include <pbd/xml++.h> -#include <pbd/enumwriter.h> +#include "pbd/stl_delete.h" +#include "pbd/xml++.h" +#include "pbd/enumwriter.h" -#include <ardour/location.h> -#include <ardour/session.h> -#include <ardour/audiofilesource.h> +#include "ardour/location.h" +#include "ardour/session.h" +#include "ardour/audiofilesource.h" #include "i18n.h" diff --git a/libs/ardour/location_importer.cc b/libs/ardour/location_importer.cc index 58a6e72f16..48a8cb1f67 100644 --- a/libs/ardour/location_importer.cc +++ b/libs/ardour/location_importer.cc @@ -18,14 +18,14 @@ */ -#include <ardour/location_importer.h> +#include "ardour/location_importer.h" #include <sstream> #include <stdexcept> -#include <ardour/session.h> -#include <pbd/convert.h> -#include <pbd/failed_constructor.h> +#include "ardour/session.h" +#include "pbd/convert.h" +#include "pbd/failed_constructor.h" #include "i18n.h" diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index ca24e94299..db3e82e2b5 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -25,18 +25,18 @@ #include <cmath> #include <cstring> -#include <pbd/compose.h> -#include <pbd/error.h> -#include <pbd/pathscanner.h> -#include <pbd/xml++.h> - -#include <ardour/ardour.h> -#include <ardour/session.h> -#include <ardour/audioengine.h> -#include <ardour/audio_buffer.h> -#include <ardour/lv2_plugin.h> - -#include <pbd/stl_delete.h> +#include "pbd/compose.h" +#include "pbd/error.h" +#include "pbd/pathscanner.h" +#include "pbd/xml++.h" + +#include "ardour/ardour.h" +#include "ardour/session.h" +#include "ardour/audioengine.h" +#include "ardour/audio_buffer.h" +#include "ardour/lv2_plugin.h" + +#include "pbd/stl_delete.h" #include "i18n.h" #include <locale.h> diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index af6b5a0a36..73ceb4b78e 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -16,16 +16,16 @@ 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ardour/meter.h> +#include "ardour/meter.h" #include <algorithm> #include <cmath> -#include <ardour/buffer_set.h> -#include <ardour/peak.h> -#include <ardour/dB.h> -#include <ardour/session.h> -#include <ardour/midi_buffer.h> -#include <ardour/audio_buffer.h> -#include <ardour/runtime_functions.h> +#include "ardour/buffer_set.h" +#include "ardour/peak.h" +#include "ardour/dB.h" +#include "ardour/session.h" +#include "ardour/midi_buffer.h" +#include "ardour/audio_buffer.h" +#include "ardour/runtime_functions.h" namespace ARDOUR { diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc index 8a7d67e2e6..7960edf565 100644 --- a/libs/ardour/midi_buffer.cc +++ b/libs/ardour/midi_buffer.cc @@ -18,7 +18,7 @@ */ #include <iostream> -#include <ardour/midi_buffer.h> +#include "ardour/midi_buffer.h" #ifdef __x86_64__ static const int CPU_CACHE_ALIGN = 64; diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc index 6bd6076948..c90a7ed0be 100644 --- a/libs/ardour/midi_clock_slave.cc +++ b/libs/ardour/midi_clock_slave.cc @@ -22,17 +22,17 @@ #include <poll.h> #include <sys/types.h> #include <unistd.h> -#include <pbd/error.h> -#include <pbd/failed_constructor.h> -#include <pbd/pthread_utils.h> - -#include <midi++/port.h> -#include <midi++/jack.h> -#include <ardour/slave.h> -#include <ardour/session.h> -#include <ardour/audioengine.h> -#include <ardour/cycles.h> -#include <ardour/tempo.h> +#include "pbd/error.h" +#include "pbd/failed_constructor.h" +#include "pbd/pthread_utils.h" + +#include "midi++/port.h" +#include "midi++/jack.h" +#include "ardour/slave.h" +#include "ardour/session.h" +#include "ardour/audioengine.h" +#include "ardour/cycles.h" +#include "ardour/tempo.h" #include "i18n.h" diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 9015979810..4acbb63f37 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -29,28 +29,28 @@ #include <sys/stat.h> #include <sys/mman.h> -#include <pbd/error.h> -#include <pbd/basename.h> +#include "pbd/error.h" +#include "pbd/basename.h" #include <glibmm/thread.h> -#include <pbd/xml++.h> -#include <pbd/memento_command.h> -#include <pbd/enumwriter.h> - -#include <ardour/ardour.h> -#include <ardour/audioengine.h> -#include <ardour/configuration.h> -#include <ardour/cycle_timer.h> -#include <ardour/io.h> -#include <ardour/midi_diskstream.h> -#include <ardour/midi_playlist.h> -#include <ardour/midi_port.h> -#include <ardour/midi_region.h> -#include <ardour/playlist_factory.h> -#include <ardour/region_factory.h> -#include <ardour/send.h> -#include <ardour/session.h> -#include <ardour/smf_source.h> -#include <ardour/utils.h> +#include "pbd/xml++.h" +#include "pbd/memento_command.h" +#include "pbd/enumwriter.h" + +#include "ardour/ardour.h" +#include "ardour/audioengine.h" +#include "ardour/configuration.h" +#include "ardour/cycle_timer.h" +#include "ardour/io.h" +#include "ardour/midi_diskstream.h" +#include "ardour/midi_playlist.h" +#include "ardour/midi_port.h" +#include "ardour/midi_region.h" +#include "ardour/playlist_factory.h" +#include "ardour/region_factory.h" +#include "ardour/send.h" +#include "ardour/session.h" +#include "ardour/smf_source.h" +#include "ardour/utils.h" #include "i18n.h" #include <locale.h> diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index e7eaf64d32..abf651207e 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -24,14 +24,14 @@ #include <algorithm> #include <stdexcept> #include <stdint.h> -#include <pbd/error.h> -#include <pbd/enumwriter.h> -#include <midi++/events.h> - -#include <ardour/midi_model.h> -#include <ardour/midi_source.h> -#include <ardour/types.h> -#include <ardour/session.h> +#include "pbd/error.h" +#include "pbd/enumwriter.h" +#include "midi++/events.h" + +#include "ardour/midi_model.h" +#include "ardour/midi_source.h" +#include "ardour/types.h" +#include "ardour/session.h" using namespace std; using namespace ARDOUR; diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc index cb1ba771f4..39a5be9b5a 100644 --- a/libs/ardour/midi_patch_manager.cc +++ b/libs/ardour/midi_patch_manager.cc @@ -21,7 +21,7 @@ #include <sigc++/sigc++.h> #include <boost/shared_ptr.hpp> -#include <pbd/file_utils.h> +#include "pbd/file_utils.h" #include "ardour/session.h" #include "ardour/session_directory.h" diff --git a/libs/ardour/midi_playlist.cc b/libs/ardour/midi_playlist.cc index 6105e6cfa2..0e4c65ce3f 100644 --- a/libs/ardour/midi_playlist.cc +++ b/libs/ardour/midi_playlist.cc @@ -25,14 +25,14 @@ #include <sigc++/bind.h> -#include <ardour/types.h> -#include <ardour/configuration.h> -#include <ardour/midi_playlist.h> -#include <ardour/midi_region.h> -#include <ardour/session.h> -#include <ardour/midi_ring_buffer.h> - -#include <pbd/error.h> +#include "ardour/types.h" +#include "ardour/configuration.h" +#include "ardour/midi_playlist.h" +#include "ardour/midi_region.h" +#include "ardour/session.h" +#include "ardour/midi_ring_buffer.h" + +#include "pbd/error.h" #include "i18n.h" diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc index 77e20d59b8..77f9a6cb43 100644 --- a/libs/ardour/midi_port.cc +++ b/libs/ardour/midi_port.cc @@ -19,8 +19,8 @@ #include <cassert> #include <iostream> -#include <ardour/midi_port.h> -#include <ardour/data_type.h> +#include "ardour/midi_port.h" +#include "ardour/data_type.h" using namespace ARDOUR; using namespace std; diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index a30b837c5f..066b410a09 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -29,18 +29,18 @@ #include <glibmm/thread.h> -#include <pbd/basename.h> -#include <pbd/xml++.h> -#include <pbd/enumwriter.h> - -#include <ardour/midi_region.h> -#include <ardour/session.h> -#include <ardour/gain.h> -#include <ardour/dB.h> -#include <ardour/playlist.h> -#include <ardour/midi_source.h> -#include <ardour/types.h> -#include <ardour/midi_ring_buffer.h> +#include "pbd/basename.h" +#include "pbd/xml++.h" +#include "pbd/enumwriter.h" + +#include "ardour/midi_region.h" +#include "ardour/session.h" +#include "ardour/gain.h" +#include "ardour/dB.h" +#include "ardour/playlist.h" +#include "ardour/midi_source.h" +#include "ardour/types.h" +#include "ardour/midi_ring_buffer.h" #include "i18n.h" #include <locale.h> diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index 7cb8cbb83e..6bb580f0a0 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -28,18 +28,18 @@ #include <iomanip> #include <algorithm> -#include <pbd/xml++.h> -#include <pbd/pthread_utils.h> -#include <pbd/basename.h> - -#include <ardour/audioengine.h> -#include <ardour/midi_model.h> -#include <ardour/midi_ring_buffer.h> -#include <ardour/midi_source.h> -#include <ardour/session.h> -#include <ardour/session_directory.h> -#include <ardour/source_factory.h> -#include <ardour/tempo.h> +#include "pbd/xml++.h" +#include "pbd/pthread_utils.h" +#include "pbd/basename.h" + +#include "ardour/audioengine.h" +#include "ardour/midi_model.h" +#include "ardour/midi_ring_buffer.h" +#include "ardour/midi_source.h" +#include "ardour/session.h" +#include "ardour/session_directory.h" +#include "ardour/source_factory.h" +#include "ardour/tempo.h" #include "i18n.h" diff --git a/libs/ardour/midi_state_tracker.cc b/libs/ardour/midi_state_tracker.cc index e1508717e4..2cb602db6f 100644 --- a/libs/ardour/midi_state_tracker.cc +++ b/libs/ardour/midi_state_tracker.cc @@ -18,8 +18,8 @@ */ #include <iostream> -#include <ardour/event_type_map.h> -#include <ardour/midi_state_tracker.h> +#include "ardour/event_type_map.h" +#include "ardour/midi_state_tracker.h" using namespace std; using namespace ARDOUR; diff --git a/libs/ardour/midi_stretch.cc b/libs/ardour/midi_stretch.cc index 88aa436b03..6fd67d05d2 100644 --- a/libs/ardour/midi_stretch.cc +++ b/libs/ardour/midi_stretch.cc @@ -18,12 +18,12 @@ */ -#include <pbd/error.h> +#include "pbd/error.h" -#include <ardour/types.h> -#include <ardour/midi_stretch.h> -#include <ardour/session.h> -#include <ardour/midi_region.h> +#include "ardour/types.h" +#include "ardour/midi_stretch.h" +#include "ardour/session.h" +#include "ardour/midi_region.h" #include "i18n.h" diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index aff7ed4d15..2df20ee547 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -16,28 +16,28 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <pbd/error.h> +#include "pbd/error.h" #include <sigc++/retype.h> #include <sigc++/retype_return.h> #include <sigc++/bind.h> -#include <pbd/enumwriter.h> -#include <midi++/events.h> -#include <evoral/midi_util.h> - -#include <ardour/midi_track.h> -#include <ardour/midi_diskstream.h> -#include <ardour/session.h> -#include <ardour/io_processor.h> -#include <ardour/midi_region.h> -#include <ardour/midi_source.h> -#include <ardour/route_group_specialized.h> -#include <ardour/processor.h> -#include <ardour/midi_playlist.h> -#include <ardour/panner.h> -#include <ardour/utils.h> -#include <ardour/buffer_set.h> -#include <ardour/meter.h> +#include "pbd/enumwriter.h" +#include "midi++/events.h" +#include "evoral/midi_util.h" + +#include "ardour/midi_track.h" +#include "ardour/midi_diskstream.h" +#include "ardour/session.h" +#include "ardour/io_processor.h" +#include "ardour/midi_region.h" +#include "ardour/midi_source.h" +#include "ardour/route_group_specialized.h" +#include "ardour/processor.h" +#include "ardour/midi_playlist.h" +#include "ardour/panner.h" +#include "ardour/utils.h" +#include "ardour/buffer_set.h" +#include "ardour/meter.h" #include "i18n.h" diff --git a/libs/ardour/mix.cc b/libs/ardour/mix.cc index 4b9c31dc4f..1934d6075a 100644 --- a/libs/ardour/mix.cc +++ b/libs/ardour/mix.cc @@ -18,10 +18,10 @@ */ #include <cmath> -#include <ardour/types.h> -#include <ardour/utils.h> -#include <ardour/mix.h> -#include <ardour/runtime_functions.h> +#include "ardour/types.h" +#include "ardour/utils.h" +#include "ardour/mix.h" +#include "ardour/runtime_functions.h" #include <stdint.h> using namespace ARDOUR; diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index e45e760251..0039d4e536 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -21,15 +21,15 @@ #include <poll.h> #include <sys/types.h> #include <unistd.h> -#include <pbd/error.h> -#include <pbd/failed_constructor.h> -#include <pbd/pthread_utils.h> - -#include <midi++/port.h> -#include <ardour/slave.h> -#include <ardour/session.h> -#include <ardour/audioengine.h> -#include <ardour/cycles.h> +#include "pbd/error.h" +#include "pbd/failed_constructor.h" +#include "pbd/pthread_utils.h" + +#include "midi++/port.h" +#include "ardour/slave.h" +#include "ardour/session.h" +#include "ardour/audioengine.h" +#include "ardour/cycles.h" #include "i18n.h" diff --git a/libs/ardour/named_selection.cc b/libs/ardour/named_selection.cc index fbb4b748df..efd636e7f4 100644 --- a/libs/ardour/named_selection.cc +++ b/libs/ardour/named_selection.cc @@ -17,13 +17,13 @@ */ -#include <pbd/failed_constructor.h> -#include <pbd/error.h> +#include "pbd/failed_constructor.h" +#include "pbd/error.h" -#include <ardour/session.h> -#include <ardour/utils.h> -#include <ardour/playlist.h> -#include <ardour/named_selection.h> +#include "ardour/session.h" +#include "ardour/utils.h" +#include "ardour/playlist.h" +#include "ardour/named_selection.h" #include "i18n.h" diff --git a/libs/ardour/onset_detector.cc b/libs/ardour/onset_detector.cc index f58e64ad4a..474632115f 100644 --- a/libs/ardour/onset_detector.cc +++ b/libs/ardour/onset_detector.cc @@ -1,4 +1,4 @@ -#include <ardour/onset_detector.h> +#include "ardour/onset_detector.h" #include "i18n.h" diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc index 0bd40d9e45..b9c5004d85 100644 --- a/libs/ardour/panner.cc +++ b/libs/ardour/panner.cc @@ -32,25 +32,25 @@ #include <glibmm.h> -#include <pbd/error.h> -#include <pbd/failed_constructor.h> -#include <pbd/xml++.h> -#include <pbd/enumwriter.h> +#include "pbd/error.h" +#include "pbd/failed_constructor.h" +#include "pbd/xml++.h" +#include "pbd/enumwriter.h" -#include <evoral/Curve.hpp> +#include "evoral/Curve.hpp" -#include <ardour/session.h> -#include <ardour/panner.h> -#include <ardour/utils.h> -#include <ardour/audio_buffer.h> +#include "ardour/session.h" +#include "ardour/panner.h" +#include "ardour/utils.h" +#include "ardour/audio_buffer.h" -#include <ardour/runtime_functions.h> -#include <ardour/buffer_set.h> -#include <ardour/audio_buffer.h> +#include "ardour/runtime_functions.h" +#include "ardour/buffer_set.h" +#include "ardour/audio_buffer.h" #include "i18n.h" -#include <pbd/mathfix.h> +#include "pbd/mathfix.h" using namespace std; using namespace ARDOUR; diff --git a/libs/ardour/pcm_utils.cc b/libs/ardour/pcm_utils.cc index 08d8a63d6e..0e810ba599 100644 --- a/libs/ardour/pcm_utils.cc +++ b/libs/ardour/pcm_utils.cc @@ -17,7 +17,7 @@ */ -#include <ardour/pcm_utils.h> +#include "ardour/pcm_utils.h" #include <cmath> diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 575da0a89f..3f8785cf37 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -27,17 +27,17 @@ #include <sigc++/bind.h> -#include <pbd/failed_constructor.h> -#include <pbd/stl_delete.h> -#include <pbd/xml++.h> -#include <pbd/stacktrace.h> - -#include <ardour/playlist.h> -#include <ardour/session.h> -#include <ardour/region.h> -#include <ardour/region_factory.h> -#include <ardour/playlist_factory.h> -#include <ardour/transient_detector.h> +#include "pbd/failed_constructor.h" +#include "pbd/stl_delete.h" +#include "pbd/xml++.h" +#include "pbd/stacktrace.h" + +#include "ardour/playlist.h" +#include "ardour/session.h" +#include "ardour/region.h" +#include "ardour/region_factory.h" +#include "ardour/playlist_factory.h" +#include "ardour/transient_detector.h" #include "i18n.h" diff --git a/libs/ardour/playlist_factory.cc b/libs/ardour/playlist_factory.cc index 129ff514af..01510fe456 100644 --- a/libs/ardour/playlist_factory.cc +++ b/libs/ardour/playlist_factory.cc @@ -17,12 +17,12 @@ */ -#include <pbd/error.h> +#include "pbd/error.h" -#include <ardour/playlist.h> -#include <ardour/audioplaylist.h> -#include <ardour/midi_playlist.h> -#include <ardour/playlist_factory.h> +#include "ardour/playlist.h" +#include "ardour/audioplaylist.h" +#include "ardour/midi_playlist.h" +#include "ardour/playlist_factory.h" #include "i18n.h" diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc index 8a08811e7e..f69de57b99 100644 --- a/libs/ardour/plugin.cc +++ b/libs/ardour/plugin.cc @@ -30,26 +30,26 @@ #include <lrdf.h> -#include <pbd/compose.h> -#include <pbd/error.h> -#include <pbd/xml++.h> +#include "pbd/compose.h" +#include "pbd/error.h" +#include "pbd/xml++.h" -#include <ardour/ardour.h> -#include <ardour/session.h> -#include <ardour/audioengine.h> -#include <ardour/plugin.h> -#include <ardour/ladspa_plugin.h> -#include <ardour/plugin_manager.h> +#include "ardour/ardour.h" +#include "ardour/session.h" +#include "ardour/audioengine.h" +#include "ardour/plugin.h" +#include "ardour/ladspa_plugin.h" +#include "ardour/plugin_manager.h" #ifdef HAVE_AUDIOUNITS -#include <ardour/audio_unit.h> +#include "ardour/audio_unit.h" #endif #ifdef HAVE_SLV2 -#include <ardour/lv2_plugin.h> +#include "ardour/lv2_plugin.h" #endif -#include <pbd/stl_delete.h> +#include "pbd/stl_delete.h" #include "i18n.h" #include <locale.h> diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc index 726d4b350f..19e981e3f3 100644 --- a/libs/ardour/plugin_insert.cc +++ b/libs/ardour/plugin_insert.cc @@ -21,34 +21,34 @@ #include <sigc++/bind.h> -#include <pbd/failed_constructor.h> -#include <pbd/xml++.h> - -#include <ardour/audio_buffer.h> -#include <ardour/automation_list.h> -#include <ardour/buffer_set.h> -#include <ardour/event_type_map.h> -#include <ardour/ladspa_plugin.h> -#include <ardour/plugin.h> -#include <ardour/plugin_insert.h> -#include <ardour/port.h> -#include <ardour/route.h> +#include "pbd/failed_constructor.h" +#include "pbd/xml++.h" + +#include "ardour/audio_buffer.h" +#include "ardour/automation_list.h" +#include "ardour/buffer_set.h" +#include "ardour/event_type_map.h" +#include "ardour/ladspa_plugin.h" +#include "ardour/plugin.h" +#include "ardour/plugin_insert.h" +#include "ardour/port.h" +#include "ardour/route.h" #ifdef HAVE_SLV2 -#include <ardour/lv2_plugin.h> +#include "ardour/lv2_plugin.h" #endif #ifdef VST_SUPPORT -#include <ardour/vst_plugin.h> +#include "ardour/vst_plugin.h" #endif #ifdef HAVE_AUDIOUNITS -#include <ardour/audio_unit.h> +#include "ardour/audio_unit.h" #endif -#include <ardour/audioengine.h> -#include <ardour/session.h> -#include <ardour/types.h> +#include "ardour/audioengine.h" +#include "ardour/session.h" +#include "ardour/types.h" #include "i18n.h" diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 8dd1a7abb0..bf62412700 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -29,37 +29,37 @@ #ifdef VST_SUPPORT #include <fst.h> -#include <pbd/basename.h> +#include "pbd/basename.h" #include <cstring> #endif // VST_SUPPORT #include <glibmm/miscutils.h> -#include <pbd/pathscanner.h> +#include "pbd/pathscanner.h" -#include <ardour/ladspa.h> -#include <ardour/session.h> -#include <ardour/plugin_manager.h> -#include <ardour/plugin.h> -#include <ardour/ladspa_plugin.h> -#include <ardour/filesystem_paths.h> +#include "ardour/ladspa.h" +#include "ardour/session.h" +#include "ardour/plugin_manager.h" +#include "ardour/plugin.h" +#include "ardour/ladspa_plugin.h" +#include "ardour/filesystem_paths.h" #ifdef HAVE_SLV2 #include <slv2/slv2.h> -#include <ardour/lv2_plugin.h> +#include "ardour/lv2_plugin.h" #endif #ifdef VST_SUPPORT -#include <ardour/vst_plugin.h> +#include "ardour/vst_plugin.h" #endif #ifdef HAVE_AUDIOUNITS -#include <ardour/audio_unit.h> +#include "ardour/audio_unit.h" #include <Carbon/Carbon.h> #endif -#include <pbd/error.h> -#include <pbd/stl_delete.h> +#include "pbd/error.h" +#include "pbd/stl_delete.h" #include "i18n.h" diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc index cbbf66b40f..5559ac0e04 100644 --- a/libs/ardour/port_insert.cc +++ b/libs/ardour/port_insert.cc @@ -21,18 +21,18 @@ #include <sigc++/bind.h> -#include <pbd/failed_constructor.h> -#include <pbd/xml++.h> - -#include <ardour/port_insert.h> -#include <ardour/plugin.h> -#include <ardour/port.h> -#include <ardour/route.h> -#include <ardour/buffer_set.h> - -#include <ardour/audioengine.h> -#include <ardour/session.h> -#include <ardour/types.h> +#include "pbd/failed_constructor.h" +#include "pbd/xml++.h" + +#include "ardour/port_insert.h" +#include "ardour/plugin.h" +#include "ardour/port.h" +#include "ardour/route.h" +#include "ardour/buffer_set.h" + +#include "ardour/audioengine.h" +#include "ardour/session.h" +#include "ardour/types.h" #include "i18n.h" diff --git a/libs/ardour/port_set.cc b/libs/ardour/port_set.cc index 12af468d9b..6fdfa763cb 100644 --- a/libs/ardour/port_set.cc +++ b/libs/ardour/port_set.cc @@ -16,9 +16,9 @@ 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ardour/port_set.h> -#include <ardour/midi_port.h> -#include <ardour/audio_port.h> +#include "ardour/port_set.h" +#include "ardour/midi_port.h" +#include "ardour/audio_port.h" namespace ARDOUR { diff --git a/libs/ardour/processor.cc b/libs/ardour/processor.cc index b1725267fb..e521e3702c 100644 --- a/libs/ardour/processor.cc +++ b/libs/ardour/processor.cc @@ -21,31 +21,31 @@ #include <sigc++/bind.h> -#include <pbd/failed_constructor.h> -#include <pbd/enumwriter.h> -#include <pbd/xml++.h> - -#include <ardour/processor.h> -#include <ardour/plugin.h> -#include <ardour/port.h> -#include <ardour/route.h> -#include <ardour/ladspa_plugin.h> -#include <ardour/buffer_set.h> -#include <ardour/send.h> -#include <ardour/port_insert.h> -#include <ardour/plugin_insert.h> +#include "pbd/failed_constructor.h" +#include "pbd/enumwriter.h" +#include "pbd/xml++.h" + +#include "ardour/processor.h" +#include "ardour/plugin.h" +#include "ardour/port.h" +#include "ardour/route.h" +#include "ardour/ladspa_plugin.h" +#include "ardour/buffer_set.h" +#include "ardour/send.h" +#include "ardour/port_insert.h" +#include "ardour/plugin_insert.h" #ifdef VST_SUPPORT -#include <ardour/vst_plugin.h> +#include "ardour/vst_plugin.h" #endif #ifdef HAVE_AUDIOUNITS -#include <ardour/audio_unit.h> +#include "ardour/audio_unit.h" #endif -#include <ardour/audioengine.h> -#include <ardour/session.h> -#include <ardour/types.h> +#include "ardour/audioengine.h" +#include "ardour/session.h" +#include "ardour/types.h" #include "i18n.h" diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc index 76eb924612..e5f4abeccf 100644 --- a/libs/ardour/quantize.cc +++ b/libs/ardour/quantize.cc @@ -17,14 +17,14 @@ */ -#include <pbd/basename.h> - -#include <ardour/types.h> -#include <ardour/quantize.h> -#include <ardour/session.h> -#include <ardour/smf_source.h> -#include <ardour/midi_region.h> -#include <ardour/tempo.h> +#include "pbd/basename.h" + +#include "ardour/types.h" +#include "ardour/quantize.h" +#include "ardour/session.h" +#include "ardour/smf_source.h" +#include "ardour/midi_region.h" +#include "ardour/tempo.h" #include "i18n.h" diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc index 063821e896..b709c9bd1f 100644 --- a/libs/ardour/rb_effect.cc +++ b/libs/ardour/rb_effect.cc @@ -20,15 +20,15 @@ #include <algorithm> #include <cmath> -#include <pbd/error.h> +#include "pbd/error.h" #include <rubberband/RubberBandStretcher.h> -#include <ardour/types.h> -#include <ardour/stretch.h> -#include <ardour/pitch.h> -#include <ardour/audiofilesource.h> -#include <ardour/session.h> -#include <ardour/audioregion.h> +#include "ardour/types.h" +#include "ardour/stretch.h" +#include "ardour/pitch.h" +#include "ardour/audiofilesource.h" +#include "ardour/session.h" +#include "ardour/audioregion.h" #include "i18n.h" diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc index d7f5ad132f..7d62300e3d 100644 --- a/libs/ardour/recent_sessions.cc +++ b/libs/ardour/recent_sessions.cc @@ -25,12 +25,12 @@ #include <glibmm/miscutils.h> -#include <pbd/error.h> +#include "pbd/error.h" -#include <ardour/configuration.h> -#include <ardour/filesystem_paths.h> -#include <ardour/recent_sessions.h> -#include <ardour/utils.h> +#include "ardour/configuration.h" +#include "ardour/filesystem_paths.h" +#include "ardour/recent_sessions.h" +#include "ardour/utils.h" #include "i18n.h" diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index cae564832d..0fb2f64fc7 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -27,18 +27,18 @@ #include <sigc++/class_slot.h> #include <glibmm/thread.h> -#include <pbd/xml++.h> -#include <pbd/stacktrace.h> -#include <pbd/enumwriter.h> - -#include <ardour/region.h> -#include <ardour/playlist.h> -#include <ardour/session.h> -#include <ardour/source.h> -#include <ardour/tempo.h> -#include <ardour/region_factory.h> -#include <ardour/filter.h> -#include <ardour/profile.h> +#include "pbd/xml++.h" +#include "pbd/stacktrace.h" +#include "pbd/enumwriter.h" + +#include "ardour/region.h" +#include "ardour/playlist.h" +#include "ardour/session.h" +#include "ardour/source.h" +#include "ardour/tempo.h" +#include "ardour/region_factory.h" +#include "ardour/filter.h" +#include "ardour/profile.h" #include "i18n.h" diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index 0de20bfcac..a6bf4e0870 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -17,16 +17,16 @@ */ -#include <pbd/error.h> +#include "pbd/error.h" -#include <ardour/session.h> +#include "ardour/session.h" -#include <ardour/region_factory.h> -#include <ardour/region.h> -#include <ardour/audioregion.h> -#include <ardour/audiosource.h> -#include <ardour/midi_source.h> -#include <ardour/midi_region.h> +#include "ardour/region_factory.h" +#include "ardour/region.h" +#include "ardour/audioregion.h" +#include "ardour/audiosource.h" +#include "ardour/midi_source.h" +#include "ardour/midi_region.h" #include "i18n.h" diff --git a/libs/ardour/resampled_source.cc b/libs/ardour/resampled_source.cc index 1993aba911..cfc5c9f4f1 100644 --- a/libs/ardour/resampled_source.cc +++ b/libs/ardour/resampled_source.cc @@ -17,9 +17,9 @@ */ -#include <pbd/error.h> -#include <ardour/resampled_source.h> -#include <pbd/failed_constructor.h> +#include "pbd/error.h" +#include "ardour/resampled_source.h" +#include "pbd/failed_constructor.h" #include "i18n.h" diff --git a/libs/ardour/reverse.cc b/libs/ardour/reverse.cc index 6d838bf912..ed3970bdfc 100644 --- a/libs/ardour/reverse.cc +++ b/libs/ardour/reverse.cc @@ -19,13 +19,13 @@ #include <algorithm> -#include <pbd/basename.h> +#include "pbd/basename.h" -#include <ardour/types.h> -#include <ardour/reverse.h> -#include <ardour/audiofilesource.h> -#include <ardour/session.h> -#include <ardour/audioregion.h> +#include "ardour/types.h" +#include "ardour/reverse.h" +#include "ardour/audiofilesource.h" +#include "ardour/session.h" +#include "ardour/audioregion.h" #include "i18n.h" diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index a80ceb70ef..0111ca8e10 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -22,36 +22,36 @@ #include <cassert> #include <sigc++/bind.h> -#include <pbd/xml++.h> -#include <pbd/enumwriter.h> -#include <pbd/stacktrace.h> -#include <pbd/memento_command.h> - -#include <evoral/Curve.hpp> - -#include <ardour/timestamps.h> -#include <ardour/audioengine.h> -#include <ardour/route.h> -#include <ardour/buffer.h> -#include <ardour/processor.h> -#include <ardour/plugin_insert.h> -#include <ardour/port_insert.h> -#include <ardour/send.h> -#include <ardour/session.h> -#include <ardour/utils.h> -#include <ardour/configuration.h> -#include <ardour/cycle_timer.h> -#include <ardour/route_group.h> -#include <ardour/port.h> -#include <ardour/audio_port.h> -#include <ardour/ladspa_plugin.h> -#include <ardour/panner.h> -#include <ardour/dB.h> -#include <ardour/amp.h> -#include <ardour/meter.h> -#include <ardour/buffer_set.h> -#include <ardour/mix.h> -#include <ardour/profile.h> +#include "pbd/xml++.h" +#include "pbd/enumwriter.h" +#include "pbd/stacktrace.h" +#include "pbd/memento_command.h" + +#include "evoral/Curve.hpp" + +#include "ardour/timestamps.h" +#include "ardour/audioengine.h" +#include "ardour/route.h" +#include "ardour/buffer.h" +#include "ardour/processor.h" +#include "ardour/plugin_insert.h" +#include "ardour/port_insert.h" +#include "ardour/send.h" +#include "ardour/session.h" +#include "ardour/utils.h" +#include "ardour/configuration.h" +#include "ardour/cycle_timer.h" +#include "ardour/route_group.h" +#include "ardour/port.h" +#include "ardour/audio_port.h" +#include "ardour/ladspa_plugin.h" +#include "ardour/panner.h" +#include "ardour/dB.h" +#include "ardour/amp.h" +#include "ardour/meter.h" +#include "ardour/buffer_set.h" +#include "ardour/mix.h" +#include "ardour/profile.h" #include "i18n.h" diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc index b1852c3607..527597548d 100644 --- a/libs/ardour/route_group.cc +++ b/libs/ardour/route_group.cc @@ -24,14 +24,14 @@ #include <sigc++/bind.h> -#include <pbd/error.h> -#include <pbd/enumwriter.h> - -#include <ardour/route_group.h> -#include <ardour/audio_track.h> -#include <ardour/audio_diskstream.h> -#include <ardour/configuration.h> -#include <ardour/session.h> +#include "pbd/error.h" +#include "pbd/enumwriter.h" + +#include "ardour/route_group.h" +#include "ardour/audio_track.h" +#include "ardour/audio_diskstream.h" +#include "ardour/configuration.h" +#include "ardour/session.h" using namespace ARDOUR; using namespace sigc; diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index bdd75494fb..c41ca770f8 100644 --- a/libs/ardour/send.cc +++ b/libs/ardour/send.cc @@ -19,16 +19,16 @@ #include <algorithm> -#include <pbd/xml++.h> - -#include <ardour/send.h> -#include <ardour/session.h> -#include <ardour/port.h> -#include <ardour/audio_port.h> -#include <ardour/buffer_set.h> -#include <ardour/meter.h> -#include <ardour/panner.h> -#include <ardour/io.h> +#include "pbd/xml++.h" + +#include "ardour/send.h" +#include "ardour/session.h" +#include "ardour/port.h" +#include "ardour/audio_port.h" +#include "ardour/buffer_set.h" +#include "ardour/meter.h" +#include "ardour/panner.h" +#include "ardour/io.h" #include "i18n.h" diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index b9144aa3b6..51f55cb6b9 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -35,55 +35,55 @@ #include <glibmm/miscutils.h> #include <glibmm/fileutils.h> -#include <pbd/error.h> +#include "pbd/error.h" #include <glibmm/thread.h> -#include <pbd/pathscanner.h> -#include <pbd/stl_delete.h> -#include <pbd/basename.h> -#include <pbd/stacktrace.h> -#include <pbd/file_utils.h> - -#include <ardour/analyser.h> -#include <ardour/audio_buffer.h> -#include <ardour/audio_diskstream.h> -#include <ardour/audio_track.h> -#include <ardour/audioengine.h> -#include <ardour/audiofilesource.h> -#include <ardour/audioplaylist.h> -#include <ardour/audioregion.h> -#include <ardour/auditioner.h> -#include <ardour/buffer_set.h> -#include <ardour/bundle.h> -#include <ardour/click.h> -#include <ardour/configuration.h> -#include <ardour/crossfade.h> -#include <ardour/cycle_timer.h> -#include <ardour/data_type.h> -#include <ardour/filename_extensions.h> -#include <ardour/io_processor.h> -#include <ardour/midi_diskstream.h> -#include <ardour/midi_playlist.h> -#include <ardour/midi_region.h> -#include <ardour/midi_track.h> -#include <ardour/named_selection.h> -#include <ardour/playlist.h> -#include <ardour/plugin_insert.h> -#include <ardour/port_insert.h> -#include <ardour/processor.h> -#include <ardour/recent_sessions.h> -#include <ardour/region_factory.h> -#include <ardour/route_group.h> -#include <ardour/send.h> -#include <ardour/session.h> -#include <ardour/session_directory.h> -#include <ardour/session_directory.h> -#include <ardour/session_metadata.h> -#include <ardour/slave.h> -#include <ardour/smf_source.h> -#include <ardour/source_factory.h> -#include <ardour/tape_file_matcher.h> -#include <ardour/tempo.h> -#include <ardour/utils.h> +#include "pbd/pathscanner.h" +#include "pbd/stl_delete.h" +#include "pbd/basename.h" +#include "pbd/stacktrace.h" +#include "pbd/file_utils.h" + +#include "ardour/analyser.h" +#include "ardour/audio_buffer.h" +#include "ardour/audio_diskstream.h" +#include "ardour/audio_track.h" +#include "ardour/audioengine.h" +#include "ardour/audiofilesource.h" +#include "ardour/audioplaylist.h" +#include "ardour/audioregion.h" +#include "ardour/auditioner.h" +#include "ardour/buffer_set.h" +#include "ardour/bundle.h" +#include "ardour/click.h" +#include "ardour/configuration.h" +#include "ardour/crossfade.h" +#include "ardour/cycle_timer.h" +#include "ardour/data_type.h" +#include "ardour/filename_extensions.h" +#include "ardour/io_processor.h" +#include "ardour/midi_diskstream.h" +#include "ardour/midi_playlist.h" +#include "ardour/midi_region.h" +#include "ardour/midi_track.h" +#include "ardour/named_selection.h" +#include "ardour/playlist.h" +#include "ardour/plugin_insert.h" +#include "ardour/port_insert.h" +#include "ardour/processor.h" +#include "ardour/recent_sessions.h" +#include "ardour/region_factory.h" +#include "ardour/route_group.h" +#include "ardour/send.h" +#include "ardour/session.h" +#include "ardour/session_directory.h" +#include "ardour/session_directory.h" +#include "ardour/session_metadata.h" +#include "ardour/slave.h" +#include "ardour/smf_source.h" +#include "ardour/source_factory.h" +#include "ardour/tape_file_matcher.h" +#include "ardour/tempo.h" +#include "ardour/utils.h" #include "i18n.h" diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc index 37d0bbd4e7..3415b7243d 100644 --- a/libs/ardour/session_butler.cc +++ b/libs/ardour/session_butler.cc @@ -27,18 +27,18 @@ #include <glibmm/thread.h> -#include <pbd/error.h> -#include <pbd/pthread_utils.h> -#include <pbd/stacktrace.h> - -#include <ardour/audio_diskstream.h> -#include <ardour/audioengine.h> -#include <ardour/configuration.h> -#include <ardour/crossfade.h> -#include <ardour/io.h> -#include <ardour/midi_diskstream.h> -#include <ardour/session.h> -#include <ardour/timestamps.h> +#include "pbd/error.h" +#include "pbd/pthread_utils.h" +#include "pbd/stacktrace.h" + +#include "ardour/audio_diskstream.h" +#include "ardour/audioengine.h" +#include "ardour/configuration.h" +#include "ardour/crossfade.h" +#include "ardour/io.h" +#include "ardour/midi_diskstream.h" +#include "ardour/session.h" +#include "ardour/timestamps.h" #include "i18n.h" diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc index 71e444893f..6127843d47 100644 --- a/libs/ardour/session_click.cc +++ b/libs/ardour/session_click.cc @@ -20,12 +20,12 @@ #include <list> #include <cerrno> -#include <ardour/ardour.h> -#include <ardour/session.h> -#include <ardour/tempo.h> -#include <ardour/io.h> -#include <ardour/buffer_set.h> -#include <ardour/audio_buffer.h> +#include "ardour/ardour.h" +#include "ardour/session.h" +#include "ardour/tempo.h" +#include "ardour/io.h" +#include "ardour/buffer_set.h" +#include "ardour/audio_buffer.h" #include <sndfile.h> diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc index bedbe7211f..cf9cd6f7c9 100644 --- a/libs/ardour/session_command.cc +++ b/libs/ardour/session_command.cc @@ -17,25 +17,25 @@ */ -#include <ardour/session.h> -#include <ardour/route.h> -#include <pbd/memento_command.h> -#include <ardour/diskstream.h> -#include <ardour/playlist.h> -#include <ardour/audioplaylist.h> -#include <ardour/audio_track.h> -#include <ardour/midi_playlist.h> -#include <ardour/midi_track.h> -#include <ardour/tempo.h> -#include <ardour/audiosource.h> -#include <ardour/audioregion.h> -#include <ardour/midi_source.h> -#include <ardour/midi_region.h> -#include <pbd/error.h> -#include <pbd/id.h> -#include <pbd/statefuldestructible.h> -#include <pbd/failed_constructor.h> -#include <evoral/Curve.hpp> +#include "ardour/session.h" +#include "ardour/route.h" +#include "pbd/memento_command.h" +#include "ardour/diskstream.h" +#include "ardour/playlist.h" +#include "ardour/audioplaylist.h" +#include "ardour/audio_track.h" +#include "ardour/midi_playlist.h" +#include "ardour/midi_track.h" +#include "ardour/tempo.h" +#include "ardour/audiosource.h" +#include "ardour/audioregion.h" +#include "ardour/midi_source.h" +#include "ardour/midi_region.h" +#include "pbd/error.h" +#include "pbd/id.h" +#include "pbd/statefuldestructible.h" +#include "pbd/failed_constructor.h" +#include "evoral/Curve.hpp" using namespace PBD; using namespace ARDOUR; diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc index 299f542316..612e446e08 100644 --- a/libs/ardour/session_directory.cc +++ b/libs/ardour/session_directory.cc @@ -16,13 +16,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <pbd/error.h> -#include <pbd/compose.h> -#include <pbd/filesystem.h> +#include "pbd/error.h" +#include "pbd/compose.h" +#include "pbd/filesystem.h" -#include <ardour/directory_names.h> -#include <ardour/session_directory.h> -#include <ardour/utils.h> +#include "ardour/directory_names.h" +#include "ardour/session_directory.h" +#include "ardour/utils.h" #include "i18n.h" diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc index 22b05fe46d..ddad759deb 100644 --- a/libs/ardour/session_events.cc +++ b/libs/ardour/session_events.cc @@ -20,14 +20,14 @@ #include <cmath> #include <unistd.h> -#include <ardour/timestamps.h> +#include "ardour/timestamps.h" -#include <pbd/error.h> +#include "pbd/error.h" #include <glibmm/thread.h> -#include <ardour/ardour.h> -#include <ardour/session.h> -#include <ardour/audio_diskstream.h> +#include "ardour/ardour.h" +#include "ardour/session.h" +#include "ardour/audio_diskstream.h" #include "i18n.h" diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc index c330a4f7ce..4266d71353 100644 --- a/libs/ardour/session_export.cc +++ b/libs/ardour/session_export.cc @@ -19,21 +19,21 @@ #include <sigc++/bind.h> -#include <pbd/error.h> +#include "pbd/error.h" #include <glibmm/thread.h> -#include <ardour/ardour.h> -#include <ardour/audio_diskstream.h> -#include <ardour/audioengine.h> -#include <ardour/export_failed.h> -#include <ardour/export_file_io.h> -#include <ardour/export_handler.h> -#include <ardour/export_status.h> -#include <ardour/export_utilities.h> -#include <ardour/panner.h> -#include <ardour/route.h> -#include <ardour/session.h> -#include <ardour/timestamps.h> +#include "ardour/ardour.h" +#include "ardour/audio_diskstream.h" +#include "ardour/audioengine.h" +#include "ardour/export_failed.h" +#include "ardour/export_file_io.h" +#include "ardour/export_handler.h" +#include "ardour/export_status.h" +#include "ardour/export_utilities.h" +#include "ardour/panner.h" +#include "ardour/route.h" +#include "ardour/session.h" +#include "ardour/timestamps.h" #include "i18n.h" diff --git a/libs/ardour/session_feedback.cc b/libs/ardour/session_feedback.cc index 2bb9886f50..19fbbe1424 100644 --- a/libs/ardour/session_feedback.cc +++ b/libs/ardour/session_feedback.cc @@ -24,19 +24,19 @@ #include <fcntl.h> #include <poll.h> -#include <midi++/types.h> -#include <midi++/port.h> -#include <midi++/manager.h> +#include "midi++/types.h" +#include "midi++/port.h" +#include "midi++/manager.h" #include <glibmm/thread.h> -#include <pbd/pthread_utils.h> +#include "pbd/pthread_utils.h" -#include <ardour/configuration.h> -#include <ardour/audioengine.h> -#include <ardour/session.h> -#include <ardour/audio_track.h> -#include <ardour/audio_diskstream.h> +#include "ardour/configuration.h" +#include "ardour/audioengine.h" +#include "ardour/session.h" +#include "ardour/audio_track.h" +#include "ardour/audio_diskstream.h" #include <control_protocol/control_protocol.h> #include "i18n.h" diff --git a/libs/ardour/session_metadata.cc b/libs/ardour/session_metadata.cc index 7eb24e7586..8f3680e7b1 100644 --- a/libs/ardour/session_metadata.cc +++ b/libs/ardour/session_metadata.cc @@ -17,7 +17,7 @@ 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ardour/session_metadata.h> +#include "ardour/session_metadata.h" #include <iostream> #include <sstream> diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index f5dc9993d5..b0d6ed9347 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -28,22 +28,22 @@ #include <boost/shared_ptr.hpp> -#include <midi++/mmc.h> -#include <midi++/port.h> -#include <midi++/manager.h> -#include <pbd/error.h> +#include "midi++/mmc.h" +#include "midi++/port.h" +#include "midi++/manager.h" +#include "pbd/error.h" #include <glibmm/thread.h> -#include <pbd/pthread_utils.h> - -#include <ardour/configuration.h> -#include <ardour/audioengine.h> -#include <ardour/session.h> -#include <ardour/audio_track.h> -#include <ardour/midi_track.h> -#include <ardour/audio_diskstream.h> -#include <ardour/slave.h> -#include <ardour/cycles.h> -#include <ardour/smpte.h> +#include "pbd/pthread_utils.h" + +#include "ardour/configuration.h" +#include "ardour/audioengine.h" +#include "ardour/session.h" +#include "ardour/audio_track.h" +#include "ardour/midi_track.h" +#include "ardour/audio_diskstream.h" +#include "ardour/slave.h" +#include "ardour/cycles.h" +#include "ardour/smpte.h" #include "i18n.h" diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 87c9f77073..0f697806eb 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -22,21 +22,21 @@ #include <algorithm> #include <unistd.h> -#include <pbd/error.h> +#include "pbd/error.h" #include <glibmm/thread.h> -#include <ardour/ardour.h> -#include <ardour/session.h> -#include <ardour/timestamps.h> -#include <ardour/audio_diskstream.h> -#include <ardour/audioengine.h> -#include <ardour/slave.h> -#include <ardour/auditioner.h> -#include <ardour/cycles.h> -#include <ardour/cycle_timer.h> - -#include <midi++/manager.h> +#include "ardour/ardour.h" +#include "ardour/session.h" +#include "ardour/timestamps.h" +#include "ardour/audio_diskstream.h" +#include "ardour/audioengine.h" +#include "ardour/slave.h" +#include "ardour/auditioner.h" +#include "ardour/cycles.h" +#include "ardour/cycle_timer.h" + +#include "midi++/manager.h" #include "i18n.h" diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index beacb192f1..4680a84288 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -49,61 +49,61 @@ #include <glibmm.h> #include <glibmm/thread.h> -#include <midi++/mmc.h> -#include <midi++/port.h> - -#include <pbd/error.h> -#include <pbd/pathscanner.h> -#include <pbd/pthread_utils.h> -#include <pbd/search_path.h> -#include <pbd/stacktrace.h> - -#include <ardour/audioengine.h> -#include <ardour/configuration.h> -#include <ardour/session.h> -#include <ardour/session_directory.h> -#include <ardour/session_utils.h> -#include <ardour/session_state_utils.h> -#include <ardour/session_metadata.h> -#include <ardour/buffer.h> -#include <ardour/audio_diskstream.h> -#include <ardour/midi_diskstream.h> -#include <ardour/utils.h> -#include <ardour/audioplaylist.h> -#include <ardour/midi_playlist.h> -#include <ardour/smf_source.h> -#include <ardour/audiofilesource.h> -#include <ardour/silentfilesource.h> -#include <ardour/sndfilesource.h> -#include <ardour/midi_source.h> -#include <ardour/sndfile_helpers.h> -#include <ardour/auditioner.h> -#include <ardour/io_processor.h> -#include <ardour/send.h> -#include <ardour/processor.h> -#include <ardour/user_bundle.h> -#include <ardour/slave.h> -#include <ardour/tempo.h> -#include <ardour/audio_track.h> -#include <ardour/midi_track.h> -#include <ardour/midi_patch_manager.h> -#include <ardour/cycle_timer.h> -#include <ardour/utils.h> -#include <ardour/named_selection.h> -#include <ardour/version.h> -#include <ardour/location.h> -#include <ardour/audioregion.h> -#include <ardour/midi_region.h> -#include <ardour/crossfade.h> -#include <ardour/control_protocol_manager.h> -#include <ardour/region_factory.h> -#include <ardour/source_factory.h> -#include <ardour/playlist_factory.h> -#include <ardour/filename_extensions.h> -#include <ardour/directory_names.h> -#include <ardour/template_utils.h> -#include <ardour/ticker.h> -#include <ardour/route_group.h> +#include "midi++/mmc.h" +#include "midi++/port.h" + +#include "pbd/error.h" +#include "pbd/pathscanner.h" +#include "pbd/pthread_utils.h" +#include "pbd/search_path.h" +#include "pbd/stacktrace.h" + +#include "ardour/audioengine.h" +#include "ardour/configuration.h" +#include "ardour/session.h" +#include "ardour/session_directory.h" +#include "ardour/session_utils.h" +#include "ardour/session_state_utils.h" +#include "ardour/session_metadata.h" +#include "ardour/buffer.h" +#include "ardour/audio_diskstream.h" +#include "ardour/midi_diskstream.h" +#include "ardour/utils.h" +#include "ardour/audioplaylist.h" +#include "ardour/midi_playlist.h" +#include "ardour/smf_source.h" +#include "ardour/audiofilesource.h" +#include "ardour/silentfilesource.h" +#include "ardour/sndfilesource.h" +#include "ardour/midi_source.h" +#include "ardour/sndfile_helpers.h" +#include "ardour/auditioner.h" +#include "ardour/io_processor.h" +#include "ardour/send.h" +#include "ardour/processor.h" +#include "ardour/user_bundle.h" +#include "ardour/slave.h" +#include "ardour/tempo.h" +#include "ardour/audio_track.h" +#include "ardour/midi_track.h" +#include "ardour/midi_patch_manager.h" +#include "ardour/cycle_timer.h" +#include "ardour/utils.h" +#include "ardour/named_selection.h" +#include "ardour/version.h" +#include "ardour/location.h" +#include "ardour/audioregion.h" +#include "ardour/midi_region.h" +#include "ardour/crossfade.h" +#include "ardour/control_protocol_manager.h" +#include "ardour/region_factory.h" +#include "ardour/source_factory.h" +#include "ardour/playlist_factory.h" +#include "ardour/filename_extensions.h" +#include "ardour/directory_names.h" +#include "ardour/template_utils.h" +#include "ardour/ticker.h" +#include "ardour/route_group.h" #include <control_protocol/control_protocol.h> diff --git a/libs/ardour/session_state_utils.cc b/libs/ardour/session_state_utils.cc index e57dce039e..00ab88d0ef 100644 --- a/libs/ardour/session_state_utils.cc +++ b/libs/ardour/session_state_utils.cc @@ -18,12 +18,12 @@ #include <algorithm> -#include <pbd/compose.h> -#include <pbd/error.h> -#include <pbd/file_utils.h> +#include "pbd/compose.h" +#include "pbd/error.h" +#include "pbd/file_utils.h" -#include <ardour/session_state_utils.h> -#include <ardour/filename_extensions.h> +#include "ardour/session_state_utils.h" +#include "ardour/filename_extensions.h" #include "i18n.h" diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc index 77b58853c7..de86b217ca 100644 --- a/libs/ardour/session_time.cc +++ b/libs/ardour/session_time.cc @@ -22,17 +22,17 @@ #include <cmath> #include <unistd.h> -#include <ardour/timestamps.h> +#include "ardour/timestamps.h" -#include <pbd/error.h> -#include <pbd/enumwriter.h> -#include <pbd/stacktrace.h> +#include "pbd/error.h" +#include "pbd/enumwriter.h" +#include "pbd/stacktrace.h" -#include <ardour/ardour.h> -#include <ardour/configuration.h> -#include <ardour/audioengine.h> -#include <ardour/session.h> -#include <ardour/tempo.h> +#include "ardour/ardour.h" +#include "ardour/configuration.h" +#include "ardour/audioengine.h" +#include "ardour/session.h" +#include "ardour/tempo.h" #include "i18n.h" diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index ff00d278a3..564b73e228 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -24,23 +24,23 @@ #include <sigc++/bind.h> #include <sigc++/retype.h> -#include <pbd/undo.h> -#include <pbd/error.h> +#include "pbd/undo.h" +#include "pbd/error.h" #include <glibmm/thread.h> -#include <pbd/pthread_utils.h> -#include <pbd/memento_command.h> -#include <pbd/stacktrace.h> - -#include <midi++/mmc.h> -#include <midi++/port.h> - -#include <ardour/ardour.h> -#include <ardour/audioengine.h> -#include <ardour/session.h> -#include <ardour/audio_diskstream.h> -#include <ardour/auditioner.h> -#include <ardour/slave.h> -#include <ardour/location.h> +#include "pbd/pthread_utils.h" +#include "pbd/memento_command.h" +#include "pbd/stacktrace.h" + +#include "midi++/mmc.h" +#include "midi++/port.h" + +#include "ardour/ardour.h" +#include "ardour/audioengine.h" +#include "ardour/session.h" +#include "ardour/audio_diskstream.h" +#include "ardour/auditioner.h" +#include "ardour/slave.h" +#include "ardour/location.h" #include "i18n.h" diff --git a/libs/ardour/session_utils.cc b/libs/ardour/session_utils.cc index 3b2baad69a..3dfa862674 100644 --- a/libs/ardour/session_utils.cc +++ b/libs/ardour/session_utils.cc @@ -1,7 +1,7 @@ -#include <pbd/error.h> +#include "pbd/error.h" -#include <ardour/session_directory.h> +#include "ardour/session_directory.h" #include "i18n.h" diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc index 16233feba2..89fb2a8397 100644 --- a/libs/ardour/session_vst.cc +++ b/libs/ardour/session_vst.cc @@ -23,8 +23,8 @@ #include <fst.h> #include <vst/aeffectx.h> -#include <ardour/session.h> -#include <ardour/vst_plugin.h> +#include "ardour/session.h" +#include "ardour/vst_plugin.h" #include "i18n.h" diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 74ee1fd680..34947f419a 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -25,22 +25,22 @@ #include <unistd.h> #include <errno.h> -#include <pbd/mountpoint.h> -#include <pbd/pathscanner.h> -#include <pbd/stl_delete.h> -#include <pbd/strsplit.h> +#include "pbd/mountpoint.h" +#include "pbd/pathscanner.h" +#include "pbd/stl_delete.h" +#include "pbd/strsplit.h" #include <glibmm/miscutils.h> -#include <evoral/SMFReader.hpp> -#include <evoral/Control.hpp> +#include "evoral/SMFReader.hpp" +#include "evoral/Control.hpp" -#include <ardour/audioengine.h> -#include <ardour/event_type_map.h> -#include <ardour/midi_model.h> -#include <ardour/midi_ring_buffer.h> -#include <ardour/session.h> -#include <ardour/smf_source.h> +#include "ardour/audioengine.h" +#include "ardour/event_type_map.h" +#include "ardour/midi_model.h" +#include "ardour/midi_ring_buffer.h" +#include "ardour/session.h" +#include "ardour/smf_source.h" #include "i18n.h" diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc index 58a51f8bbe..08e1117fbb 100644 --- a/libs/ardour/sndfile_helpers.cc +++ b/libs/ardour/sndfile_helpers.cc @@ -20,10 +20,10 @@ #include <map> #include <vector> -#include <pbd/convert.h> +#include "pbd/convert.h" #include <sndfile.h> -#include <ardour/sndfile_helpers.h> +#include "ardour/sndfile_helpers.h" #include "i18n.h" diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc index 5cd00a8e96..71d3342dbc 100644 --- a/libs/ardour/sndfileimportable.cc +++ b/libs/ardour/sndfileimportable.cc @@ -1,4 +1,4 @@ -#include <ardour/sndfileimportable.h> +#include "ardour/sndfileimportable.h" #include <sndfile.h> #include <iostream> diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index f759653e58..6002f95cb9 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -28,10 +28,10 @@ #include <glibmm/miscutils.h> -#include <ardour/sndfilesource.h> -#include <ardour/sndfile_helpers.h> -#include <ardour/utils.h> -#include <ardour/version.h> +#include "ardour/sndfilesource.h" +#include "ardour/sndfile_helpers.h" +#include "ardour/utils.h" +#include "ardour/version.h" #include "i18n.h" diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc index 61ace5a72b..b052a5b1fa 100644 --- a/libs/ardour/source.cc +++ b/libs/ardour/source.cc @@ -32,14 +32,14 @@ #include <glibmm/thread.h> #include <glibmm/miscutils.h> #include <glibmm/fileutils.h> -#include <pbd/xml++.h> -#include <pbd/pthread_utils.h> -#include <pbd/enumwriter.h> - -#include <ardour/playlist.h> -#include <ardour/session.h> -#include <ardour/source.h> -#include <ardour/transient_detector.h> +#include "pbd/xml++.h" +#include "pbd/pthread_utils.h" +#include "pbd/enumwriter.h" + +#include "ardour/playlist.h" +#include "ardour/session.h" +#include "ardour/source.h" +#include "ardour/transient_detector.h" #include "i18n.h" diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index db5e7d313b..d6ce7ba033 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -18,23 +18,23 @@ $Id$ */ -#include <pbd/error.h> -#include <pbd/convert.h> -#include <pbd/pthread_utils.h> -#include <pbd/stacktrace.h> +#include "pbd/error.h" +#include "pbd/convert.h" +#include "pbd/pthread_utils.h" +#include "pbd/stacktrace.h" -#include <ardour/source_factory.h> -#include <ardour/sndfilesource.h> -#include <ardour/silentfilesource.h> -#include <ardour/configuration.h> -#include <ardour/smf_source.h> +#include "ardour/source_factory.h" +#include "ardour/sndfilesource.h" +#include "ardour/silentfilesource.h" +#include "ardour/configuration.h" +#include "ardour/smf_source.h" #ifdef HAVE_COREAUDIO #define USE_COREAUDIO_FOR_FILES #endif #ifdef USE_COREAUDIO_FOR_FILES -#include <ardour/coreaudiosource.h> +#include "ardour/coreaudiosource.h" #endif diff --git a/libs/ardour/sse_functions_xmm.cc b/libs/ardour/sse_functions_xmm.cc index 9b37c37912..dede02303c 100644 --- a/libs/ardour/sse_functions_xmm.cc +++ b/libs/ardour/sse_functions_xmm.cc @@ -19,7 +19,7 @@ */ #include <xmmintrin.h> -#include <ardour/types.h> +#include "ardour/types.h" void x86_sse_find_peaks(const ARDOUR::Sample* buf, nframes_t nframes, float *min, float *max) diff --git a/libs/ardour/st_pitch.cc b/libs/ardour/st_pitch.cc index 3999c1a746..6138249e61 100644 --- a/libs/ardour/st_pitch.cc +++ b/libs/ardour/st_pitch.cc @@ -20,13 +20,13 @@ #include <algorithm> #include <cmath> -#include <pbd/error.h> +#include "pbd/error.h" -#include <ardour/types.h> -#include <ardour/pitch.h> -#include <ardour/audiofilesource.h> -#include <ardour/session.h> -#include <ardour/audioregion.h> +#include "ardour/types.h" +#include "ardour/pitch.h" +#include "ardour/audiofilesource.h" +#include "ardour/session.h" +#include "ardour/audioregion.h" #include "i18n.h" diff --git a/libs/ardour/st_stretch.cc b/libs/ardour/st_stretch.cc index 36af40e929..ff46303eee 100644 --- a/libs/ardour/st_stretch.cc +++ b/libs/ardour/st_stretch.cc @@ -20,13 +20,13 @@ #include <algorithm> #include <cmath> -#include <pbd/error.h> +#include "pbd/error.h" -#include <ardour/types.h> -#include <ardour/stretch.h> -#include <ardour/audiofilesource.h> -#include <ardour/session.h> -#include <ardour/audioregion.h> +#include "ardour/types.h" +#include "ardour/stretch.h" +#include "ardour/audiofilesource.h" +#include "ardour/session.h" +#include "ardour/audioregion.h" #include "i18n.h" diff --git a/libs/ardour/tape_file_matcher.cc b/libs/ardour/tape_file_matcher.cc index 835a951f8a..9661ccf662 100644 --- a/libs/ardour/tape_file_matcher.cc +++ b/libs/ardour/tape_file_matcher.cc @@ -16,9 +16,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <pbd/error.h> +#include "pbd/error.h" -#include <ardour/tape_file_matcher.h> +#include "ardour/tape_file_matcher.h" #include "i18n.h" diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc index 171939dac2..7c25b59db8 100644 --- a/libs/ardour/template_utils.cc +++ b/libs/ardour/template_utils.cc @@ -1,10 +1,10 @@ #include <algorithm> -#include <pbd/filesystem.h> +#include "pbd/filesystem.h" -#include <ardour/template_utils.h> -#include <ardour/directory_names.h> -#include <ardour/filesystem_paths.h> +#include "ardour/template_utils.h" +#include "ardour/directory_names.h" +#include "ardour/filesystem_paths.h" namespace ARDOUR { diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index b99f46385d..00c187a5bd 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -25,9 +25,9 @@ #include <sigc++/bind.h> #include <glibmm/thread.h> -#include <pbd/xml++.h> -#include <ardour/tempo.h> -#include <ardour/utils.h> +#include "pbd/xml++.h" +#include "ardour/tempo.h" +#include "ardour/utils.h" #include "i18n.h" #include <locale.h> diff --git a/libs/ardour/tempo_map_importer.cc b/libs/ardour/tempo_map_importer.cc index 07e6dd06e4..d934eac2af 100644 --- a/libs/ardour/tempo_map_importer.cc +++ b/libs/ardour/tempo_map_importer.cc @@ -18,14 +18,14 @@ */ -#include <ardour/tempo_map_importer.h> +#include "ardour/tempo_map_importer.h" #include <sstream> -#include <ardour/session.h> -#include <pbd/failed_constructor.h> -#include <pbd/compose.h> -#include <pbd/error.h> +#include "ardour/session.h" +#include "pbd/failed_constructor.h" +#include "pbd/compose.h" +#include "pbd/error.h" #include "i18n.h" diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index ee44ce0c86..8ec3a68a21 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -15,23 +15,23 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <pbd/error.h> +#include "pbd/error.h" #include <sigc++/retype.h> #include <sigc++/retype_return.h> #include <sigc++/bind.h> -#include <ardour/track.h> -#include <ardour/diskstream.h> -#include <ardour/session.h> -#include <ardour/io_processor.h> -#include <ardour/audioregion.h> -#include <ardour/audiosource.h> -#include <ardour/route_group_specialized.h> -#include <ardour/processor.h> -#include <ardour/audioplaylist.h> -#include <ardour/panner.h> -#include <ardour/utils.h> -#include <ardour/port.h> +#include "ardour/track.h" +#include "ardour/diskstream.h" +#include "ardour/session.h" +#include "ardour/io_processor.h" +#include "ardour/audioregion.h" +#include "ardour/audiosource.h" +#include "ardour/route_group_specialized.h" +#include "ardour/processor.h" +#include "ardour/audioplaylist.h" +#include "ardour/panner.h" +#include "ardour/utils.h" +#include "ardour/port.h" #include "i18n.h" diff --git a/libs/ardour/transient_detector.cc b/libs/ardour/transient_detector.cc index d3200d72e4..da167e4bd6 100644 --- a/libs/ardour/transient_detector.cc +++ b/libs/ardour/transient_detector.cc @@ -1,4 +1,4 @@ -#include <ardour/transient_detector.h> +#include "ardour/transient_detector.h" #include "i18n.h" diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc index b20e79c69a..1abb3fba87 100644 --- a/libs/ardour/user_bundle.cc +++ b/libs/ardour/user_bundle.cc @@ -1,7 +1,7 @@ #include <cassert> -#include <pbd/failed_constructor.h> -#include <pbd/compose.h> -#include <pbd/xml++.h> +#include "pbd/failed_constructor.h" +#include "pbd/compose.h" +#include "pbd/xml++.h" #include "ardour/user_bundle.h" #include "ardour/port_set.h" #include "ardour/io.h" diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc index 18194678ed..7320f3c7f3 100644 --- a/libs/ardour/utils.cc +++ b/libs/ardour/utils.cc @@ -37,11 +37,11 @@ #include <wordexp.h> #endif -#include <pbd/error.h> -#include <pbd/stacktrace.h> -#include <pbd/xml++.h> -#include <pbd/basename.h> -#include <ardour/utils.h> +#include "pbd/error.h" +#include "pbd/stacktrace.h" +#include "pbd/xml++.h" +#include "pbd/basename.h" +#include "ardour/utils.h" #include "i18n.h" diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc index 11169a74de..242d9ecfdb 100644 --- a/libs/ardour/vst_plugin.cc +++ b/libs/ardour/vst_plugin.cc @@ -36,20 +36,20 @@ #include <lrdf.h> #include <fst.h> -#include <pbd/compose.h> -#include <pbd/error.h> -#include <pbd/pathscanner.h> -#include <pbd/xml++.h> +#include "pbd/compose.h" +#include "pbd/error.h" +#include "pbd/pathscanner.h" +#include "pbd/xml++.h" #include <vst/aeffectx.h> -#include <ardour/session.h> -#include <ardour/audioengine.h> -#include <ardour/filesystem_paths.h> -#include <ardour/vst_plugin.h> -#include <ardour/buffer_set.h> +#include "ardour/session.h" +#include "ardour/audioengine.h" +#include "ardour/filesystem_paths.h" +#include "ardour/vst_plugin.h" +#include "ardour/buffer_set.h" -#include <pbd/stl_delete.h> +#include "pbd/stl_delete.h" #include "i18n.h" #include <locale.h> diff --git a/libs/evoral/src/MIDIEvent.cpp b/libs/evoral/src/MIDIEvent.cpp index 1df271370a..ee71ca55d6 100644 --- a/libs/evoral/src/MIDIEvent.cpp +++ b/libs/evoral/src/MIDIEvent.cpp @@ -19,7 +19,7 @@ #include <string> #include "evoral/MIDIEvent.hpp" #ifdef EVORAL_MIDI_XML - #include <pbd/xml++.h> + #include "pbd/xml++.h" #endif using namespace std; diff --git a/libs/evoral/test/SequenceTest.hpp b/libs/evoral/test/SequenceTest.hpp index c28c8617f5..d5271cfe0e 100644 --- a/libs/evoral/test/SequenceTest.hpp +++ b/libs/evoral/test/SequenceTest.hpp @@ -1,16 +1,12 @@ +#include <cassert> +#include <sigc++/sigc++.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> - -#include <evoral/Sequence.hpp> -#include <evoral/TypeMap.hpp> -#include <evoral/EventSink.hpp> -#include <evoral/midi_events.h> -#include <evoral/Control.hpp> - -#include <sigc++/sigc++.h> - -#include <cassert> - +#include "evoral/Sequence.hpp" +#include "evoral/TypeMap.hpp" +#include "evoral/EventSink.hpp" +#include "evoral/midi_events.h" +#include "evoral/Control.hpp" using namespace Evoral; diff --git a/libs/midi++2/alsa_sequencer_midiport.cc b/libs/midi++2/alsa_sequencer_midiport.cc index fc69099d0e..4a6dc6b3ea 100644 --- a/libs/midi++2/alsa_sequencer_midiport.cc +++ b/libs/midi++2/alsa_sequencer_midiport.cc @@ -21,12 +21,12 @@ #include <fcntl.h> #include <cerrno> -#include <pbd/failed_constructor.h> -#include <pbd/error.h> -#include <pbd/xml++.h> +#include "pbd/failed_constructor.h" +#include "pbd/error.h" +#include "pbd/xml++.h" -#include <midi++/types.h> -#include <midi++/alsa_sequencer.h> +#include "midi++/types.h" +#include "midi++/alsa_sequencer.h" #include "i18n.h" diff --git a/libs/midi++2/coremidi_midiport.cc b/libs/midi++2/coremidi_midiport.cc index 9eacfc0cc3..e950da2949 100644 --- a/libs/midi++2/coremidi_midiport.cc +++ b/libs/midi++2/coremidi_midiport.cc @@ -21,11 +21,11 @@ #include <fcntl.h> #include <cerrno> -#include <midi++/coremidi_midiport.h> -#include <midi++/types.h> +#include "midi++/coremidi_midiport.h" +#include "midi++/types.h" #include <mach/mach_time.h> -#include <pbd/pthread_utils.h> +#include "pbd/pthread_utils.h" using namespace std; using namespace MIDI; diff --git a/libs/midi++2/fd_midiport.cc b/libs/midi++2/fd_midiport.cc index 640f08686a..2e7bd004a2 100644 --- a/libs/midi++2/fd_midiport.cc +++ b/libs/midi++2/fd_midiport.cc @@ -22,11 +22,11 @@ #include <cerrno> #include <cstring> -#include <pbd/error.h> -#include <pbd/pathscanner.h> +#include "pbd/error.h" +#include "pbd/pathscanner.h" -#include <midi++/types.h> -#include <midi++/fd_midiport.h> +#include "midi++/types.h" +#include "midi++/fd_midiport.h" using namespace std; using namespace MIDI; diff --git a/libs/midi++2/fifomidi.cc b/libs/midi++2/fifomidi.cc index a81520bb95..3bf340f3d3 100644 --- a/libs/midi++2/fifomidi.cc +++ b/libs/midi++2/fifomidi.cc @@ -21,8 +21,8 @@ #include <unistd.h> #include <errno.h> -#include <midi++/types.h> -#include <midi++/fifomidi.h> +#include "midi++/types.h" +#include "midi++/fifomidi.h" using namespace MIDI; diff --git a/libs/midi++2/jack_midiport.cc b/libs/midi++2/jack_midiport.cc index 0eb867ebe7..65d7736c1b 100644 --- a/libs/midi++2/jack_midiport.cc +++ b/libs/midi++2/jack_midiport.cc @@ -21,10 +21,10 @@ #include <cerrno> #include <cassert> -#include <pbd/error.h> +#include "pbd/error.h" -#include <midi++/types.h> -#include <midi++/jack.h> +#include "midi++/types.h" +#include "midi++/jack.h" using namespace std; using namespace MIDI; diff --git a/libs/midi++2/midi++/alsa_rawmidi.h b/libs/midi++2/midi++/alsa_rawmidi.h index e5abc2832f..5c0c0ff0ea 100644 --- a/libs/midi++2/midi++/alsa_rawmidi.h +++ b/libs/midi++2/midi++/alsa_rawmidi.h @@ -25,8 +25,8 @@ #include <fcntl.h> #include <unistd.h> -#include <midi++/port.h> -#include <midi++/fd_midiport.h> +#include "midi++/port.h" +#include "midi++/fd_midiport.h" namespace MIDI { diff --git a/libs/midi++2/midi++/alsa_sequencer.h b/libs/midi++2/midi++/alsa_sequencer.h index 8938d95918..889dd972b8 100644 --- a/libs/midi++2/midi++/alsa_sequencer.h +++ b/libs/midi++2/midi++/alsa_sequencer.h @@ -26,7 +26,7 @@ #include <unistd.h> #include <alsa/asoundlib.h> -#include <midi++/port.h> +#include "midi++/port.h" namespace MIDI { diff --git a/libs/midi++2/midi++/channel.h b/libs/midi++2/midi++/channel.h index 5a4a397b9d..697f2a1e46 100644 --- a/libs/midi++2/midi++/channel.h +++ b/libs/midi++2/midi++/channel.h @@ -24,8 +24,8 @@ #include <sigc++/sigc++.h> -#include <midi++/types.h> -#include <midi++/parser.h> +#include "midi++/types.h" +#include "midi++/parser.h" namespace MIDI { diff --git a/libs/midi++2/midi++/coremidi_midiport.h b/libs/midi++2/midi++/coremidi_midiport.h index f9b89f3348..74207238ad 100644 --- a/libs/midi++2/midi++/coremidi_midiport.h +++ b/libs/midi++2/midi++/coremidi_midiport.h @@ -27,7 +27,7 @@ #include <fcntl.h> #include <unistd.h> -#include <midi++/port.h> +#include "midi++/port.h" #include <CoreMIDI/CoreMIDI.h> diff --git a/libs/midi++2/midi++/event.h b/libs/midi++2/midi++/event.h index d9b5333904..70744536a8 100644 --- a/libs/midi++2/midi++/event.h +++ b/libs/midi++2/midi++/event.h @@ -26,9 +26,9 @@ #include <sstream> #include <assert.h> -#include <midi++/types.h> -#include <midi++/events.h> -#include <pbd/xml++.h> +#include "midi++/types.h" +#include "midi++/events.h" +#include "pbd/xml++.h" /** If this is not defined, all methods of MidiEvent are RT safe * but MidiEvent will never deep copy and (depending on the scenario) @@ -39,7 +39,7 @@ /** Support serialisation of MIDI events to/from XML */ #define EVORAL_MIDI_XML 1 -#include <evoral/Event.hpp> -#include <evoral/MIDIEvent.hpp> +#include "evoral/Event.hpp" +#include "evoral/MIDIEvent.hpp" #endif /* __libmidipp_midi_event_h__ */ diff --git a/libs/midi++2/midi++/factory.h b/libs/midi++2/midi++/factory.h index f3402546e9..3f130c41a7 100644 --- a/libs/midi++2/midi++/factory.h +++ b/libs/midi++2/midi++/factory.h @@ -22,7 +22,7 @@ #include <vector> #include <string> -#include <midi++/port.h> +#include "midi++/port.h" namespace MIDI { diff --git a/libs/midi++2/midi++/fd_midiport.h b/libs/midi++2/midi++/fd_midiport.h index 66c2206674..8f942cf970 100644 --- a/libs/midi++2/midi++/fd_midiport.h +++ b/libs/midi++2/midi++/fd_midiport.h @@ -28,7 +28,7 @@ #include <fcntl.h> #include <unistd.h> -#include <midi++/port.h> +#include "midi++/port.h" namespace MIDI { diff --git a/libs/midi++2/midi++/fifomidi.h b/libs/midi++2/midi++/fifomidi.h index 3439c27dcf..022d055d92 100644 --- a/libs/midi++2/midi++/fifomidi.h +++ b/libs/midi++2/midi++/fifomidi.h @@ -24,8 +24,8 @@ #include <string> #include <unistd.h> -#include <midi++/port.h> -#include <midi++/fd_midiport.h> +#include "midi++/port.h" +#include "midi++/fd_midiport.h" namespace MIDI { diff --git a/libs/midi++2/midi++/jack.h b/libs/midi++2/midi++/jack.h index 255264b1d8..a449a8c554 100644 --- a/libs/midi++2/midi++/jack.h +++ b/libs/midi++2/midi++/jack.h @@ -30,11 +30,11 @@ #include <glibmm/thread.h> -#include <pbd/ringbuffer.h> +#include "pbd/ringbuffer.h" #include <jack/jack.h> #include <jack/midiport.h> -#include <midi++/port.h> -#include <midi++/event.h> +#include "midi++/port.h" +#include "midi++/event.h" namespace MIDI { diff --git a/libs/midi++2/midi++/manager.h b/libs/midi++2/midi++/manager.h index bb3bf9b999..43da0d3fd2 100644 --- a/libs/midi++2/midi++/manager.h +++ b/libs/midi++2/midi++/manager.h @@ -25,8 +25,8 @@ #include <string> -#include <midi++/types.h> -#include <midi++/port.h> +#include "midi++/types.h" +#include "midi++/port.h" namespace MIDI { diff --git a/libs/midi++2/midi++/mmc.h b/libs/midi++2/midi++/mmc.h index 6abbed8207..fb8fd2449f 100644 --- a/libs/midi++2/midi++/mmc.h +++ b/libs/midi++2/midi++/mmc.h @@ -21,7 +21,7 @@ #define __midipp_mmc_h_h__ #include <sigc++/sigc++.h> -#include <midi++/types.h> +#include "midi++/types.h" namespace MIDI { diff --git a/libs/midi++2/midi++/nullmidi.h b/libs/midi++2/midi++/nullmidi.h index 05efacf786..0ed221a78d 100644 --- a/libs/midi++2/midi++/nullmidi.h +++ b/libs/midi++2/midi++/nullmidi.h @@ -23,7 +23,7 @@ #include <vector> #include <string> -#include <midi++/port.h> +#include "midi++/port.h" namespace MIDI { diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h index 2b3412cc00..5baa3af4b6 100644 --- a/libs/midi++2/midi++/parser.h +++ b/libs/midi++2/midi++/parser.h @@ -25,7 +25,7 @@ #include <sigc++/sigc++.h> -#include <midi++/types.h> +#include "midi++/types.h" namespace MIDI { diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h index 7522bc520f..e7d5531bf9 100644 --- a/libs/midi++2/midi++/port.h +++ b/libs/midi++2/midi++/port.h @@ -23,10 +23,10 @@ #include <iostream> #include <sigc++/sigc++.h> -#include <pbd/xml++.h> +#include "pbd/xml++.h" -#include <midi++/types.h> -#include <midi++/parser.h> +#include "midi++/types.h" +#include "midi++/parser.h" namespace MIDI { diff --git a/libs/midi++2/midi.cc b/libs/midi++2/midi.cc index 89d74b1b31..eacd85bf28 100644 --- a/libs/midi++2/midi.cc +++ b/libs/midi++2/midi.cc @@ -20,7 +20,7 @@ #include <cstring> #include <cstdlib> -#include <midi++/types.h> +#include "midi++/types.h" const char *MIDI::controller_names[] = { "bank (0)", diff --git a/libs/midi++2/midichannel.cc b/libs/midi++2/midichannel.cc index c8a18f2ee2..0a43b9c900 100644 --- a/libs/midi++2/midichannel.cc +++ b/libs/midi++2/midichannel.cc @@ -19,9 +19,9 @@ */ #include <cstring> -#include <midi++/types.h> -#include <midi++/port.h> -#include <midi++/channel.h> +#include "midi++/types.h" +#include "midi++/port.h" +#include "midi++/channel.h" using namespace sigc; using namespace MIDI; diff --git a/libs/midi++2/midifactory.cc b/libs/midi++2/midifactory.cc index d893cc9f47..dbf6d47f52 100644 --- a/libs/midi++2/midifactory.cc +++ b/libs/midi++2/midifactory.cc @@ -19,15 +19,15 @@ #include <cassert> -#include <pbd/error.h> -#include <pbd/convert.h> +#include "pbd/error.h" +#include "pbd/convert.h" -#include <midi++/types.h> -#include <midi++/factory.h> -#include <midi++/fifomidi.h> +#include "midi++/types.h" +#include "midi++/factory.h" +#include "midi++/fifomidi.h" #ifdef WITH_JACK_MIDI -#include <midi++/jack.h> +#include "midi++/jack.h" std::string MIDI::JACK_MidiPort::typestring = "jack"; #endif // WITH_JACK_MIDI @@ -35,8 +35,8 @@ std::string MIDI::JACK_MidiPort::typestring = "jack"; std::string MIDI::FIFO_MidiPort::typestring = "fifo"; #ifdef WITH_ALSA -#include <midi++/alsa_sequencer.h> -#include <midi++/alsa_rawmidi.h> +#include "midi++/alsa_sequencer.h" +#include "midi++/alsa_rawmidi.h" std::string MIDI::ALSA_SequencerMidiPort::typestring = "alsa/sequencer"; std::string MIDI::ALSA_RawMidiPort::typestring = "alsa/raw"; @@ -44,7 +44,7 @@ std::string MIDI::ALSA_RawMidiPort::typestring = "alsa/raw"; #endif // WITH_ALSA #ifdef WITH_COREMIDI -#include <midi++/coremidi_midiport.h> +#include "midi++/coremidi_midiport.h" std::string MIDI::CoreMidi_MidiPort::typestring = "coremidi"; diff --git a/libs/midi++2/midimanager.cc b/libs/midi++2/midimanager.cc index 14c9d43793..ab03688e49 100644 --- a/libs/midi++2/midimanager.cc +++ b/libs/midi++2/midimanager.cc @@ -21,12 +21,12 @@ #include <glib.h> -#include <pbd/error.h> +#include "pbd/error.h" -#include <midi++/types.h> -#include <midi++/manager.h> -#include <midi++/factory.h> -#include <midi++/channel.h> +#include "midi++/types.h" +#include "midi++/manager.h" +#include "midi++/factory.h" +#include "midi++/channel.h" using namespace std; using namespace MIDI; diff --git a/libs/midi++2/midiparser.cc b/libs/midi++2/midiparser.cc index 4cbcd27694..2222575678 100644 --- a/libs/midi++2/midiparser.cc +++ b/libs/midi++2/midiparser.cc @@ -28,11 +28,11 @@ #include <iostream> #include <iterator> -#include <midi++/types.h> -#include <midi++/parser.h> -#include <midi++/port.h> -#include <midi++/mmc.h> -#include <pbd/transmitter.h> +#include "midi++/types.h" +#include "midi++/parser.h" +#include "midi++/port.h" +#include "midi++/mmc.h" +#include "pbd/transmitter.h" using namespace std; using namespace sigc; diff --git a/libs/midi++2/midiport.cc b/libs/midi++2/midiport.cc index 8f4a6fb3d2..9df6e7e7d9 100644 --- a/libs/midi++2/midiport.cc +++ b/libs/midi++2/midiport.cc @@ -22,14 +22,14 @@ #include <fcntl.h> #include <errno.h> -#include <pbd/xml++.h> -#include <pbd/error.h> -#include <pbd/failed_constructor.h> - -#include <midi++/types.h> -#include <midi++/port.h> -#include <midi++/channel.h> -#include <midi++/factory.h> +#include "pbd/xml++.h" +#include "pbd/error.h" +#include "pbd/failed_constructor.h" + +#include "midi++/types.h" +#include "midi++/port.h" +#include "midi++/channel.h" +#include "midi++/factory.h" using namespace MIDI; using namespace std; diff --git a/libs/midi++2/miditrace.cc b/libs/midi++2/miditrace.cc index fafe822f82..b5a66cafa9 100644 --- a/libs/midi++2/miditrace.cc +++ b/libs/midi++2/miditrace.cc @@ -1,8 +1,8 @@ #include <cstdio> #include <fcntl.h> -#include <pbd/error.h> -#include <pbd/textreceiver.h> +#include "pbd/error.h" +#include "pbd/textreceiver.h" Transmitter error (Transmitter::Error); Transmitter info (Transmitter::Info); diff --git a/libs/midi++2/mmc.cc b/libs/midi++2/mmc.cc index 1ede281c28..5ec1acd5d9 100644 --- a/libs/midi++2/mmc.cc +++ b/libs/midi++2/mmc.cc @@ -20,10 +20,10 @@ #include <map> -#include <pbd/error.h> -#include <midi++/mmc.h> -#include <midi++/port.h> -#include <midi++/parser.h> +#include "pbd/error.h" +#include "midi++/mmc.h" +#include "midi++/port.h" +#include "midi++/parser.h" using namespace std; using namespace MIDI; diff --git a/libs/midi++2/mmctest.cc b/libs/midi++2/mmctest.cc index 062f6e8d32..527e1491ea 100644 --- a/libs/midi++2/mmctest.cc +++ b/libs/midi++2/mmctest.cc @@ -1,8 +1,8 @@ #include <cstdio> #include <fcntl.h> -#include <pbd/error.h> -#include <pbd/textreceiver.h> +#include "pbd/error.h" +#include "pbd/textreceiver.h" Transmitter error (Transmitter::Error); Transmitter info (Transmitter::Info); diff --git a/libs/midi++2/mtc.cc b/libs/midi++2/mtc.cc index 9d62c7354c..1dd023a2f2 100644 --- a/libs/midi++2/mtc.cc +++ b/libs/midi++2/mtc.cc @@ -23,11 +23,11 @@ #include <cstring> #include <iostream> -#include <midi++/types.h> -#include <midi++/parser.h> -#include <midi++/port.h> -#include <midi++/mmc.h> -#include <pbd/transmitter.h> +#include "midi++/types.h" +#include "midi++/parser.h" +#include "midi++/port.h" +#include "midi++/mmc.h" +#include "pbd/transmitter.h" using namespace std; using namespace sigc; diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc index 0dbe6baf52..015951f118 100644 --- a/libs/pbd/base_ui.cc +++ b/libs/pbd/base_ui.cc @@ -24,10 +24,10 @@ #include <cerrno> #include <cstring> -#include <pbd/base_ui.h> -#include <pbd/error.h> -#include <pbd/compose.h> -#include <pbd/failed_constructor.h> +#include "pbd/base_ui.h" +#include "pbd/error.h" +#include "pbd/compose.h" +#include "pbd/failed_constructor.h" #include "i18n.h" diff --git a/libs/pbd/basename.cc b/libs/pbd/basename.cc index 0b631f4249..2d132408c7 100644 --- a/libs/pbd/basename.cc +++ b/libs/pbd/basename.cc @@ -17,7 +17,7 @@ */ -#include <pbd/basename.h> +#include "pbd/basename.h" #include <glibmm/miscutils.h> using Glib::ustring; diff --git a/libs/pbd/command.cc b/libs/pbd/command.cc index 2b64c46030..452223317b 100644 --- a/libs/pbd/command.cc +++ b/libs/pbd/command.cc @@ -17,8 +17,8 @@ */ -#include <pbd/command.h> -#include <pbd/xml++.h> +#include "pbd/command.h" +#include "pbd/xml++.h" XMLNode &Command::get_state() { diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc index 4788965c97..ba6b32282b 100644 --- a/libs/pbd/controllable.cc +++ b/libs/pbd/controllable.cc @@ -17,9 +17,9 @@ */ -#include <pbd/controllable.h> -#include <pbd/xml++.h> -#include <pbd/error.h> +#include "pbd/controllable.h" +#include "pbd/xml++.h" +#include "pbd/error.h" #include "i18n.h" diff --git a/libs/pbd/enumwriter.cc b/libs/pbd/enumwriter.cc index 7033e5f3b1..134a00a207 100644 --- a/libs/pbd/enumwriter.cc +++ b/libs/pbd/enumwriter.cc @@ -23,9 +23,9 @@ #include <cstring> #include <cstdlib> -#include <pbd/enumwriter.h> -#include <pbd/error.h> -#include <pbd/compose.h> +#include "pbd/enumwriter.h" +#include "pbd/error.h" +#include "pbd/compose.h" using namespace std; using namespace PBD; diff --git a/libs/pbd/error.cc b/libs/pbd/error.cc index f3568d0877..f428c16c5b 100644 --- a/libs/pbd/error.cc +++ b/libs/pbd/error.cc @@ -17,7 +17,7 @@ */ -#include <pbd/error.h> +#include "pbd/error.h" Transmitter PBD::error (Transmitter::Error); Transmitter PBD::info (Transmitter::Info); diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc index 6af039a83e..1e9ff03c6f 100644 --- a/libs/pbd/file_utils.cc +++ b/libs/pbd/file_utils.cc @@ -22,10 +22,10 @@ #include <glibmm/fileutils.h> #include <glibmm/pattern.h> -#include <pbd/compose.h> -#include <pbd/file_utils.h> +#include "pbd/compose.h" +#include "pbd/file_utils.h" -#include <pbd/error.h> +#include "pbd/error.h" namespace PBD { diff --git a/libs/pbd/filesystem.cc b/libs/pbd/filesystem.cc index 84d18cfcd2..4d82ed2fe6 100644 --- a/libs/pbd/filesystem.cc +++ b/libs/pbd/filesystem.cc @@ -27,9 +27,9 @@ #include <glibmm/fileutils.h> #include <glibmm/miscutils.h> -#include <pbd/filesystem.h> -#include <pbd/error.h> -#include <pbd/compose.h> +#include "pbd/filesystem.h" +#include "pbd/error.h" +#include "pbd/compose.h" #include "i18n.h" diff --git a/libs/pbd/filesystem_paths.cc b/libs/pbd/filesystem_paths.cc index 6846cb5aa5..a5c3c65c16 100644 --- a/libs/pbd/filesystem_paths.cc +++ b/libs/pbd/filesystem_paths.cc @@ -18,7 +18,7 @@ #include <glib.h> -#include <pbd/filesystem_paths.h> +#include "pbd/filesystem_paths.h" namespace PBD { diff --git a/libs/pbd/fpu.cc b/libs/pbd/fpu.cc index 76150824c7..5f9d4c2778 100644 --- a/libs/pbd/fpu.cc +++ b/libs/pbd/fpu.cc @@ -2,8 +2,8 @@ #include <cstdlib> #include <stdint.h> -#include <pbd/fpu.h> -#include <pbd/error.h> +#include "pbd/fpu.h" +#include "pbd/error.h" #include "i18n.h" diff --git a/libs/pbd/i18n.h b/libs/pbd/i18n.h index 7c79d2eb53..af1ac9d162 100644 --- a/libs/pbd/i18n.h +++ b/libs/pbd/i18n.h @@ -1,7 +1,7 @@ #ifndef __i18n_h__ #define __i18n_h__ -#include <pbd/compose.h> +#include "pbd/compose.h" #include "gettext.h" #define _(Text) dgettext (PACKAGE, Text) diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc index 642243a36a..d24d22a0f9 100644 --- a/libs/pbd/id.cc +++ b/libs/pbd/id.cc @@ -26,7 +26,7 @@ #endif #include <inttypes.h> -#include <pbd/id.h> +#include "pbd/id.h" #include <string> using namespace std; diff --git a/libs/pbd/mountpoint.cc b/libs/pbd/mountpoint.cc index a4063a0e40..e85a299e0b 100644 --- a/libs/pbd/mountpoint.cc +++ b/libs/pbd/mountpoint.cc @@ -24,7 +24,7 @@ #include <cstring> #include <limits.h> -#include <pbd/mountpoint.h> +#include "pbd/mountpoint.h" using std::string; diff --git a/libs/pbd/pathscanner.cc b/libs/pbd/pathscanner.cc index e12df5efac..a9847ad250 100644 --- a/libs/pbd/pathscanner.cc +++ b/libs/pbd/pathscanner.cc @@ -25,9 +25,9 @@ #include <vector> #include <dirent.h> -#include <pbd/error.h> -#include <pbd/pathscanner.h> -#include <pbd/stl_delete.h> +#include "pbd/error.h" +#include "pbd/pathscanner.h" +#include "pbd/stl_delete.h" using namespace PBD; diff --git a/libs/pbd/pbd/abstract_ui.cc b/libs/pbd/pbd/abstract_ui.cc index 8e5b9ceb07..a4c92c0de9 100644 --- a/libs/pbd/pbd/abstract_ui.cc +++ b/libs/pbd/pbd/abstract_ui.cc @@ -1,8 +1,8 @@ #include <unistd.h> -#include <pbd/abstract_ui.h> -#include <pbd/pthread_utils.h> -#include <pbd/failed_constructor.h> +#include "pbd/abstract_ui.h" +#include "pbd/pthread_utils.h" +#include "pbd/failed_constructor.h" #include "i18n.h" diff --git a/libs/pbd/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h index 88c27aa0bc..adb9aabf0e 100644 --- a/libs/pbd/pbd/abstract_ui.h +++ b/libs/pbd/pbd/abstract_ui.h @@ -28,9 +28,9 @@ #include <glibmm/thread.h> -#include <pbd/receiver.h> -#include <pbd/ringbufferNPT.h> -#include <pbd/base_ui.h> +#include "pbd/receiver.h" +#include "pbd/ringbufferNPT.h" +#include "pbd/base_ui.h" class Touchable; diff --git a/libs/pbd/pbd/command.h b/libs/pbd/pbd/command.h index 1521a60350..240118901c 100644 --- a/libs/pbd/pbd/command.h +++ b/libs/pbd/pbd/command.h @@ -21,7 +21,7 @@ #ifndef __lib_pbd_command_h__ #define __lib_pbd_command_h__ -#include <pbd/statefuldestructible.h> +#include "pbd/statefuldestructible.h" #include <boost/utility.hpp> class Command : public PBD::StatefulDestructible, public boost::noncopyable diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h index 6d37464419..0007e04fd3 100644 --- a/libs/pbd/pbd/controllable.h +++ b/libs/pbd/pbd/controllable.h @@ -26,7 +26,7 @@ #include <sigc++/trackable.h> #include <sigc++/signal.h> -#include <pbd/statefuldestructible.h> +#include "pbd/statefuldestructible.h" class XMLNode; diff --git a/libs/pbd/pbd/crossthread.h b/libs/pbd/pbd/crossthread.h index b815cfd319..c63c863f38 100644 --- a/libs/pbd/pbd/crossthread.h +++ b/libs/pbd/pbd/crossthread.h @@ -20,7 +20,7 @@ #ifndef __pbd__crossthread_h__ #define __pbd__crossthread_h__ -#include <pbd/abstract_ui.h> +#include "pbd/abstract_ui.h" #include <sigc++/sigc++.h> #include <pthread.h> diff --git a/libs/pbd/pbd/file_utils.h b/libs/pbd/pbd/file_utils.h index a9832ce720..ce5422db13 100644 --- a/libs/pbd/pbd/file_utils.h +++ b/libs/pbd/pbd/file_utils.h @@ -25,7 +25,7 @@ #include <glibmm/pattern.h> -#include <pbd/search_path.h> +#include "pbd/search_path.h" namespace PBD { diff --git a/libs/pbd/pbd/filesystem_paths.h b/libs/pbd/pbd/filesystem_paths.h index 4e09c6ec4b..8b767a3dfc 100644 --- a/libs/pbd/pbd/filesystem_paths.h +++ b/libs/pbd/pbd/filesystem_paths.h @@ -21,7 +21,7 @@ #include <vector> -#include <pbd/filesystem.h> +#include "pbd/filesystem.h" namespace PBD { diff --git a/libs/pbd/pbd/functor_command.h b/libs/pbd/pbd/functor_command.h index e6c07cfdbe..b651c6f775 100644 --- a/libs/pbd/pbd/functor_command.h +++ b/libs/pbd/pbd/functor_command.h @@ -25,10 +25,10 @@ #include <string> #include <map> -#include <pbd/xml++.h> -#include <pbd/shiva.h> -#include <pbd/command.h> -#include <pbd/failed_constructor.h> +#include "pbd/xml++.h" +#include "pbd/shiva.h" +#include "pbd/command.h" +#include "pbd/failed_constructor.h" /** This command class is initialized */ diff --git a/libs/pbd/pbd/memento_command.h b/libs/pbd/pbd/memento_command.h index 1a6600b1b5..e89da70c20 100644 --- a/libs/pbd/pbd/memento_command.h +++ b/libs/pbd/pbd/memento_command.h @@ -23,10 +23,10 @@ #include <iostream> -#include <pbd/command.h> -#include <pbd/stacktrace.h> -#include <pbd/xml++.h> -#include <pbd/shiva.h> +#include "pbd/command.h" +#include "pbd/stacktrace.h" +#include "pbd/xml++.h" +#include "pbd/shiva.h" #include <sigc++/slot.h> #include <typeinfo> diff --git a/libs/pbd/pbd/pool.h b/libs/pbd/pbd/pool.h index d604680ae2..66a87abf96 100644 --- a/libs/pbd/pbd/pool.h +++ b/libs/pbd/pbd/pool.h @@ -25,7 +25,7 @@ #include <glibmm/thread.h> -#include <pbd/ringbuffer.h> +#include "pbd/ringbuffer.h" class Pool { diff --git a/libs/pbd/pbd/search_path.h b/libs/pbd/pbd/search_path.h index 505583b3e0..6163aae607 100644 --- a/libs/pbd/pbd/search_path.h +++ b/libs/pbd/pbd/search_path.h @@ -23,7 +23,7 @@ #include <string> #include <vector> -#include <pbd/filesystem.h> +#include "pbd/filesystem.h" namespace PBD { diff --git a/libs/pbd/pbd/stateful.h b/libs/pbd/pbd/stateful.h index 8ea647475a..0d75a8579a 100644 --- a/libs/pbd/pbd/stateful.h +++ b/libs/pbd/pbd/stateful.h @@ -21,7 +21,7 @@ #define __pbd_stateful_h__ #include <string> -#include <pbd/id.h> +#include "pbd/id.h" class XMLNode; diff --git a/libs/pbd/pbd/statefuldestructible.h b/libs/pbd/pbd/statefuldestructible.h index 83eff473d6..49a33ff438 100644 --- a/libs/pbd/pbd/statefuldestructible.h +++ b/libs/pbd/pbd/statefuldestructible.h @@ -20,8 +20,8 @@ #ifndef __pbd_stateful_destructible_h__ #define __pbd_stateful_destructible_h__ -#include <pbd/stateful.h> -#include <pbd/destructible.h> +#include "pbd/stateful.h" +#include "pbd/destructible.h" namespace PBD { diff --git a/libs/pbd/pbd/tokenizer.h b/libs/pbd/pbd/tokenizer.h index 9206d1b6fb..39954194fb 100644 --- a/libs/pbd/pbd/tokenizer.h +++ b/libs/pbd/pbd/tokenizer.h @@ -23,7 +23,7 @@ #include <iterator> #include <string> -#include <pbd/whitespace.h> +#include "pbd/whitespace.h" namespace PBD { diff --git a/libs/pbd/pbd/undo.h b/libs/pbd/pbd/undo.h index cf1f6f3470..0e48bea962 100644 --- a/libs/pbd/pbd/undo.h +++ b/libs/pbd/pbd/undo.h @@ -26,8 +26,8 @@ #include <sigc++/slot.h> #include <sigc++/bind.h> #include <sys/time.h> -#include <pbd/command.h> -#include <pbd/shiva.h> +#include "pbd/command.h" +#include "pbd/shiva.h" typedef sigc::slot<void> UndoAction; diff --git a/libs/pbd/pool.cc b/libs/pbd/pool.cc index 6d41f14f7e..2a9022542a 100644 --- a/libs/pbd/pool.cc +++ b/libs/pbd/pool.cc @@ -23,8 +23,8 @@ #include <vector> #include <cstdlib> -#include <pbd/pool.h> -#include <pbd/error.h> +#include "pbd/pool.h" +#include "pbd/error.h" using namespace std; using namespace PBD; diff --git a/libs/pbd/pthread_utils.cc b/libs/pbd/pthread_utils.cc index c63f988af3..8274223487 100644 --- a/libs/pbd/pthread_utils.cc +++ b/libs/pbd/pthread_utils.cc @@ -23,7 +23,7 @@ #include <string> #include <stdint.h> -#include <pbd/pthread_utils.h> +#include "pbd/pthread_utils.h" using namespace std; diff --git a/libs/pbd/receiver.cc b/libs/pbd/receiver.cc index 5e7c10de70..456ff3ae79 100644 --- a/libs/pbd/receiver.cc +++ b/libs/pbd/receiver.cc @@ -20,8 +20,8 @@ #include <vector> -#include <pbd/receiver.h> -#include <pbd/transmitter.h> +#include "pbd/receiver.h" +#include "pbd/transmitter.h" using namespace sigc; diff --git a/libs/pbd/search_path.cc b/libs/pbd/search_path.cc index 350eea05d3..2238b233fe 100644 --- a/libs/pbd/search_path.cc +++ b/libs/pbd/search_path.cc @@ -17,9 +17,9 @@ */ -#include <pbd/tokenizer.h> -#include <pbd/search_path.h> -#include <pbd/error.h> +#include "pbd/tokenizer.h" +#include "pbd/search_path.h" +#include "pbd/error.h" namespace { diff --git a/libs/pbd/shortpath.cc b/libs/pbd/shortpath.cc index 9f9598e617..d283631cde 100644 --- a/libs/pbd/shortpath.cc +++ b/libs/pbd/shortpath.cc @@ -17,7 +17,7 @@ */ -#include <pbd/shortpath.h> +#include "pbd/shortpath.h" using namespace Glib; using namespace std; diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc index c517967fa2..d2e765997a 100644 --- a/libs/pbd/stacktrace.cc +++ b/libs/pbd/stacktrace.cc @@ -17,7 +17,7 @@ */ -#include <pbd/stacktrace.h> +#include "pbd/stacktrace.h" #include <iostream> void diff --git a/libs/pbd/stateful.cc b/libs/pbd/stateful.cc index 4adcab478c..8846226ad3 100644 --- a/libs/pbd/stateful.cc +++ b/libs/pbd/stateful.cc @@ -20,10 +20,10 @@ #include <unistd.h> -#include <pbd/stateful.h> -#include <pbd/filesystem.h> -#include <pbd/xml++.h> -#include <pbd/error.h> +#include "pbd/stateful.h" +#include "pbd/filesystem.h" +#include "pbd/xml++.h" +#include "pbd/error.h" #include "i18n.h" diff --git a/libs/pbd/strreplace.cc b/libs/pbd/strreplace.cc index 7999b5c6c9..5d36608b3b 100644 --- a/libs/pbd/strreplace.cc +++ b/libs/pbd/strreplace.cc @@ -17,7 +17,7 @@ */ -#include <pbd/replace_all.h> +#include "pbd/replace_all.h" int replace_all (std::string& str, diff --git a/libs/pbd/strsplit.cc b/libs/pbd/strsplit.cc index 342daadaa2..d30b7356ac 100644 --- a/libs/pbd/strsplit.cc +++ b/libs/pbd/strsplit.cc @@ -17,7 +17,7 @@ */ -#include <pbd/strsplit.h> +#include "pbd/strsplit.h" using namespace std; using namespace Glib; diff --git a/libs/pbd/textreceiver.cc b/libs/pbd/textreceiver.cc index 43620e9830..2cd1cf3712 100644 --- a/libs/pbd/textreceiver.cc +++ b/libs/pbd/textreceiver.cc @@ -21,7 +21,7 @@ #include <iostream> #include <cstdlib> -#include <pbd/textreceiver.h> +#include "pbd/textreceiver.h" TextReceiver::TextReceiver (const string &n) diff --git a/libs/pbd/transmitter.cc b/libs/pbd/transmitter.cc index 876a9d86e5..9a2dda86c4 100644 --- a/libs/pbd/transmitter.cc +++ b/libs/pbd/transmitter.cc @@ -23,8 +23,8 @@ #include <iostream> #include <string> -#include <pbd/transmitter.h> -#include <pbd/error.h> +#include "pbd/transmitter.h" +#include "pbd/error.h" using std::string; using std::ios; diff --git a/libs/pbd/undo.cc b/libs/pbd/undo.cc index 5365a98146..a0e98f9a13 100644 --- a/libs/pbd/undo.cc +++ b/libs/pbd/undo.cc @@ -22,8 +22,8 @@ #include <sstream> #include <time.h> -#include <pbd/undo.h> -#include <pbd/xml++.h> +#include "pbd/undo.h" +#include "pbd/xml++.h" #include <sigc++/bind.h> diff --git a/libs/pbd/uuid.cc b/libs/pbd/uuid.cc index 0ccffa2091..0ffeca23cb 100644 --- a/libs/pbd/uuid.cc +++ b/libs/pbd/uuid.cc @@ -18,7 +18,7 @@ */ -#include <pbd/uuid.h> +#include "pbd/uuid.h" using namespace PBD; diff --git a/libs/pbd/whitespace.cc b/libs/pbd/whitespace.cc index b09d830103..d73fced321 100644 --- a/libs/pbd/whitespace.cc +++ b/libs/pbd/whitespace.cc @@ -17,7 +17,7 @@ */ -#include <pbd/whitespace.h> +#include "pbd/whitespace.h" using namespace std; diff --git a/libs/pbd/xml++.cc b/libs/pbd/xml++.cc index d878245242..9f7ef6007f 100644 --- a/libs/pbd/xml++.cc +++ b/libs/pbd/xml++.cc @@ -5,7 +5,7 @@ * Modified for Ardour and released under the same terms. */ -#include <pbd/xml++.h> +#include "pbd/xml++.h" #include <libxml/debugXML.h> #include <libxml/xpath.h> #include <libxml/xpathInternals.h> |