ardour/livetrax
13
0
Fork 0
Code

Remove over 500 unnecessary includes (including 54 of session.h).

Browse Source 
It's slightly possible that this causes trivial build failures on different
configurations, but otherwise shouldn't cause any problems (i.e. no actual
changes other than include/naming/namespace stuff).  I deliberately avoided
removing libardour-config.h since this can mysteriously break things, though a
few of those do seem to be unnecessary.

This commit only targets includes of ardour/*.h.  There is also a very large
number of unnecessary includes of stuff in gtk2_ardour; tackling that should
also give a big improvement in build time when things are modified.


git-svn-id: svn://localhost/ardour2/branches/3.0@12420 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2012-05-24 06:09:29 +00:00
parent 224e6175ad
commit 6fa6514cfd
215 changed files with 390 additions and 888 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/about.cc
View File

@ -28,7 +28,6 @@
#include "pbd/file_utils.h"
#include "ardour/svn_revision.h"
#include "ardour/ardour.h"
#include "ardour/version.h"
#include "ardour/filesystem_paths.h"

1
gtk2_ardour/actions.cc
View File

@ -31,7 +31,6 @@
#include "pbd/error.h"
#include "pbd/file_utils.h"
#include "ardour/ardour.h"
#include "ardour/filesystem_paths.h"
#include "ardour/rc_configuration.h"

27
gtk2_ardour/ardour_ui.cc
View File

@ -60,26 +60,18 @@
#include "midi++/manager.h"
#include "ardour/ardour.h"
#include "ardour/callback.h"
#include "ardour/audioengine.h"
#include "ardour/audiofilesource.h"
#include "ardour/diskstream.h"
#include "ardour/filename_extensions.h"
#include "ardour/port.h"
#include "ardour/process_thread.h"
#include "ardour/profile.h"
#include "ardour/plugin_manager.h"
#include "ardour/recent_sessions.h"
#include "ardour/session_directory.h"
#include "ardour/session_route.h"
#include "ardour/session_state_utils.h"
#include "ardour/session_utils.h"
#include "ardour/port.h"
#include "ardour/audioengine.h"
#include "ardour/playlist.h"
#include "ardour/utils.h"
#include "ardour/audio_diskstream.h"
#include "ardour/audiofilesource.h"
#include "ardour/recent_sessions.h"
#include "ardour/port.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
#include "ardour/filesystem_paths.h"
#include "ardour/filename_extensions.h"
#include "ardour/process_thread.h"
typedef uint64_t microseconds_t;
@ -121,6 +113,7 @@ using namespace ARDOUR;
using namespace PBD;
using namespace Gtkmm2ext;
using namespace Gtk;
using namespace std;
ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
UIConfiguration *ARDOUR_UI::ui_config = 0;
@ -130,7 +123,7 @@ sigc::signal<void> ARDOUR_UI::RapidScreenUpdate;
sigc::signal<void> ARDOUR_UI::SuperRapidScreenUpdate;
sigc::signal<void, framepos_t, bool, framepos_t> ARDOUR_UI::Clock;
bool could_be_a_valid_path (const string& path);
bool could_be_a_valid_path (const std::string& path);
ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
@ -335,7 +328,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
/** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */
bool
ARDOUR_UI::run_startup (bool should_be_new, string load_template)
ARDOUR_UI::run_startup (bool should_be_new, std::string load_template)
{
delete _startup;
_startup = new ArdourStartup ();

6
gtk2_ardour/ardour_ui2.cc
View File

@ -37,11 +37,9 @@
#include <gtkmm2ext/click_box.h>
#include <gtkmm2ext/tearoff.h>
#include "ardour/session.h"
#include "ardour/audioengine.h"
#include "ardour/ardour.h"
#include "ardour/profile.h"
#include "ardour/route.h"
#include "ardour/session.h"
#include "ardour/types.h"
#include "ardour_ui.h"
#include "keyboard.h"

1
gtk2_ardour/ardour_ui_ed.cc
View File

@ -61,7 +61,6 @@
#include "ardour/session.h"
#include "ardour/profile.h"
#include "ardour/audioengine.h"
#include "ardour/control_protocol_manager.h"
#include "control_protocol/control_protocol.h"

4
gtk2_ardour/ardour_ui_options.cc
View File

@ -26,10 +26,8 @@
#include <gtkmm2ext/utils.h>
#include "ardour/configuration.h"
#include "ardour/session.h"
#include "ardour/audioengine.h"
#include "ardour/rc_configuration.h"
#include "ardour/session.h"
#ifdef HAVE_LIBLO
#include "ardour/osc.h"

5
gtk2_ardour/audio_clock.cc
View File

@ -24,17 +24,16 @@
#include "pbd/enumwriter.h"
#include <gtkmm/style.h>
#include <sigc++/bind.h>
#include "gtkmm2ext/cairocell.h"
#include "gtkmm2ext/utils.h"
#include "gtkmm2ext/rgb_macros.h"
#include "ardour/ardour.h"
#include "ardour/types.h"
#include "ardour/session.h"
#include "ardour/tempo.h"
#include "ardour/profile.h"
#include "ardour/slave.h"
#include <sigc++/bind.h>
#include "ardour_ui.h"
#include "audio_clock.h"

10
gtk2_ardour/audio_region_editor.cc
View File

@ -17,17 +17,17 @@
*/
#include <cmath>
#include <gtkmm2ext/utils.h>
#include "pbd/memento_command.h"
#include "pbd/stateful_diff_command.h"
#include "pbd/pthread_utils.h"
#include "ardour/session.h"
#include "ardour/audioregion.h"
#include "ardour/playlist.h"
#include "ardour/utils.h"
#include "ardour/session_event.h"
#include "ardour/dB.h"
#include <gtkmm2ext/utils.h>
#include <cmath>
#include "audio_region_editor.h"
#include "audio_region_view.h"

2
gtk2_ardour/audio_streamview.cc
View File

@ -26,11 +26,9 @@
#include "pbd/stacktrace.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/audiofilesource.h"
#include "ardour/audio_track.h"
#include "ardour/source.h"
#include "ardour/region_factory.h"
#include "ardour/profile.h"
#include "ardour/rc_configuration.h"

11
gtk2_ardour/audio_time_axis.cc
View File

@ -36,19 +36,10 @@
#include <gtkmm2ext/bindable_button.h>
#include <gtkmm2ext/utils.h>
#include "ardour/amp.h"
#include "ardour/audioplaylist.h"
#include "ardour/event_type_map.h"
#include "ardour/location.h"
#include "ardour/pannable.h"
#include "ardour/panner.h"
#include "ardour/panner_shell.h"
#include "ardour/playlist.h"
#include "ardour/processor.h"
#include "ardour/profile.h"
#include "ardour/session.h"
#include "ardour/session_playlist.h"
#include "ardour/utils.h"
#include "ardour_button.h"
#include "ardour_ui.h"
@ -67,8 +58,6 @@
#include "audio_streamview.h"
#include "utils.h"
#include "ardour/audio_track.h"
#include "i18n.h"
using namespace std;

6
gtk2_ardour/automation_controller.cc
View File

@ -23,12 +23,8 @@
#include "pbd/error.h"
#include "ardour/automation_list.h"
#include "ardour/automation_control.h"
#include "ardour/event_type_map.h"
#include "ardour/automatable.h"
#include "ardour/panner.h"
#include "ardour/pan_controllable.h"
#include "ardour/automation_control.h"
#include "ardour/session.h"
#include "ardour_ui.h"

1
gtk2_ardour/automation_region_view.cc
View File

@ -26,7 +26,6 @@
#include "ardour/midi_automation_list_binder.h"
#include "ardour/midi_region.h"
#include "ardour/session.h"
#include "ardour/source.h"
#include "automation_region_view.h"
#include "editing.h"

1
gtk2_ardour/automation_streamview.cc
View File

@ -26,7 +26,6 @@
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "ardour/region_factory.h"
#include "automation_streamview.h"
#include "region_view.h"

3
gtk2_ardour/axis_view.cc
View File

@ -32,9 +32,6 @@
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/gtk_ui.h>
#include "ardour/session.h"
#include "ardour/utils.h"
#include "public_editor.h"
#include "ardour_ui.h"
#include "gui_object.h"

1
gtk2_ardour/bundle_manager.cc
View File

@ -27,7 +27,6 @@
#include "ardour/session.h"
#include "ardour/user_bundle.h"
#include "ardour/audioengine.h"
#include "bundle_manager.h"
#include "gui_thread.h"
#include "i18n.h"

16
gtk2_ardour/canvas-flag.h
View File

@ -6,8 +6,6 @@
#include <libgnomecanvasmm/widget.h>
#include <libgnomecanvasmm/text.h>
#include "ardour/midi_model.h"
#include "simplerect.h"
#include "simpleline.h"
@ -20,19 +18,19 @@ class CanvasFlag : public Group
{
public:
CanvasFlag(MidiRegionView& region,
Group& parent,
double height,
guint outline_color_rgba = 0xc0c0c0ff,
guint fill_color_rgba = 0x07070707,
double x = 0.0,
double y = 0.0);
Group& parent,
double height,
guint outline_color_rgba = 0xc0c0c0ff,
guint fill_color_rgba = 0x07070707,
double x = 0.0,
double y = 0.0);
virtual ~CanvasFlag();
virtual bool on_event(GdkEvent* ev);
virtual void set_text(const std::string& a_text);
virtual void set_height (double);
virtual void set_height (double);
protected:
Text* _text;

4
gtk2_ardour/canvas-sysex.h
View File

@ -20,6 +20,8 @@
#ifndef CANVAS_SYSEX_H_
#define CANVAS_SYSEX_H_
#include <string>
#include "canvas-flag.h"
class MidiRegionView;
@ -33,7 +35,7 @@ public:
CanvasSysEx(
MidiRegionView& region,
Group& parent,
string& text,
std::string& text,
double height,
double x,
double y);

6
gtk2_ardour/edit_note_dialog.cc
View File

@ -19,11 +19,11 @@
#include <gtkmm/stock.h>
#include <gtkmm/table.h>
#include "ardour/midi_model.h"
#include "ardour/midi_region.h"
#include "edit_note_dialog.h"
#include "canvas-note-event.h"
#include "edit_note_dialog.h"
#include "midi_region_view.h"
#include "i18n.h"
using namespace Gtk;

10
gtk2_ardour/editor.cc
View File

@ -60,20 +60,14 @@
#include "gtkmm2ext/cell_renderer_pixbuf_toggle.h"
#include "ardour/audio_track.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioengine.h"
#include "ardour/audioregion.h"
#include "ardour/location.h"
#include "ardour/midi_region.h"
#include "ardour/plugin_manager.h"
#include "ardour/profile.h"
#include "ardour/route_group.h"
#include "ardour/session_directory.h"
#include "ardour/session_route.h"
#include "ardour/session_state_utils.h"
#include "ardour/session_playlists.h"
#include "ardour/tempo.h"
#include "ardour/utils.h"
#include "ardour/session_playlists.h"
#include "ardour/audioengine.h"
#include "control_protocol/control_protocol.h"

3
gtk2_ardour/editor_actions.cc
View File

@ -20,17 +20,16 @@
#include <gio/gio.h>
#include <gtk/gtkiconfactory.h>
#include "pbd/filesystem.h"
#include "pbd/file_utils.h"
#include "pbd/search_path.h"
#include "gtkmm2ext/tearoff.h"
#include "ardour/ardour.h"
#include "ardour/filesystem_paths.h"
#include "ardour/profile.h"
#include "ardour/session.h"
#include "ardour/types.h"
#include "actions.h"
#include "ardour_ui.h"

20
gtk2_ardour/editor_audio_import.cc
View File

@ -33,22 +33,16 @@
#include <gtkmm2ext/choice.h>
#include "ardour/session.h"
#include "ardour/session_directory.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/audio_diskstream.h"
#include "ardour/midi_track.h"
#include "ardour/midi_region.h"
#include "ardour/utils.h"
#include "ardour/audio_track.h"
#include "ardour/audioplaylist.h"
#include "ardour/audiofilesource.h"
#include "ardour/region_factory.h"
#include "ardour/source_factory.h"
#include "ardour/session.h"
#include "ardour/smf_source.h"
#include "ardour/audioregion.h"
#include "ardour/midi_region.h"
#include "ardour/midi_track.h"
#include "ardour/operations.h"
#include "ardour/region_factory.h"
#include "ardour/smf_source.h"
#include "ardour/source_factory.h"
#include "ardour/utils.h"
#include "pbd/memento_command.h"
#include "ardour_ui.h"

2
gtk2_ardour/editor_audiotrack.cc
View File

@ -17,8 +17,6 @@
*/
#include "ardour/location.h"
#include "ardour/audio_diskstream.h"
#include "ardour/rc_configuration.h"
#include "ardour_ui.h"

4
gtk2_ardour/editor_canvas_events.cc
View File

@ -24,10 +24,8 @@
#include "pbd/stacktrace.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/region_factory.h"
#include "ardour/midi_region.h"
#include "ardour/region_factory.h"
#include "editor.h"
#include "keyboard.h"

2
gtk2_ardour/editor_export_audio.cc
View File

@ -29,10 +29,8 @@
#include "pbd/pthread_utils.h"
#include "ardour/audio_diskstream.h"
#include "ardour/audio_track.h"
#include "ardour/audiofilesource.h"
#include "ardour/audiofilesource.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/chan_count.h"

6
gtk2_ardour/editor_keys.cc
View File

@ -21,17 +21,17 @@
#include <cmath>
#include <string>
#include <gtkmm/treeview.h>
#include "pbd/error.h"
#include "ardour/session.h"
#include "ardour/region.h"
#include <gtkmm/treeview.h>
#include "ardour_ui.h"
#include "editor.h"
#include "time_axis_view.h"
#include "region_view.h"
#include "selection.h"
#include "time_axis_view.h"
#include "i18n.h"

18
gtk2_ardour/editor_mouse.cc
View File

@ -62,20 +62,14 @@
#include "editor_cursors.h"
#include "verbose_cursor.h"
#include "ardour/types.h"
#include "ardour/profile.h"
#include "ardour/route.h"
#include "ardour/audio_track.h"
#include "ardour/playlist.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/midi_region.h"
#include "ardour/dB.h"
#include "ardour/utils.h"
#include "ardour/region_factory.h"
#include "ardour/source_factory.h"
#include "ardour/session.h"
#include "ardour/operations.h"
#include "ardour/playlist.h"
#include "ardour/profile.h"
#include "ardour/region_factory.h"
#include "ardour/route.h"
#include "ardour/session.h"
#include "ardour/types.h"
#include <bitset>

2
gtk2_ardour/editor_ops.cc
View File

@ -49,12 +49,10 @@
#include "ardour/quantize.h"
#include "ardour/region_factory.h"
#include "ardour/reverse.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "ardour/session_playlists.h"
#include "ardour/strip_silence.h"
#include "ardour/transient_detector.h"
#include "ardour/utils.h"
#include "ardour_ui.h"
#include "debug.h"

3
gtk2_ardour/editor_regions.cc
View File

@ -28,10 +28,9 @@
#include "ardour/audioregion.h"
#include "ardour/audiofilesource.h"
#include "ardour/silentfilesource.h"
#include "ardour/region_factory.h"
#include "ardour/session.h"
#include "ardour/session_playlists.h"
#include "ardour/silentfilesource.h"
#include "ardour/profile.h"
#include "gtkmm2ext/choice.h"

9
gtk2_ardour/editor_selection.cc
View File

@ -22,12 +22,11 @@
#include "pbd/stacktrace.h"
#include "ardour/session.h"
#include "ardour/playlist.h"
#include "ardour/route_group.h"
#include "ardour/profile.h"
#include "ardour/midi_region.h"
#include "ardour/audioplaylist.h"
#include "ardour/playlist.h"
#include "ardour/profile.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "control_protocol/control_protocol.h"

1
gtk2_ardour/editor_snapshots.cc
View File

@ -25,7 +25,6 @@
#include "editor_snapshots.h"
#include "ardour_ui.h"
#include "i18n.h"
#include "editor.h"
#include "utils.h"
#include "prompter.h"

8
gtk2_ardour/editor_timefx.cc
View File

@ -37,14 +37,12 @@
#include "region_selection.h"
#include "time_fx_dialog.h"
#include "ardour/session.h"
#include "ardour/region.h"
#include "ardour/audioplaylist.h"
#include "ardour/audio_track.h"
#include "ardour/audioregion.h"
#include "ardour/stretch.h"
#include "ardour/midi_stretch.h"
#include "ardour/pitch.h"
#include "ardour/region.h"
#include "ardour/session.h"
#include "ardour/stretch.h"
#ifdef USE_RUBBERBAND
#include "rubberband/RubberBandStretcher.h"

1
gtk2_ardour/engine_dialog.cc
View File

@ -39,7 +39,6 @@
#include <alsa/asoundlib.h>
#endif
#include "ardour/profile.h"
#include <jack/jack.h>
#include <gtkmm/stock.h>

3
gtk2_ardour/export_channel_selector.cc
View File

@ -24,12 +24,9 @@
#include "pbd/convert.h"
#include "ardour/audio_port.h"
#include "ardour/audio_track.h"
#include "ardour/audioengine.h"
#include "ardour/audioregion.h"
#include "ardour/export_channel_configuration.h"
#include "ardour/export_handler.h"
#include "ardour/io.h"
#include "ardour/route.h"
#include "ardour/session.h"

1
gtk2_ardour/export_channel_selector.h
View File

@ -24,7 +24,6 @@
#include <list>
#include "ardour/export_profile_manager.h"
#include "ardour/export_channel.h"
#include <gtkmm.h>
#include <sigc++/signal.h>

4
gtk2_ardour/export_filename_selector.cc
View File

@ -22,10 +22,6 @@
#include "export_filename_selector.h"
#include "ardour/export_handler.h"
#include "ardour/session.h"
#include "ardour/session_directory.h"
#include "i18n.h"
using namespace ARDOUR;

1
gtk2_ardour/export_format_selector.cc
View File

@ -24,7 +24,6 @@
#include "ardour/export_format_specification.h"
#include "ardour/export_profile_manager.h"
#include "ardour/session.h"
#include "i18n.h"

1
gtk2_ardour/export_timespan_selector.cc
View File

@ -22,7 +22,6 @@
#include "ardour_ui.h"
#include "ardour/tempo.h"
#include "ardour/location.h"
#include "ardour/types.h"
#include "ardour/session.h"

2
gtk2_ardour/export_timespan_selector.h
View File

@ -21,7 +21,6 @@
#ifndef __export_timespan_selector_h__
#define __export_timespan_selector_h__
#include "public_editor.h"
#include "audio_clock.h"
#include <list>
@ -40,6 +39,7 @@ namespace ARDOUR {
}
using ARDOUR::CDMarkerFormat;
using ARDOUR::framecnt_t;
/// Timespan Selector base
class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr

1
gtk2_ardour/fft_result.h
View File

@ -21,7 +21,6 @@
#ifndef __ardour_fft_result_h
#define __ardour_fft_result_h
#include "ardour/types.h"
#include <fftw3.h>
#include <gdkmm/color.h>

3
gtk2_ardour/gain_meter.cc
View File

@ -20,10 +20,7 @@
#include <limits.h>
#include "ardour/amp.h"
#include "ardour/io.h"
#include "ardour/route.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "ardour/session_route.h"
#include "ardour/dB.h"
#include "ardour/utils.h"

25
gtk2_ardour/io_selector.cc
View File

@ -17,21 +17,18 @@
*/
#include <stdint.h>
#include <glibmm/objectbase.h>
#include <gtkmm2ext/doi.h>
#include "ardour/port_insert.h"
#include "ardour/session.h"
#include "ardour/io.h"
#include "ardour/audioengine.h"
#include "ardour/track.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
#include "ardour/mtdm.h"
#include "ardour/data_type.h"
#include "ardour/port.h"
#include "ardour/bundle.h"
#include "ardour/data_type.h"
#include "ardour/io.h"
#include "ardour/port.h"
#include "ardour/session.h"
#include "io_selector.h"
#include "utils.h"
@ -207,13 +204,13 @@ IOSelector::list_is_global (int dim) const
return (dim == _other);
}
string
std::string
IOSelector::disassociation_verb () const
{
return _("Disconnect");
}
string
std::string
IOSelector::channel_noun () const
{
return _("port");
@ -256,7 +253,7 @@ void
IOSelectorWindow::on_show ()
{
Gtk::Window::on_show ();
pair<uint32_t, uint32_t> const pm_max = _selector.max_size ();
std::pair<uint32_t, uint32_t> const pm_max = _selector.max_size ();
resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second);
}
@ -264,8 +261,8 @@ void
IOSelectorWindow::io_name_changed (void*)
{
ENSURE_GUI_THREAD (*this, &IOSelectorWindow::io_name_changed, src)
string title;
std::string title;
if (!_selector.find_inputs_for_io_outputs()) {
title = string_compose(_("%1 input"), _selector.io()->name());

2
gtk2_ardour/keyeditor.cc
View File

@ -23,8 +23,6 @@
#include <map>
#include "ardour/profile.h"
#include <gtkmm/stock.h>
#include <gtkmm/label.h>
#include <gtkmm/accelkey.h>

5
gtk2_ardour/level_meter.cc
View File

@ -19,9 +19,6 @@
#include <limits.h>
#include "ardour/session.h"
#include "ardour/session_route.h"
#include "ardour/dB.h"
#include "ardour/meter.h"
#include <gtkmm2ext/utils.h>
@ -39,8 +36,6 @@
#include "keyboard.h"
#include "public_editor.h"
#include "ardour/session.h"
#include "i18n.h"
using namespace ARDOUR;

2
gtk2_ardour/location_ui.cc
View File

@ -22,8 +22,6 @@
#include <gtkmm2ext/utils.h>
#include "ardour/utils.h"
#include "ardour/configuration.h"
#include "ardour/session.h"
#include "pbd/memento_command.h"

3
gtk2_ardour/lv2_plugin_ui.cc
View File

@ -18,13 +18,10 @@
*/
#include "ardour/lv2_plugin.h"
#include "ardour/plugin_manager.h"
#include "ardour/processor.h"
#include "ardour/session.h"
#include "pbd/error.h"
#include "ardour_ui.h"
#include "gui_thread.h"
#include "lv2_plugin_ui.h"
#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"

2
gtk2_ardour/midi_region_view.cc
View File

@ -31,8 +31,6 @@
#include "pbd/memento_command.h"
#include "pbd/stateful_diff_command.h"
#include "ardour/playlist.h"
#include "ardour/tempo.h"
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "ardour/midi_model.h"

4
gtk2_ardour/midi_streamview.cc
View File

@ -24,14 +24,12 @@
#include <gtkmm2ext/gtk_ui.h>
#include "ardour/midi_diskstream.h"
#include "ardour/midi_playlist.h"
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "ardour/midi_track.h"
#include "ardour/region_factory.h"
#include "ardour/smf_source.h"
#include "ardour/session.h"
#include "ardour/smf_source.h"
#include "ardour_ui.h"
#include "canvas-simplerect.h"

16
gtk2_ardour/midi_time_axis.cc
View File

@ -38,22 +38,22 @@
#include "gtkmm2ext/bindable_button.h"
#include "gtkmm2ext/utils.h"
#include "ardour/file_source.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/location.h"
#include "ardour/midi_diskstream.h"
#include "ardour/event_type_map.h"
#include "ardour/midi_patch_manager.h"
#include "ardour/midi_playlist.h"
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "ardour/midi_track.h"
#include "ardour/operations.h"
#include "ardour/playlist.h"
#include "ardour/processor.h"
#include "ardour/region.h"
#include "ardour/region_factory.h"
#include "ardour/route.h"
#include "ardour/session.h"
#include "ardour/session_playlist.h"
#include "ardour/tempo.h"
#include "ardour/utils.h"
#include "ardour/session_object.h"
#include "ardour/source.h"
#include "ardour/track.h"
#include "ardour/types.h"
#include "midi++/names.h"

1
gtk2_ardour/missing_plugin_dialog.cc
View File

@ -17,7 +17,6 @@
*/
#include <gtkmm/label.h>
#include "ardour/session.h"
#include "missing_plugin_dialog.h"
#include "i18n.h"

1
gtk2_ardour/mixer_group_tabs.cc
View File

@ -22,7 +22,6 @@
#include "gtkmm2ext/utils.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "mixer_group_tabs.h"
#include "mixer_strip.h"
#include "mixer_ui.h"

19
gtk2_ardour/mixer_strip.cc
View File

@ -34,24 +34,21 @@
#include <gtkmm2ext/slider_controller.h>
#include <gtkmm2ext/bindable_button.h>
#include "ardour/ardour.h"
#include "ardour/amp.h"
#include "ardour/session.h"
#include "ardour/audio_track.h"
#include "ardour/audioengine.h"
#include "ardour/internal_send.h"
#include "ardour/route.h"
#include "ardour/route_group.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
#include "ardour/pannable.h"
#include "ardour/panner.h"
#include "ardour/panner_shell.h"
#include "ardour/send.h"
#include "ardour/processor.h"
#include "ardour/profile.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/user_bundle.h"
#include "ardour/port.h"
#include "ardour/profile.h"
#include "ardour/route.h"
#include "ardour/route_group.h"
#include "ardour/send.h"
#include "ardour/session.h"
#include "ardour/types.h"
#include "ardour/user_bundle.h"
#include "ardour_ui.h"
#include "ardour_window.h"

2
gtk2_ardour/mixer_ui.cc
View File

@ -36,11 +36,9 @@
#include <gtkmm2ext/tearoff.h>
#include <gtkmm2ext/window_title.h>
#include "ardour/audio_track.h"
#include "ardour/plugin_manager.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "ardour/session_route.h"
#include "keyboard.h"
#include "mixer_ui.h"

2
gtk2_ardour/monitor_section.cc
View File

@ -8,10 +8,8 @@
#include "gtkmm2ext/actions.h"
#include "gtkmm2ext/motionfeedback.h"
#include "ardour/dB.h"
#include "ardour/monitor_processor.h"
#include "ardour/route.h"
#include "ardour/utils.h"
#include "ardour_ui.h"
#include "gui_thread.h"

3
gtk2_ardour/mono_panner.cc
View File

@ -32,9 +32,8 @@
#include "gtkmm2ext/keyboard.h"
#include "gtkmm2ext/utils.h"
#include "ardour/panner.h"
#include "ardour/panner.h"
#include "ardour/pannable.h"
#include "ardour/panner.h"
#include "ardour_ui.h"
#include "global_signals.h"

1
gtk2_ardour/nag.cc
View File

@ -7,7 +7,6 @@
#include "pbd/openuri.h"
#include "ardour/ardour.h"
#include "ardour/filesystem_paths.h"
#include "nag.h"

1
gtk2_ardour/note_player.cc
View File

@ -20,7 +20,6 @@
#include <glibmm/main.h>
#include "ardour/midi_track.h"
#include "ardour/session.h"
#include "note_player.h"

14
gtk2_ardour/panner_ui.cc
View File

@ -18,13 +18,17 @@
#include <limits.h>
#include "ardour/io.h"
#include "ardour/dB.h"
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/barcontroller.h>
#include "midi++/manager.h"
#include "pbd/fastlog.h"
#include "ardour/pannable.h"
#include "ardour/panner.h"
#include "ardour/panner_shell.h"
#include "ardour/session.h"
#include "ardour_ui.h"
#include "panner_ui.h"
#include "panner2d.h"
@ -33,12 +37,6 @@
#include "stereo_panner.h"
#include "mono_panner.h"
#include "ardour/delivery.h"
#include "ardour/session.h"
#include "ardour/panner.h"
#include "ardour/pannable.h"
#include "ardour/panner_shell.h"
#include "ardour/route.h"
#include "i18n.h"

6
gtk2_ardour/playlist_selector.cc
View File

@ -20,12 +20,10 @@
#include <gtkmm/button.h>
#include "ardour/session_playlist.h"
#include "ardour/audio_diskstream.h"
#include "ardour/playlist.h"
#include "ardour/audio_track.h"
#include "ardour/audioplaylist.h"
#include "ardour/configuration.h"
#include "ardour/playlist.h"
#include "ardour/session_playlist.h"
#include <gtkmm2ext/gtk_ui.h>

9
gtk2_ardour/plugin_eq_gui.h
View File

@ -21,15 +21,20 @@
#ifndef __ardour_plugin_eq_gui_h
#define __ardour_plugin_eq_gui_h
#include "pbd/signals.h"
#include "ardour/buffer_set.h"
#include "ardour/plugin_insert.h"
#include "ardour/plugin.h"
#include <gtkmm/table.h>
#include <gtkmm/drawingarea.h>
#include <gtkmm/combobox.h>
#include <gtkmm/liststore.h>
namespace ARDOUR {
class Plugin;
class PluginInsert;
}
namespace GTKArdour {
class FFT;
}

2
gtk2_ardour/plugin_selector.cc
View File

@ -37,8 +37,6 @@
#include "ardour/plugin_manager.h"
#include "ardour/plugin.h"
#include "ardour/configuration.h"
#include "ardour/session.h"
#include "ardour_ui.h"
#include "plugin_selector.h"

11
gtk2_ardour/port_group.cc
View File

@ -24,16 +24,13 @@
#include "midi++/manager.h"
#include "midi++/mmc.h"
#include "ardour/audio_track.h"
#include "ardour/audioengine.h"
#include "ardour/bundle.h"
#include "ardour/user_bundle.h"
#include "ardour/io_processor.h"
#include "ardour/midi_track.h"
#include "ardour/port.h"
#include "ardour/session.h"
#include "ardour/auditioner.h"
#include "ardour/bundle.h"
#include "ardour/control_protocol_manager.h"
#include "ardour/io_processor.h"
#include "ardour/session.h"
#include "ardour/user_bundle.h"
#include "control_protocol/control_protocol.h"
#include "gui_thread.h"

13
gtk2_ardour/port_insert_ui.cc
View File

@ -22,17 +22,10 @@
#include <gtkmm2ext/doi.h>
#include "ardour/audioengine.h"
#include "ardour/mtdm.h"
#include "ardour/port_insert.h"
#include "ardour/session.h"
#include "ardour/io.h"
#include "ardour/audioengine.h"
#include "ardour/track.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
#include "ardour/mtdm.h"
#include "ardour/data_type.h"
#include "ardour/port.h"
#include "ardour/bundle.h"
#include "port_insert_ui.h"
#include "utils.h"
@ -170,7 +163,7 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD
{
set_name ("IOSelectorWindow");
string title = _("Port Insert ");
std::string title = _("Port Insert ");
title += pi->name();
set_title (title);

1
gtk2_ardour/port_matrix_column_labels.cc
View File

@ -20,7 +20,6 @@
#include <iostream>
#include "gtkmm2ext/keyboard.h"
#include "ardour/bundle.h"
#include "ardour/types.h"
#include "port_matrix_column_labels.h"
#include "port_matrix.h"
#include "port_matrix_body.h"

1
gtk2_ardour/port_matrix_grid.cc
View File

@ -20,7 +20,6 @@
#include <iostream>
#include <cairo/cairo.h>
#include "ardour/bundle.h"
#include "ardour/types.h"
#include "port_matrix_grid.h"
#include "port_matrix.h"
#include "port_matrix_body.h"

7
gtk2_ardour/processor_box.cc
View File

@ -40,13 +40,10 @@
#include <gtkmm2ext/doi.h>
#include "ardour/amp.h"
#include "ardour/ardour.h"
#include "ardour/audio_track.h"
#include "ardour/audioengine.h"
#include "ardour/internal_send.h"
#include "ardour/internal_return.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/meter.h"
#include "ardour/internal_send.h"
#include "ardour/plugin_insert.h"
#include "ardour/port_insert.h"
#include "ardour/profile.h"
@ -54,7 +51,7 @@
#include "ardour/route.h"
#include "ardour/send.h"
#include "ardour/session.h"
#include "ardour/dB.h"
#include "ardour/types.h"
#include "actions.h"
#include "ardour_dialog.h"

1
gtk2_ardour/public_editor.cc
View File

@ -18,7 +18,6 @@
*/
#include "public_editor.h"
#include "editor.h"
PublicEditor* PublicEditor::_instance = 0;

1
gtk2_ardour/public_editor.h
View File

@ -36,7 +36,6 @@
#include <sigc++/signal.h>
#include "evoral/types.hpp"
#include "ardour/route_group.h"
#include "pbd/statefuldestructible.h"

12
gtk2_ardour/region_editor.cc
View File

@ -17,18 +17,16 @@
*/
#include <cmath>
#include <gtkmm/listviewtext.h>
#include "pbd/memento_command.h"
#include "pbd/stateful_diff_command.h"
#include "ardour/session.h"
#include "ardour/region.h"
#include "ardour/playlist.h"
#include "ardour/utils.h"
#include "ardour/dB.h"
#include "ardour/session.h"
#include "ardour/source.h"
#include "gtkmm2ext/utils.h"
#include <gtkmm/listviewtext.h>
#include <cmath>
#include "ardour_ui.h"
#include "clock_group.h"

2
gtk2_ardour/region_view.cc
View File

@ -26,8 +26,6 @@
#include <gtkmm2ext/gtk_ui.h>
#include "ardour/playlist.h"
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"
#include "ardour/session.h"
#include "ardour_ui.h"

3
gtk2_ardour/return_ui.cc
View File

@ -19,10 +19,9 @@
#include <gtkmm2ext/doi.h>
#include "ardour/amp.h"
#include "ardour/io.h"
#include "ardour/return.h"
#include "ardour/rc_configuration.h"
#include "ardour/return.h"
#include "utils.h"
#include "return_ui.h"

7
gtk2_ardour/rhythm_ferret.cc
View File

@ -4,13 +4,10 @@
#include "pbd/memento_command.h"
#include "pbd/convert.h"
#include "ardour/transient_detector.h"
#include "ardour/onset_detector.h"
#include "ardour/audiosource.h"
#include "ardour/audioregion.h"
#include "ardour/playlist.h"
#include "ardour/region_factory.h"
#include "ardour/onset_detector.h"
#include "ardour/session.h"
#include "ardour/transient_detector.h"
#include "rhythm_ferret.h"
#include "audio_region_view.h"

5
gtk2_ardour/route_params_ui.cc
View File

@ -24,9 +24,7 @@
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/window_title.h>
#include "ardour/ardour.h"
#include "ardour/audioengine.h"
#include "ardour/audio_track.h"
#include "ardour/plugin.h"
#include "ardour/plugin_insert.h"
#include "ardour/plugin_manager.h"
@ -34,9 +32,6 @@
#include "ardour/return.h"
#include "ardour/route.h"
#include "ardour/send.h"
#include "ardour/session.h"
#include "ardour/session.h"
#include "ardour/session_route.h"
#include "ardour_ui.h"
#include "gui_thread.h"

4
gtk2_ardour/route_processor_selection.cc
View File

@ -21,10 +21,6 @@
#include <sigc++/bind.h>
#include "pbd/error.h"
#include "ardour/playlist.h"
#include "ardour/processor.h"
#include "ardour/route.h"
#include "gui_thread.h"
#include "mixer_strip.h"
#include "route_processor_selection.h"

12
gtk2_ardour/route_time_axis.cc
View File

@ -43,22 +43,12 @@
#include <gtkmm2ext/utils.h>
#include "ardour/amp.h"
#include "ardour/audioplaylist.h"
#include "ardour/diskstream.h"
#include "ardour/event_type_map.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/location.h"
#include "ardour/panner.h"
#include "ardour/playlist.h"
#include "ardour/playlist.h"
#include "ardour/processor.h"
#include "ardour/profile.h"
#include "ardour/region_factory.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "ardour/session_playlist.h"
#include "ardour/debug.h"
#include "ardour/utils.h"
#include "ardour/session_playlists.h"
#include "evoral/Parameter.hpp"
#include "ardour_ui.h"

13
gtk2_ardour/route_ui.cc
View File

@ -46,16 +46,13 @@
#include "route_time_axis.h"
#include "group_tabs.h"
#include "ardour/route.h"
#include "ardour/event_type_map.h"
#include "ardour/session.h"
#include "ardour/audioengine.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
#include "ardour/template_utils.h"
#include "ardour/audioengine.h"
#include "ardour/filename_extensions.h"
#include "ardour/directory_names.h"
#include "ardour/profile.h"
#include "ardour/midi_track.h"
#include "ardour/route.h"
#include "ardour/session.h"
#include "ardour/template_utils.h"
#include "i18n.h"
using namespace Gtk;

1
gtk2_ardour/send_ui.cc
View File

@ -19,7 +19,6 @@
#include <gtkmm2ext/doi.h>
#include "ardour/amp.h"
#include "ardour/io.h"
#include "ardour/send.h"
#include "ardour/rc_configuration.h"

5
gtk2_ardour/session_import_dialog.h
View File

@ -29,12 +29,11 @@
#include <gtkmm.h>
#include "pbd/xml++.h"
#include "ardour/element_importer.h"
#include "ardour/element_import_handler.h"
#include "ardour_dialog.h"
namespace ARDOUR {
class ElementImportHandler;
class ElementImporter;
class Session;
}

3
gtk2_ardour/session_metadata_dialog.cc
View File

@ -24,10 +24,9 @@
#include <gtkmm2ext/utils.h>
#include "pbd/xml++.h"
#include "ardour/session.h"
#include "ardour/session_directory.h"
#include "ardour/session_utils.h"
#include "ardour/configuration.h"
#include "i18n.h"

4
gtk2_ardour/session_option_editor.cc
View File

@ -18,10 +18,6 @@
*/
#include "ardour/session.h"
#include "ardour/io.h"
#include "ardour/auditioner.h"
#include "ardour/audioengine.h"
#include "ardour/port.h"
#include "gui_thread.h"
#include "session_option_editor.h"

2
gtk2_ardour/sfdb_ui.cc
View File

@ -43,7 +43,6 @@
#include "evoral/SMF.hpp"
#include "ardour/amp.h"
#include "ardour/audio_library.h"
#include "ardour/auditioner.h"
#include "ardour/audioregion.h"
@ -53,7 +52,6 @@
#include "ardour/source_factory.h"
#include "ardour/session.h"
#include "ardour/session_directory.h"
#include "ardour/profile.h"
#include "ardour_ui.h"
#include "editing.h"

1
gtk2_ardour/streamview.cc
View File

@ -25,7 +25,6 @@
#include "ardour/playlist.h"
#include "ardour/region.h"
#include "ardour/source.h"
#include "ardour/track.h"
#include "ardour/session.h"

4
gtk2_ardour/strip_silence_dialog.cc
View File

@ -22,12 +22,10 @@
#include <gtkmm/table.h>
#include <gtkmm/label.h>
#include <gtkmm/stock.h>
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"
#include "ardour/audioregion.h"
#include "ardour/dB.h"
#include "ardour_ui.h"
#include "ardour/session.h"
#include "audio_clock.h"
#include "gui_thread.h"

1
gtk2_ardour/tape_region_view.cc
View File

@ -24,7 +24,6 @@
#include <gtkmm2ext/gtk_ui.h>
#include "ardour/playlist.h"
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"

2
gtk2_ardour/theme_manager.cc
View File

@ -32,9 +32,7 @@
#include "pbd/file_utils.h"
#include "ardour/configuration.h"
#include "ardour/filesystem_paths.h"
#include "ardour/profile.h"
#include "ardour_button.h"
#include "theme_manager.h"

6
gtk2_ardour/time_axis_view.cc
View File

@ -33,12 +33,6 @@
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/selector.h>
#include "ardour/session.h"
#include "ardour/utils.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/processor.h"
#include "ardour/location.h"
#include "ardour_ui.h"
#include "global_signals.h"
#include "gui_thread.h"

9
gtk2_ardour/time_fx_dialog.cc
View File

@ -36,15 +36,6 @@
#include "audio_region_view.h"
#include "region_selection.h"
#include "ardour/session.h"
#include "ardour/region.h"
#include "ardour/audioplaylist.h"
#include "ardour/audio_track.h"
#include "ardour/audioregion.h"
#include "ardour/stretch.h"
#include "ardour/midi_stretch.h"
#include "ardour/pitch.h"
#ifdef USE_RUBBERBAND
#include "rubberband/RubberBandStretcher.h"
using namespace RubberBand;

2
gtk2_ardour/time_fx_dialog.h
View File

@ -22,11 +22,9 @@
#include <gtkmm.h>
#include "ardour/playlist.h"
#include "ardour/timefx_request.h"
#include "ardour_dialog.h"
#include "region_selection.h"
#include "progress_reporter.h"
class Editor;

2
gtk2_ardour/time_selection.cc
View File

@ -20,7 +20,7 @@
#include <algorithm>
#include "pbd/error.h"
#include "ardour/ardour.h"
#include "ardour/types.h"
#include "time_selection.h"

1
gtk2_ardour/ui_config.cc
View File

@ -31,7 +31,6 @@
#include "gtkmm2ext/rgb_macros.h"
#include "ardour/ardour.h"
#include "ardour/filesystem_paths.h"
#include "ui_config.h"

1
gtk2_ardour/utils.cc
View File

@ -40,7 +40,6 @@
#include "pbd/file_utils.h"
#include <gtkmm2ext/utils.h>
#include "ardour/configuration.h"
#include "ardour/rc_configuration.h"
#include "ardour/filesystem_paths.h"

2
libs/ardour/amp.cc
View File

@ -26,8 +26,6 @@
#include "ardour/amp.h"
#include "ardour/audio_buffer.h"
#include "ardour/buffer_set.h"
#include "ardour/configuration.h"
#include "ardour/io.h"
#include "ardour/midi_buffer.h"
#include "ardour/session.h"

3
libs/ardour/analyser.cc
View File

@ -22,9 +22,6 @@
#include "ardour/session_event.h"
#include "ardour/transient_detector.h"
#include "pbd/pthread_utils.h"
#include "pbd/convert.h"
using namespace std;
using namespace ARDOUR;
using namespace PBD;

2
libs/ardour/ardour/audio_buffer.h
View File

@ -20,7 +20,9 @@
#define __ardour_audio_buffer_h__
#include <cstring>
#include "ardour/buffer.h"
#include "ardour/runtime_functions.h"
namespace ARDOUR {

2
libs/ardour/ardour/audio_playlist_importer.h
View File

@ -30,13 +30,13 @@
#include "ardour/element_importer.h"
#include "ardour/element_import_handler.h"
#include "ardour/types.h"
namespace ARDOUR {
class AudioRegionImportHandler;
class AudioRegionImporter;
class AudioPlaylistImporter;
class Session;
class AudioPlaylistImportHandler : public ElementImportHandler
{

3
libs/ardour/ardour/audio_region_importer.h
View File

@ -30,7 +30,6 @@
#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 "ardour/import_status.h"
@ -38,6 +37,8 @@
namespace ARDOUR {
class Region;
class Session;
class Source;
class AudioRegionImportHandler : public ElementImportHandler
{

4
libs/ardour/ardour/broadcast_info.h
View File

@ -22,12 +22,8 @@
#define __ardour_broadcast_info_h__
#include <string>
#include <ctime>
#include <sndfile.h>
#include "audiographer/broadcast_info.h"
#include "ardour/types.h"
namespace ARDOUR
{

7
libs/ardour/ardour/buffer.h
View File

@ -19,15 +19,12 @@
#ifndef __ardour_buffer_h__
#define __ardour_buffer_h__
#include <cstdlib>
#include <cassert>
#include <cstring>
#include <iostream>
#include <stddef.h>
#include <boost/utility.hpp>
#include "ardour/types.h"
#include "ardour/data_type.h"
#include "ardour/runtime_functions.h"
namespace ARDOUR {

3
libs/ardour/ardour/directory_names.h
View File

@ -2,9 +2,6 @@
#ifndef __ardour_directory_names_h__
#define __ardour_directory_names_h__
#include <string>
#include <stdint.h>
namespace ARDOUR {
extern const char* const old_sound_dir_name;

10
libs/ardour/ardour/export_channel_configuration.h
View File

@ -28,21 +28,13 @@
#include <boost/enable_shared_from_this.hpp>
#include "ardour/export_channel.h"
#include "ardour/export_status.h"
#include "ardour/ardour.h"
#include "ardour/export_pointers.h"
#include "pbd/xml++.h"
namespace ARDOUR
{
class ExportHandler;
class AudioPort;
class ExportChannel;
class ExportFormatSpecification;
class ExportFilename;
class ExportProcessor;
class ExportTimespan;
class Session;
class ExportChannelConfiguration : public boost::enable_shared_from_this<ExportChannelConfiguration>

9
libs/ardour/ardour/export_format_base.h
View File

@ -22,22 +22,21 @@
#define __ardour_export_format_base_h__
#include <set>
#include <algorithm>
#include <boost/shared_ptr.hpp>
#include <string>
#include <boost/shared_ptr.hpp>
#include <sndfile.h>
#include <samplerate.h>
#include "ardour/ardour.h"
#include "pbd/signals.h"
#include "ardour/types.h"
#include "audiographer/general/sample_format_converter.h"
namespace ARDOUR
{
class HasSampleFormat;
class ExportFormatBase {
public:

Some files were not shown because too many files have changed in this diff Show More