smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

Clean up region.h and trim include tree.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8312 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2010-12-20 21:22:49 +00:00
parent fe879145fe
commit 3f30e8093e
13 changed files with 103 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/export_channel_selector.cc
View file

@ -27,6 +27,7 @@
#include "ardour/audio_port.h" #include "ardour/audio_port.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour/audioregion.h"
#include "ardour/export_channel_configuration.h" #include "ardour/export_channel_configuration.h"
#include "ardour/export_handler.h" #include "ardour/export_handler.h"
#include "ardour/io.h" #include "ardour/io.h"

1
gtk2_ardour/export_dialog.cc
View file

@ -23,6 +23,7 @@
#include "pbd/filesystem.h" #include "pbd/filesystem.h"
#include "ardour/audioregion.h"
#include "ardour/export_status.h" #include "ardour/export_status.h"
#include "ardour/export_handler.h" #include "ardour/export_handler.h"

4
libs/ardour/ardour/audioanalyser.h
View file

@ -24,9 +24,9 @@
#include <string> #include <string>
#include <ostream> #include <ostream>
#include <fstream> #include <fstream>
#include "vamp-sdk/Plugin.h"
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include "ardour/audioregion.h" #include "vamp-sdk/Plugin.h"
#include "ardour/types.h"
namespace ARDOUR { namespace ARDOUR {

1
libs/ardour/ardour/crossfade.h
View file

@ -40,7 +40,6 @@ namespace ARDOUR {
extern PBD::PropertyDescriptor<bool> follow_overlap; extern PBD::PropertyDescriptor<bool> follow_overlap;
} }
class AudioRegion;
class Playlist; class Playlist;
class Crossfade : public ARDOUR::AudioRegion class Crossfade : public ARDOUR::AudioRegion

4
libs/ardour/ardour/export_channel.h
View file

@ -27,7 +27,8 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/operators.hpp> #include <boost/operators.hpp>
#include "ardour/audioregion.h" #include "pbd/signals.h"
#include "ardour/buffer_set.h" #include "ardour/buffer_set.h"
namespace ARDOUR { namespace ARDOUR {
@ -35,6 +36,7 @@ namespace ARDOUR {
class Session; class Session;
class AudioTrack; class AudioTrack;
class AudioPort; class AudioPort;
class AudioRegion;
/// Export channel base class interface for different source types /// Export channel base class interface for different source types
class ExportChannel : public boost::less_than_comparable<ExportChannel> class ExportChannel : public boost::less_than_comparable<ExportChannel>

3
libs/ardour/ardour/filter.h
View file

@ -22,7 +22,8 @@
#define __ardour_filter_h__ #define __ardour_filter_h__
#include <vector> #include <vector>
#include "ardour/region.h"
#include "ardour/types.h"
namespace ARDOUR { namespace ARDOUR {

5
libs/ardour/ardour/region.h
View file

@ -122,6 +122,7 @@ class Region
framepos_t ancestral_start () const { return _ancestral_start; } framepos_t ancestral_start () const { return _ancestral_start; }
framecnt_t ancestral_length () const { return _ancestral_length; } framecnt_t ancestral_length () const { return _ancestral_length; }
float stretch () const { return _stretch; } float stretch () const { return _stretch; }
float shift () const { return _shift; } float shift () const { return _shift; }
@ -305,11 +306,13 @@ class Region
/** Construct a region from multiple sources*/ /** Construct a region from multiple sources*/
Region (const SourceList& srcs); Region (const SourceList& srcs);
/** Construct a region from another region, at an offset within that region */ /** Construct a region from another region, at an offset within that region */
Region (boost::shared_ptr<const Region>, frameoffset_t start_offset = 0, bool start_relative = true); Region (boost::shared_ptr<const Region>, frameoffset_t start_offset = 0, bool start_relative = true);
/** Construct a region as a copy of another region, but with different sources */ /** Construct a region as a copy of another region, but with different sources */
Region (boost::shared_ptr<const Region>, const SourceList&); Region (boost::shared_ptr<const Region>, const SourceList&);
/** normal Region copy constructor */
/** Normal Region copy constructor */
Region (boost::shared_ptr<const Region>); Region (boost::shared_ptr<const Region>);
/** Constructor for derived types only */ /** Constructor for derived types only */

2
libs/ardour/ardour/region_factory.h
View file

@ -28,7 +28,6 @@
#include "pbd/signals.h" #include "pbd/signals.h"
#include "ardour/types.h" #include "ardour/types.h"
#include "ardour/region.h"
class XMLNode; class XMLNode;
@ -38,7 +37,6 @@ class Session;
class AudioRegion; class AudioRegion;
class RegionFactory { class RegionFactory {
public: public:
typedef std::map<PBD::ID,boost::shared_ptr<Region> > RegionMap; typedef std::map<PBD::ID,boost::shared_ptr<Region> > RegionMap;

2
libs/ardour/audioanalyser.cc
View file

@ -7,10 +7,10 @@
#include <glib/gstdio.h> // for g_remove() #include <glib/gstdio.h> // for g_remove()
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/failed_constructor.h"
#include "ardour/audioanalyser.h" #include "ardour/audioanalyser.h"
#include "ardour/readable.h" #include "ardour/readable.h"
#include "ardour/readable.h"
#include <cstring> #include <cstring>

1
libs/ardour/export_channel.cc
View file

@ -22,6 +22,7 @@
#include "ardour/audio_port.h" #include "ardour/audio_port.h"
#include "ardour/audio_track.h" #include "ardour/audio_track.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
#include "ardour/audioregion.h"
#include "ardour/export_channel.h" #include "ardour/export_channel.h"
#include "ardour/export_failed.h" #include "ardour/export_failed.h"
#include "ardour/session.h" #include "ardour/session.h"

1
libs/ardour/onset_detector.cc
View file

@ -1,3 +1,4 @@
#include <cmath>
#include "ardour/onset_detector.h" #include "ardour/onset_detector.h"
#include "i18n.h" #include "i18n.h"

1
libs/ardour/transient_detector.cc
View file

@ -1,3 +1,4 @@
#include <cmath>
#include "ardour/transient_detector.h" #include "ardour/transient_detector.h"
#include "i18n.h" #include "i18n.h"

2
wscript
View file

@ -458,7 +458,7 @@ def configure(conf):
if Options.options.boost_sp_debug: if Options.options.boost_sp_debug:
conf.env.append_value('CXXFLAGS_BOOST', '-DBOOST_SP_ENABLE_DEBUG_HOOKS') conf.env.append_value('CXXFLAGS_BOOST', '-DBOOST_SP_ENABLE_DEBUG_HOOKS')
autowaf.check_header(conf, 'jack/session.h', define="JACK_SESSION") autowaf.check_header(conf, 'jack/session.h', define="JACK_SESSION", mandatory = False)
conf.check_cc(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n", conf.check_cc(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
execute = "1", execute = "1",