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
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

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"

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;

View file

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

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
{

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
{

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
{

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 {

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;

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>

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:

View file

@ -21,10 +21,7 @@
#ifndef __ardour_export_graph_builder_h__
#define __ardour_export_graph_builder_h__
#include "ardour/ardour.h"
#include "ardour/export_handler.h"
#include "ardour/export_channel.h"
#include "ardour/export_format_base.h"
#include "audiographer/utils/identity_vertex.h"
@ -47,6 +44,9 @@ namespace AudioGrapher {
namespace ARDOUR
{
class ExportTimespan;
class Session;
class ExportGraphBuilder
{
private:

View file

@ -22,13 +22,11 @@
#define __ardour_export_handler_h__
#include <map>
#include <list>
#include <fstream>
#include <boost/operators.hpp>
#include <boost/shared_ptr.hpp>
#include "ardour/ardour.h"
#include "ardour/export_pointers.h"
#include "ardour/session.h"
#include "ardour/types.h"
@ -45,7 +43,7 @@ class ExportChannelConfiguration;
class ExportFormatSpecification;
class ExportFilename;
class ExportGraphBuilder;
class Location;
class ExportElementFactory
{

View file

@ -21,7 +21,6 @@
#ifndef __ardour_export_status_h__
#define __ardour_export_status_h__
#include <list>
#include <stdint.h>
#include "ardour/types.h"

View file

@ -21,17 +21,16 @@
#ifndef __ardour_export_timespan_h__
#define __ardour_export_timespan_h__
#include <map>
#include <list>
#include <string>
#include "ardour/export_status.h"
#include "ardour/export_channel.h"
#include "ardour/ardour.h"
#include <boost/shared_ptr.hpp>
#include "ardour/types.h"
namespace ARDOUR
{
class ExportStatus;
class ExportChannel;
class ExportTempFile;

View file

@ -27,11 +27,12 @@
#include <boost/shared_ptr.hpp>
#include "pbd/xml++.h"
#include "ardour/location.h"
#include "ardour/types.h"
namespace ARDOUR {
class Location;
class Session;
class LocationImportHandler : public ElementImportHandler
{
public:

View file

@ -22,7 +22,6 @@
#include <vector>
#include "ardour/types.h"
#include "ardour/processor.h"
#include "pbd/signals.h"
#include "pbd/fastlog.h"
namespace ARDOUR {

View file

@ -19,10 +19,7 @@
#ifndef __libardour_mtdm_h__
#define __libardour_mtdm_h__
#include <cstdlib>
#include <cstdio>
#include <cmath>
#include <unistd.h>
#include <stddef.h>
class MTDM {
public:

View file

@ -25,6 +25,7 @@
#include <glibmm/thread.h>
#include "pbd/id.h"
#include "pbd/property_list.h"
#include "pbd/signals.h"
#include "ardour/types.h"

View file

@ -20,6 +20,7 @@
#ifndef __libardour_route_group_member_h__
#define __libardour_route_group_member_h__
#include "pbd/signals.h"
namespace ARDOUR {

View file

@ -22,7 +22,6 @@
#include <boost/shared_ptr.hpp>
#include <sndfile.h>
#include "pbd/failed_constructor.h"
#include "ardour/types.h"
#include "ardour/importable_source.h"

View file

@ -27,11 +27,11 @@
#include "ardour/element_importer.h"
#include "ardour/element_import_handler.h"
#include "ardour/tempo.h"
#include "ardour/types.h"
namespace ARDOUR {
class Session;
class TempoMapImportHandler : public ElementImportHandler
{
public:

View file

@ -37,29 +37,24 @@
#include "pbd/stateful_diff_command.h"
#include "ardour/analyser.h"
#include "ardour/ardour.h"
#include "ardour/audio_buffer.h"
#include "ardour/audio_diskstream.h"
#include "ardour/audio_port.h"
#include "ardour/audioengine.h"
#include "ardour/audiofilesource.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/butler.h"
#include "ardour/configuration.h"
#include "ardour/cycle_timer.h"
#include "ardour/debug.h"
#include "ardour/io.h"
#include "ardour/playlist_factory.h"
#include "ardour/region_factory.h"
#include "ardour/send.h"
#include "ardour/session.h"
#include "ardour/session_playlists.h"
#include "ardour/source_factory.h"
#include "ardour/track.h"
#include "ardour/types.h"
#include "ardour/utils.h"
#include "ardour/session_playlists.h"
#include "ardour/route.h"
#include "i18n.h"
#include <locale.h>

View file

@ -23,12 +23,10 @@
#include "ardour/types.h"
#include "ardour/debug.h"
#include "ardour/configuration.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/region_sorters.h"
#include "ardour/session.h"
#include "pbd/enumwriter.h"
#include "i18n.h"

View file

@ -28,7 +28,6 @@
#include "ardour/audio_region_importer.h"
#include "ardour/session.h"
#include "ardour/playlist.h"
#include "ardour/playlist_factory.h"
#include "ardour/session_playlists.h"

View file

@ -27,18 +27,13 @@
#include <glibmm/miscutils.h>
#include "pbd/error.h"
#include "pbd/convert.h"
#include "pbd/enumwriter.h"
#include "ardour/audioplaylist.h"
#include "ardour/audio_playlist_source.h"
#include "ardour/audioregion.h"
#include "ardour/debug.h"
#include "ardour/filename_extensions.h"
#include "ardour/session.h"
#include "ardour/session_directory.h"
#include "ardour/session_playlists.h"
#include "ardour/source_factory.h"
#include "i18n.h"

View file

@ -20,10 +20,9 @@
#include "pbd/stacktrace.h"
#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/data_type.h"
using namespace ARDOUR;
using namespace std;

View file

@ -28,7 +28,6 @@
#include "ardour/session.h"
#include "ardour/region.h"
#include "ardour/source_factory.h"
#include "ardour/region_factory.h"
#include "ardour/session_directory.h"

View file

@ -19,9 +19,9 @@
#include <boost/scoped_array.hpp>
#include "pbd/error.h"
#include "pbd/enumwriter.h"
#include "pbd/boost_debug.h"
#include "pbd/enumwriter.h"
#include "pbd/error.h"
#include "evoral/Curve.hpp"
@ -30,23 +30,18 @@
#include "ardour/audio_diskstream.h"
#include "ardour/audio_track.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"
#include "ardour/buffer_set.h"
#include "ardour/io_processor.h"
#include "ardour/panner.h"
#include "ardour/meter.h"
#include "ardour/playlist_factory.h"
#include "ardour/plugin_insert.h"
#include "ardour/port_insert.h"
#include "ardour/processor.h"
#include "ardour/region_factory.h"
#include "ardour/route_group_specialized.h"
#include "ardour/session.h"
#include "ardour/utils.h"
#include "ardour/session_playlists.h"
#include "ardour/delivery.h"
#include "ardour/meter.h"
#include "ardour/playlist_factory.h"
#include "ardour/processor.h"
#include "ardour/region.h"
#include "ardour/region_factory.h"
#include "ardour/session.h"
#include "ardour/session_playlists.h"
#include "ardour/source.h"
#include "ardour/utils.h"
#include "i18n.h"
using namespace std;

View file

@ -38,24 +38,16 @@
#include "midi++/mmc.h"
#include "midi++/manager.h"
#include "ardour/amp.h"
#include "ardour/audio_port.h"
#include "ardour/audioengine.h"
#include "ardour/buffer.h"
#include "ardour/buffer_set.h"
#include "ardour/cycle_timer.h"
#include "ardour/event_type_map.h"
#include "ardour/internal_return.h"
#include "ardour/internal_send.h"
#include "ardour/io.h"
#include "ardour/meter.h"
#include "ardour/midi_port.h"
#include "ardour/process_thread.h"
#include "ardour/port.h"
#include "ardour/port_set.h"
#include "ardour/process_thread.h"
#include "ardour/session.h"
#include "ardour/timestamps.h"
#include "ardour/utils.h"
#include "i18n.h"

View file

@ -46,11 +46,8 @@
#include "ardour/audiofilesource.h"
#include "ardour/debug.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

View file

@ -37,7 +37,6 @@
#include "evoral/Curve.hpp"
#include "ardour/audioregion.h"
#include "ardour/debug.h"
#include "ardour/session.h"
#include "ardour/dB.h"
#include "ardour/playlist.h"

View file

@ -35,13 +35,9 @@
#include <glibmm/miscutils.h>
#include "pbd/xml++.h"
#include "pbd/pthread_utils.h"
#include "ardour/audiosource.h"
#include "ardour/audio_diskstream.h"
#include "ardour/cycle_timer.h"
#include "ardour/session.h"
#include "ardour/transient_detector.h"
#include "ardour/rc_configuration.h"
#include "ardour/runtime_functions.h"
#include "i18n.h"

View file

@ -30,8 +30,6 @@
#include "ardour/auditioner.h"
#include "ardour/audioplaylist.h"
#include "ardour/audio_port.h"
#include "ardour/panner_shell.h"
#include "ardour/panner.h"
#include "ardour/data_type.h"
#include "ardour/region_factory.h"

View file

@ -17,27 +17,22 @@
*/
#include "ardour/ardour.h"
#include <fstream>
#include <inttypes.h>
#include <cstdio>
#include <errno.h>
#include <glibmm/miscutils.h>
#include "pbd/error.h"
#include "pbd/enumwriter.h"
#include "pbd/stacktrace.h"
#include "midi++/names.h"
#include "ardour/automatable.h"
#include "ardour/amp.h"
#include "ardour/automatable.h"
#include "ardour/event_type_map.h"
#include "ardour/midi_track.h"
#include "ardour/pannable.h"
#include "ardour/panner.h"
#include "ardour/pan_controllable.h"
#include "ardour/pannable.h"
#include "ardour/plugin_insert.h"
#include "ardour/session.h"

View file

@ -19,7 +19,7 @@
*/
#include <iostream>
#include "ardour/automatable.h"
#include "ardour/automation_control.h"
#include "ardour/event_type_map.h"
#include "ardour/session.h"
@ -28,7 +28,6 @@ using namespace std;
using namespace ARDOUR;
using namespace PBD;
AutomationControl::AutomationControl(
ARDOUR::Session& session,
const Evoral::Parameter& parameter,

View file

@ -26,12 +26,9 @@
#include <glibmm.h>
#include "ardour/svn_revision.h"
#include "ardour/ardour.h"
#include "ardour/session.h"
#include "ardour/session_metadata.h"
#include "pbd/convert.h"
using namespace PBD;
namespace ARDOUR

View file

@ -22,7 +22,6 @@
#include "pbd/compose.h"
#include "ardour/buffer_manager.h"
#include "ardour/debug.h"
#include "ardour/thread_buffers.h"
using namespace ARDOUR;

View file

@ -33,7 +33,6 @@
#include "ardour/midi_buffer.h"
#include "ardour/port.h"
#include "ardour/port_set.h"
#include "ardour/audioengine.h"
#ifdef LV2_SUPPORT
#include "ardour/lv2_plugin.h"
#include "lv2_evbuf.h"

View file

@ -19,12 +19,9 @@
#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 "i18n.h"

View file

@ -16,7 +16,6 @@
#include "pbd/strsplit.h"
#include "pbd/convert.h"
#include "ardour/callback.h"
#include "ardour/filesystem_paths.h"
using namespace std;

View file

@ -28,7 +28,6 @@
#include "control_protocol/control_protocol.h"
#include "ardour/debug.h"
#include "ardour/session.h"
#include "ardour/control_protocol_manager.h"
#include "ardour/control_protocol_search_path.h"

View file

@ -18,8 +18,8 @@
*/
#include "ardour/ardour.h"
#include "ardour/session.h"
#include "ardour/types.h"
using namespace ARDOUR;

View file

@ -22,27 +22,22 @@
#include "pbd/enumwriter.h"
#include "pbd/convert.h"
#include "ardour/midi_buffer.h"
#include "ardour/amp.h"
#include "ardour/audioengine.h"
#include "ardour/buffer_set.h"
#include "ardour/debug.h"
#include "ardour/delivery.h"
#include "ardour/audio_buffer.h"
#include "ardour/audio_port.h"
#include "ardour/amp.h"
#include "ardour/buffer_set.h"
#include "ardour/configuration.h"
#include "ardour/io.h"
#include "ardour/meter.h"
#include "ardour/mute_master.h"
#include "ardour/panner.h"
#include "ardour/panner_shell.h"
#include "ardour/pannable.h"
#include "ardour/panner_shell.h"
#include "ardour/port.h"
#include "ardour/session.h"
#include "ardour/audioengine.h"
#include "i18n.h"
namespace ARDOUR { class Panner; }
using namespace std;
using namespace PBD;
using namespace ARDOUR;

View file

@ -31,7 +31,6 @@
#include <sys/stat.h>
#include <sys/mman.h>
#include <glibmm/thread.h>
#include "pbd/error.h"
@ -40,22 +39,12 @@
#include "pbd/xml++.h"
#include "pbd/stacktrace.h"
#include "ardour/ardour.h"
#include "ardour/audioengine.h"
#include "ardour/debug.h"
#include "ardour/diskstream.h"
#include "ardour/utils.h"
#include "ardour/configuration.h"
#include "ardour/audiofilesource.h"
#include "ardour/send.h"
#include "ardour/pannable.h"
#include "ardour/panner_shell.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/pannable.h"
#include "ardour/playlist.h"
#include "ardour/session.h"
#include "ardour/track.h"
#include "i18n.h"

View file

@ -20,22 +20,18 @@
#include "pbd/enumwriter.h"
#include "midi++/types.h"
#include "ardour/audiofilesource.h"
#include "ardour/audioregion.h"
#include "ardour/delivery.h"
#include "ardour/diskstream.h"
#include "ardour/export_channel.h"
#include "ardour/export_filename.h"
#include "ardour/export_format_base.h"
#include "ardour/export_profile_manager.h"
#include "ardour/export_channel_configuration.h"
#include "ardour/io.h"
#include "ardour/location.h"
#include "ardour/midi_model.h"
#include "ardour/midi_track.h"
#include "ardour/mute_master.h"
#include "ardour/panner.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "ardour/source.h"
#include "ardour/track.h"
#include "ardour/types.h"

View file

@ -20,16 +20,6 @@
#include "ardour/export_channel_configuration.h"
#include "ardour/export_handler.h"
#include "ardour/export_filename.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 "pbd/convert.h"
#include "pbd/enumwriter.h"
#include "pbd/pthread_utils.h"

View file

@ -30,7 +30,6 @@
#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"

View file

@ -20,7 +20,6 @@
#include "ardour/export_format_manager.h"
#include "ardour/types.h"
#include "ardour/export_format_specification.h"
#include "ardour/export_format_compatibility.h"

View file

@ -17,7 +17,6 @@
#include "ardour/export_format_specification.h"
#include "ardour/export_timespan.h"
#include "ardour/sndfile_helpers.h"
#include "ardour/utils.h"
#include "pbd/filesystem.h"
#include "pbd/cpus.h"

View file

@ -26,15 +26,12 @@
#include "pbd/convert.h"
#include "pbd/filesystem.h"
#include "ardour/ardour.h"
#include "ardour/configuration.h"
#include "ardour/export_graph_builder.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_failed.h"
#include "i18n.h"

View file

@ -20,10 +20,6 @@
#include "ardour/export_timespan.h"
#include "ardour/export_channel_configuration.h"
#include "ardour/export_filename.h"
#include "ardour/export_failed.h"
namespace ARDOUR
{

View file

@ -38,12 +38,11 @@
#include <glibmm/fileutils.h>
#include <glibmm/thread.h>
#include "ardour/data_type.h"
#include "ardour/file_source.h"
#include "ardour/directory_names.h"
#include "ardour/session.h"
#include "ardour/session_directory.h"
#include "ardour/source_factory.h"
#include "ardour/filename_extensions.h"
#include "ardour/source.h"
#include "ardour/utils.h"
#include "i18n.h"

View file

@ -1,6 +1,5 @@
#include "ardour/filename_extensions.h"
#include <stdint.h>
#include "i18n.h"
namespace ARDOUR {

View file

@ -21,15 +21,16 @@
#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 "ardour/audiofilesource.h"
#include "ardour/audioregion.h"
#include "ardour/filter.h"
#include "ardour/region.h"
#include "ardour/region_factory.h"
#include "ardour/session.h"
#include "ardour/smf_source.h"
#include "ardour/source_factory.h"
#include "i18n.h"

View file

@ -10,7 +10,6 @@
#include "pbd/compose.h"
#include "pbd/error.h"
#include "ardour/session_utils.h"
#include "ardour/filename_extensions.h"
#include "ardour/utils.h"
@ -19,8 +18,10 @@
using namespace std;
using namespace PBD;
namespace ARDOUR {
int
ARDOUR::find_session (string str, string& path, string& snapshot, bool& isnew)
find_session (string str, string& path, string& snapshot, bool& isnew)
{
struct stat statbuf;
char buf[PATH_MAX+1];
@ -164,3 +165,5 @@ ARDOUR::find_session (string str, string& path, string& snapshot, bool& isnew)
return 0;
}
} // namespace ARDOUR

View file

@ -62,31 +62,25 @@
#include "midi++/mmc.h"
#include "ardour/analyser.h"
#include "ardour/ardour.h"
#include "ardour/audio_library.h"
#include "ardour/audioengine.h"
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"
#include "ardour/buffer_manager.h"
#include "ardour/control_protocol_manager.h"
#include "ardour/dB.h"
#include "ardour/debug.h"
#include "ardour/filesystem_paths.h"
#include "ardour/midi_region.h"
#include "ardour/mix.h"
#include "ardour/audioplaylist.h"
#include "ardour/panner_manager.h"
#include "ardour/plugin_manager.h"
#include "ardour/process_thread.h"
#include "ardour/profile.h"
#include "ardour/region.h"
#include "ardour/rc_configuration.h"
#include "ardour/region.h"
#include "ardour/route_group.h"
#include "ardour/runtime_functions.h"
#include "ardour/session.h"
#include "ardour/session_event.h"
#include "ardour/source_factory.h"
#include "ardour/utils.h"
#include "audiographer/routines.h"

View file

@ -52,6 +52,7 @@
#include "ardour/import_status.h"
#include "ardour/region_factory.h"
#include "ardour/resampled_source.h"
#include "ardour/runtime_functions.h"
#include "ardour/session.h"
#include "ardour/session_directory.h"
#include "ardour/smf_source.h"

View file

@ -18,14 +18,8 @@
#include <glibmm/thread.h>
#include "pbd/failed_constructor.h"
#include "ardour/audio_buffer.h"
#include "ardour/internal_return.h"
#include "ardour/mute_master.h"
#include "ardour/session.h"
#include "ardour/internal_send.h"
#include "ardour/audioengine.h"
using namespace std;
using namespace ARDOUR;

View file

@ -25,7 +25,6 @@
#include "ardour/internal_return.h"
#include "ardour/internal_send.h"
#include "ardour/meter.h"
#include "ardour/panner.h"
#include "ardour/panner_shell.h"
#include "ardour/route.h"
#include "ardour/session.h"
@ -33,6 +32,8 @@
#include "i18n.h"
namespace ARDOUR { class MuteMaster; class Pannable; }
using namespace PBD;
using namespace ARDOUR;
using namespace std;

View file

@ -34,17 +34,12 @@
#include "ardour/audioengine.h"
#include "ardour/buffer.h"
#include "ardour/buffer_set.h"
#include "ardour/debug.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/route.h"
#include "ardour/session.h"
#include "ardour/cycle_timer.h"
#include "ardour/buffer_set.h"
#include "ardour/meter.h"
#include "ardour/amp.h"
#include "ardour/user_bundle.h"
#include "i18n.h"

View file

@ -17,25 +17,20 @@
*/
#include <fstream>
#include <algorithm>
#include <list>
#include <string>
#include <cerrno>
#include <unistd.h>
#include <sstream>
#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/chan_count.h"
#include "ardour/data_type.h"
#include "ardour/io.h"
#include "ardour/io_processor.h"
#include "ardour/processor.h"
#include "ardour/route.h"
#include "ardour/session_object.h"
#include "ardour/types.h"
#include "i18n.h"
@ -43,6 +38,8 @@ using namespace std;
using namespace ARDOUR;
using namespace PBD;
namespace ARDOUR { class Session; }
/* create an IOProcessor that proxies to a new IO object */
IOProcessor::IOProcessor (Session& s, bool with_input, bool with_output,

View file

@ -24,9 +24,6 @@
#include <jack/transport.h>
#include "ardour/slave.h"
#include "ardour/session.h"
#include "i18n.h"
using namespace std;
using namespace ARDOUR;

View file

@ -37,9 +37,7 @@
#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"

View file

@ -31,13 +31,11 @@
#include "pbd/compose.h"
#include "pbd/error.h"
#include "pbd/pathscanner.h"
#include "pbd/stl_delete.h"
#include "pbd/xml++.h"
#include "libardour-config.h"
#include "ardour/ardour.h"
#include "ardour/types.h"
#include "ardour/audio_buffer.h"
#include "ardour/audioengine.h"
#include "ardour/debug.h"

View file

@ -16,15 +16,15 @@
675 Mass Ave, Cambridge, MA 02139, USA.
*/
#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/buffer_set.h"
#include "ardour/dB.h"
#include "ardour/meter.h"
#include "ardour/midi_buffer.h"
#include "ardour/rc_configuration.h"
#include "ardour/runtime_functions.h"
using namespace std;

View file

@ -32,12 +32,8 @@
#include "ardour/debug.h"
#include "ardour/slave.h"
#include "ardour/session.h"
#include "ardour/audioengine.h"
#include "ardour/cycles.h"
#include "ardour/tempo.h"
#include "i18n.h"
using namespace std;

View file

@ -38,11 +38,8 @@
#include "pbd/stateful_diff_command.h"
#include "pbd/stacktrace.h"
#include "ardour/ardour.h"
#include "ardour/audioengine.h"
#include "ardour/butler.h"
#include "ardour/configuration.h"
#include "ardour/cycle_timer.h"
#include "ardour/debug.h"
#include "ardour/io.h"
#include "ardour/midi_diskstream.h"
@ -52,11 +49,10 @@
#include "ardour/midi_region.h"
#include "ardour/playlist_factory.h"
#include "ardour/region_factory.h"
#include "ardour/route.h"
#include "ardour/send.h"
#include "ardour/session.h"
#include "ardour/session_playlists.h"
#include "ardour/smf_source.h"
#include "ardour/types.h"
#include "ardour/utils.h"
#include "midi++/types.h"

View file

@ -38,7 +38,6 @@
#include "ardour/midi_source.h"
#include "ardour/midi_state_tracker.h"
#include "ardour/session.h"
#include "ardour/smf_source.h"
#include "ardour/types.h"
#include "i18n.h"

View file

@ -20,7 +20,6 @@
#include <boost/shared_ptr.hpp>
#include "pbd/compose.h"
#include "pbd/file_utils.h"
#include "pbd/error.h"
@ -29,8 +28,6 @@
#include "ardour/midi_patch_manager.h"
#include "ardour/midi_patch_search_path.h"
#include "i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace MIDI;

View file

@ -25,17 +25,12 @@
#include <stdlib.h>
#include "pbd/error.h"
#include "evoral/EventList.hpp"
#include "ardour/configuration.h"
#include "ardour/debug.h"
#include "ardour/midi_model.h"
#include "ardour/midi_playlist.h"
#include "ardour/midi_region.h"
#include "ardour/midi_ring_buffer.h"
#include "ardour/session.h"
#include "ardour/types.h"
#include "i18n.h"

View file

@ -20,25 +20,10 @@
#include "libardour-config.h"
#endif
#include <vector>
#include <cstdio>
#include <glibmm/fileutils.h>
#include <glibmm/miscutils.h>
#include "pbd/error.h"
#include "pbd/convert.h"
#include "pbd/enumwriter.h"
#include "ardour/midi_playlist.h"
#include "ardour/midi_playlist_source.h"
#include "ardour/midi_region.h"
#include "ardour/debug.h"
#include "ardour/filename_extensions.h"
#include "ardour/session.h"
#include "ardour/session_directory.h"
#include "ardour/session_playlists.h"
#include "ardour/source_factory.h"
#include "i18n.h"
@ -46,6 +31,17 @@ using namespace std;
using namespace ARDOUR;
using namespace PBD;
namespace ARDOUR {
class MidiStateTracker;
class Session;
template <typename T> class MidiRingBuffer;
}
namespace Evoral {
template <typename T> class EventSink;
template <typename Time> class Event;
}
/*******************************************************************************
As of May 2011, it appears too complex to support compound regions for MIDI
because of the need to be able to edit the data represented by the region. It
@ -98,7 +94,6 @@ MidiPlaylistSource::get_state ()
return node;
}
int
MidiPlaylistSource::set_state (const XMLNode& node, int version)
{

View file

@ -26,17 +26,13 @@
#include <glibmm/thread.h>
#include "pbd/basename.h"
#include "pbd/xml++.h"
#include "pbd/enumwriter.h"
#include "ardour/automation_control.h"
#include "ardour/dB.h"
#include "ardour/midi_model.h"
#include "ardour/midi_region.h"
#include "ardour/midi_ring_buffer.h"
#include "ardour/midi_source.h"
#include "ardour/playlist.h"
#include "ardour/region_factory.h"
#include "ardour/session.h"
#include "ardour/tempo.h"

View file

@ -34,19 +34,18 @@
#include "pbd/pthread_utils.h"
#include "pbd/basename.h"
#include "ardour/audioengine.h"
#include "ardour/debug.h"
#include "ardour/midi_model.h"
#include "ardour/midi_ring_buffer.h"
#include "ardour/midi_state_tracker.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"
namespace ARDOUR { template <typename T> class MidiRingBuffer; }
using namespace std;
using namespace ARDOUR;
using namespace PBD;

View file

@ -22,9 +22,10 @@
#include "pbd/compose.h"
#include "pbd/stacktrace.h"
#include "evoral/EventSink.hpp"
#include "ardour/debug.h"
#include "ardour/event_type_map.h"
#include "ardour/midi_ring_buffer.h"
#include "ardour/midi_source.h"
#include "ardour/midi_state_tracker.h"

View file

@ -24,7 +24,6 @@
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "ardour/midi_stretch.h"
#include "ardour/session.h"
#include "ardour/types.h"
#include "i18n.h"

View file

@ -17,35 +17,33 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "pbd/error.h"
#include "pbd/enumwriter.h"
#include "pbd/convert.h"
#include "midi++/events.h"
#include "evoral/midi_util.h"
#include "ardour/amp.h"
#include "ardour/buffer_set.h"
#include "ardour/debug.h"
#include "ardour/delivery.h"
#include "ardour/io_processor.h"
#include "ardour/meter.h"
#include "ardour/midi_diskstream.h"
#include "ardour/midi_playlist.h"
#include "ardour/midi_port.h"
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "ardour/midi_track.h"
#include "ardour/panner.h"
#include "ardour/port.h"
#include "ardour/processor.h"
#include "ardour/route_group_specialized.h"
#include "ardour/session.h"
#include "ardour/session_playlists.h"
#include "ardour/utils.h"
#include "i18n.h"
namespace ARDOUR {
class InterThreadInfo;
class MidiSource;
class Region;
class SMFSource;
}
using namespace std;
using namespace ARDOUR;
using namespace PBD;

View file

@ -23,9 +23,6 @@
#include <unistd.h>
#include "pbd/error.h"
#include "pbd/enumwriter.h"
#include "pbd/failed_constructor.h"
#include "pbd/pthread_utils.h"
#include "midi++/port.h"
#include "ardour/debug.h"

View file

@ -16,6 +16,8 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <math.h>
#include "ardour/mtdm.h"
MTDM::MTDM (void)

View file

@ -17,15 +17,10 @@
*/
#include "pbd/boost_debug.h"
#include "ardour/audio_buffer.h"
#include "ardour/buffer_set.h"
#include "ardour/debug.h"
#include "ardour/panner.h"
#include "ardour/pannable.h"
#include "ardour/session.h"
#include "ardour/utils.h"
#include "i18n.h"

View file

@ -43,18 +43,13 @@
#include "evoral/Curve.hpp"
#include "ardour/audio_buffer.h"
#include "ardour/audio_buffer.h"
#include "ardour/automatable.h"
#include "ardour/buffer_set.h"
#include "ardour/debug.h"
#include "ardour/pannable.h"
#include "ardour/panner.h"
#include "ardour/panner_manager.h"
#include "ardour/panner_shell.h"
#include "ardour/runtime_functions.h"
#include "ardour/session.h"
#include "ardour/speakers.h"
#include "ardour/utils.h"
#include "i18n.h"

View file

@ -19,20 +19,14 @@
#include <stdint.h>
#include <set>
#include <fstream>
#include <algorithm>
#include <unistd.h>
#include <cerrno>
#include <string>
#include <climits>
#include <boost/lexical_cast.hpp>
#include "pbd/convert.h"
#include "pbd/failed_constructor.h"
#include "pbd/stateful_diff_command.h"
#include "pbd/xml++.h"
#include "pbd/stacktrace.h"
#include "ardour/debug.h"
#include "ardour/playlist.h"

View file

@ -33,9 +33,6 @@
#include "ardour/playlist.h"
#include "ardour/playlist_source.h"
#include "ardour/playlist_factory.h"
#include "ardour/session.h"
#include "ardour/session_playlists.h"
#include "ardour/source_factory.h"
#include "i18n.h"

View file

@ -38,12 +38,16 @@
#include "pbd/error.h"
#include "pbd/xml++.h"
#include "ardour/ardour.h"
#include "ardour/session.h"
#include "ardour/audioengine.h"
#include "ardour/buffer_set.h"
#include "ardour/chan_count.h"
#include "ardour/chan_mapping.h"
#include "ardour/data_type.h"
#include "ardour/midi_buffer.h"
#include "ardour/midi_state_tracker.h"
#include "ardour/plugin.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/plugin_manager.h"
#include "ardour/session.h"
#include "ardour/types.h"
#ifdef AUDIOUNIT_SUPPORT
#include "ardour/audio_unit.h"
@ -62,6 +66,8 @@ using namespace std;
using namespace ARDOUR;
using namespace PBD;
namespace ARDOUR { class AudioEngine; }
bool
PluginInfo::is_instrument () const
{

View file

@ -35,8 +35,6 @@
#include "ardour/ladspa_plugin.h"
#include "ardour/plugin.h"
#include "ardour/plugin_insert.h"
#include "ardour/port.h"
#include "ardour/route.h"
#ifdef LV2_SUPPORT
#include "ardour/lv2_plugin.h"
@ -54,7 +52,6 @@
#include "ardour/audio_unit.h"
#endif
#include "ardour/audioengine.h"
#include "ardour/session.h"
#include "ardour/types.h"

View file

@ -53,7 +53,7 @@
#include "ardour/ladspa_plugin.h"
#include "ardour/plugin.h"
#include "ardour/plugin_manager.h"
#include "ardour/session.h"
#include "ardour/rc_configuration.h"
#ifdef LV2_SUPPORT
#include "ardour/lv2_plugin.h"

View file

@ -21,17 +21,15 @@
#include "libardour-config.h"
#endif
#include <stdexcept>
#include <jack/weakjack.h> // so that we can test for new functions at runtime
#include "pbd/error.h"
#include "pbd/compose.h"
#include "pbd/error.h"
#include "pbd/failed_constructor.h"
#include "ardour/audioengine.h"
#include "ardour/debug.h"
#include "ardour/port.h"
#include "ardour/audioengine.h"
#include "pbd/failed_constructor.h"
#include "i18n.h"

View file

@ -19,19 +19,14 @@
#include <string>
#include "pbd/failed_constructor.h"
#include "pbd/xml++.h"
#include "ardour/audioengine.h"
#include "ardour/audio_port.h"
#include "ardour/buffer_set.h"
#include "ardour/audioengine.h"
#include "ardour/delivery.h"
#include "ardour/io.h"
#include "ardour/mtdm.h"
#include "ardour/plugin.h"
#include "ardour/port.h"
#include "ardour/port_insert.h"
#include "ardour/route.h"
#include "ardour/session.h"
#include "ardour/types.h"

View file

@ -18,9 +18,10 @@
#include <string>
#include "ardour/port_set.h"
#include "ardour/midi_port.h"
#include "ardour/audio_port.h"
#include "ardour/midi_port.h"
#include "ardour/port.h"
#include "ardour/port_set.h"
using std::string;

View file

@ -18,7 +18,7 @@
*/
#include <iostream>
#include "ardour/audioengine.h"
#include "ardour/buffer.h"
#include "ardour/buffer_manager.h"
#include "ardour/buffer_set.h"

View file

@ -23,20 +23,12 @@
#include <string>
#include "pbd/failed_constructor.h"
#include "pbd/enumwriter.h"
#include "pbd/xml++.h"
#include "ardour/automatable.h"
#include "ardour/chan_count.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 "ardour/types.h"
#ifdef WINDOWS_VST_SUPPORT
#include "ardour/windows_vst_plugin.h"
@ -56,6 +48,8 @@ using namespace std;
using namespace ARDOUR;
using namespace PBD;
namespace ARDOUR { class Session; }
// Always saved as Processor, but may be IOProcessor or Send in legacy sessions
const string Processor::state_node_name = "Processor";

View file

@ -20,13 +20,8 @@
#include "pbd/basename.h"
#include "ardour/types.h"
#include "ardour/quantize.h"
#include "ardour/session.h"
#include "ardour/smf_source.h"
#include "ardour/midi_model.h"
#include "ardour/midi_region.h"
#include "ardour/tempo.h"
#include "i18n.h"

View file

@ -23,13 +23,13 @@
#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/audiosource.h"
#include "ardour/pitch.h"
#include "ardour/progress.h"
#include "ardour/session.h"
#include "ardour/stretch.h"
#include "ardour/types.h"
#include "i18n.h"

View file

@ -24,18 +24,16 @@
#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/rc_configuration.h"
#include "ardour/audio_diskstream.h"
#include "ardour/control_protocol_manager.h"
#include "ardour/diskstream.h"
#include "ardour/filesystem_paths.h"
#include "ardour/rc_configuration.h"
#include "ardour/session_metadata.h"
#include "i18n.h"

View file

@ -19,19 +19,14 @@
#include <cstring>
#include <cerrno>
#include <unistd.h>
#include <fstream>
#include <algorithm>
#include <glibmm/miscutils.h>
#include "pbd/error.h"
#include "ardour/configuration.h"
#include "ardour/rc_configuration.h"
#include "ardour/filesystem_paths.h"
#include "ardour/recent_sessions.h"
#include "ardour/utils.h"
#include "i18n.h"

View file

@ -25,11 +25,8 @@
#include <glibmm/thread.h>
#include "pbd/xml++.h"
#include "pbd/stacktrace.h"
#include "pbd/enumwriter.h"
#include "ardour/debug.h"
#include "ardour/file_source.h"
#include "ardour/filter.h"
#include "ardour/playlist.h"
#include "ardour/playlist_source.h"
@ -38,9 +35,7 @@
#include "ardour/region_factory.h"
#include "ardour/session.h"
#include "ardour/source.h"
#include "ardour/source_factory.h"
#include "ardour/tempo.h"
#include "ardour/utils.h"
#include "i18n.h"
@ -49,6 +44,7 @@ using namespace ARDOUR;
using namespace PBD;
namespace ARDOUR {
class Progress;
namespace Properties {
PBD::PropertyDescriptor<bool> muted;
PBD::PropertyDescriptor<bool> opaque;

View file

@ -20,17 +20,14 @@
#include <inttypes.h>
#include "pbd/error.h"
#include "pbd/boost_debug.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/utils.h"
#include "ardour/midi_source.h"
#include "ardour/region.h"
#include "ardour/region_factory.h"
#include "ardour/session.h"
#include "i18n.h"

View file

@ -22,16 +22,12 @@
#include "pbd/xml++.h"
#include "ardour/amp.h"
#include "ardour/audio_port.h"
#include "ardour/audioengine.h"
#include "ardour/buffer_set.h"
#include "ardour/io.h"
#include "ardour/meter.h"
#include "ardour/panner.h"
#include "ardour/port.h"
#include "ardour/return.h"
#include "ardour/session.h"
#include "ardour/mute_master.h"
#include "ardour/audioengine.h"
#include "i18n.h"

View file

@ -19,19 +19,16 @@
#include <algorithm>
#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 "i18n.h"
#include "ardour/audiosource.h"
#include "ardour/reverse.h"
#include "ardour/types.h"
using namespace std;
using namespace ARDOUR;
namespace ARDOUR { class Progress; class Session; }
Reverse::Reverse (Session& s)
: Filter (s)
{

View file

@ -33,40 +33,30 @@
#include "pbd/convert.h"
#include "pbd/boost_debug.h"
#include "evoral/Curve.hpp"
#include "ardour/amp.h"
#include "ardour/audio_port.h"
#include "ardour/audio_buffer.h"
#include "ardour/audioengine.h"
#include "ardour/buffer.h"
#include "ardour/buffer_set.h"
#include "ardour/configuration.h"
#include "ardour/cycle_timer.h"
#include "ardour/capturing_processor.h"
#include "ardour/debug.h"
#include "ardour/delivery.h"
#include "ardour/dB.h"
#include "ardour/internal_send.h"
#include "ardour/internal_return.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/internal_send.h"
#include "ardour/meter.h"
#include "ardour/mix.h"
#include "ardour/monitor_processor.h"
#include "ardour/pannable.h"
#include "ardour/panner.h"
#include "ardour/panner_shell.h"
#include "ardour/plugin_insert.h"
#include "ardour/port.h"
#include "ardour/port_insert.h"
#include "ardour/processor.h"
#include "ardour/profile.h"
#include "ardour/route.h"
#include "ardour/route_group.h"
#include "ardour/send.h"
#include "ardour/session.h"
#include "ardour/timestamps.h"
#include "ardour/utils.h"
#include "ardour/unknown_processor.h"
#include "ardour/capturing_processor.h"
#include "ardour/utils.h"
#include "i18n.h"

View file

@ -21,17 +21,14 @@
#include <algorithm>
#include "pbd/error.h"
#include "pbd/enumwriter.h"
#include "pbd/strsplit.h"
#include "ardour/amp.h"
#include "ardour/debug.h"
#include "ardour/route_group.h"
#include "ardour/audio_track.h"
#include "ardour/audio_diskstream.h"
#include "ardour/configuration.h"
#include "ardour/route.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "i18n.h"

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