diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2009-05-13 16:04:41 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2009-05-13 16:04:41 +0000 |
| commit | 7188ec39903e4cef049468c5a0583d9ec67a290d (patch) | |
| tree | 4c7a62e460c2d46a134f7dbcbc8a203734498d13 | |
| parent | e341132df82daa96dd276fe6b57aaae787fd084a (diff) | |
Remove some extraneous includes. reorder some others (fixes compilation on fedora 10).
git-svn-id: svn://localhost/ardour2/branches/3.0@5073 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/global_port_matrix.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/session_metadata_dialog.cc | 3 | ||||
| -rw-r--r-- | libs/ardour/export_profile_manager.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/session_export.cc | 5 |
4 files changed, 7 insertions, 9 deletions
diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc index b2e6568a30..2b3b9c2131 100644 --- a/gtk2_ardour/global_port_matrix.cc +++ b/gtk2_ardour/global_port_matrix.cc @@ -20,12 +20,14 @@ #include <gtkmm/image.h> #include <gtkmm/stock.h> #include "global_port_matrix.h" -#include "i18n.h" + #include "ardour/bundle.h" #include "ardour/session.h" #include "ardour/audioengine.h" #include "ardour/port.h" +#include "i18n.h" + GlobalPortMatrix::GlobalPortMatrix (ARDOUR::Session& s, ARDOUR::DataType t) : PortMatrix (s, t) { diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc index 18d5eaf1aa..064cc1bc9f 100644 --- a/gtk2_ardour/session_metadata_dialog.cc +++ b/gtk2_ardour/session_metadata_dialog.cc @@ -24,12 +24,13 @@ #include <gtkmm2ext/utils.h> #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 "i18n.h" + using namespace std; using namespace Glib; diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc index 529a4e3d9f..6e6d2ea290 100644 --- a/libs/ardour/export_profile_manager.cc +++ b/libs/ardour/export_profile_manager.cc @@ -18,8 +18,6 @@ */ -#include "ardour/export_profile_manager.h" - #include <cassert> #include <stdexcept> @@ -29,7 +27,7 @@ #include "pbd/xml++.h" #include "pbd/convert.h" -#include "ardour/export_failed.h" +#include "ardour/export_profile_manager.h" #include "ardour/export_file_io.h" #include "ardour/export_format_specification.h" #include "ardour/export_timespan.h" diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc index 4266d71353..7982f89507 100644 --- a/libs/ardour/session_export.cc +++ b/libs/ardour/session_export.cc @@ -22,7 +22,7 @@ #include "pbd/error.h" #include <glibmm/thread.h> -#include "ardour/ardour.h" +#include "ardour/session.h" #include "ardour/audio_diskstream.h" #include "ardour/audioengine.h" #include "ardour/export_failed.h" @@ -30,10 +30,7 @@ #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" |