diff options
author | David Robillard <d@drobilla.net> | 2012-05-24 06:09:29 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-05-24 06:09:29 +0000 |
commit | 6fa6514cfdb0ce38d93b51197f599dfd091bad1d (patch) | |
tree | 10c50e4752aae8ebffe24564561192b8325abe47 /gtk2_ardour/ardour_ui.cc | |
parent | 224e6175adc29f64cf0fc255fe05c95b99e5ec7d (diff) |
Remove over 500 unnecessary includes (including 54 of session.h).
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
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index d54ae5e291..6236bcd5dc 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -60,26 +60,18 @@ #include "midi++/manager.h" #include "ardour/ardour.h" -#include "ardour/callback.h" +#include "ardour/audioengine.h" +#include "ardour/audiofilesource.h" +#include "ardour/diskstream.h" +#include "ardour/filename_extensions.h" +#include "ardour/port.h" +#include "ardour/process_thread.h" #include "ardour/profile.h" -#include "ardour/plugin_manager.h" +#include "ardour/recent_sessions.h" #include "ardour/session_directory.h" #include "ardour/session_route.h" #include "ardour/session_state_utils.h" #include "ardour/session_utils.h" -#include "ardour/port.h" -#include "ardour/audioengine.h" -#include "ardour/playlist.h" -#include "ardour/utils.h" -#include "ardour/audio_diskstream.h" -#include "ardour/audiofilesource.h" -#include "ardour/recent_sessions.h" -#include "ardour/port.h" -#include "ardour/audio_track.h" -#include "ardour/midi_track.h" -#include "ardour/filesystem_paths.h" -#include "ardour/filename_extensions.h" -#include "ardour/process_thread.h" typedef uint64_t microseconds_t; @@ -121,6 +113,7 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; +using namespace std; ARDOUR_UI *ARDOUR_UI::theArdourUI = 0; UIConfiguration *ARDOUR_UI::ui_config = 0; @@ -130,7 +123,7 @@ sigc::signal<void> ARDOUR_UI::RapidScreenUpdate; sigc::signal<void> ARDOUR_UI::SuperRapidScreenUpdate; sigc::signal<void, framepos_t, bool, framepos_t> ARDOUR_UI::Clock; -bool could_be_a_valid_path (const string& path); +bool could_be_a_valid_path (const std::string& path); ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) @@ -335,7 +328,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) /** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */ bool -ARDOUR_UI::run_startup (bool should_be_new, string load_template) +ARDOUR_UI::run_startup (bool should_be_new, std::string load_template) { delete _startup; _startup = new ArdourStartup (); |