diff options
author | Taybin Rutkin <taybin@taybin.com> | 2009-12-06 04:35:48 +0000 |
---|---|---|
committer | Taybin Rutkin <taybin@taybin.com> | 2009-12-06 04:35:48 +0000 |
commit | 3fdcba185980896366cc0d3d14f6dfd6bbaf1d0a (patch) | |
tree | 65226b3a1077c0949b1c72c1222a0bb9312def8d /libs/ardour/ardour/audio_unit.h | |
parent | 4a8baf26f19a2658e6de947b76a6bd843cbdae3d (diff) |
Merged revisions 6293,6296-6306,6308 via svnmerge from
svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/build_fixes
........
r6293 | trutkin | 2009-12-05 08:49:37 -0500 (Sat, 05 Dec 2009) | 2 lines
fix if-statement in build script
........
r6296 | trutkin | 2009-12-05 09:30:19 -0500 (Sat, 05 Dec 2009) | 5 lines
rearrange GTKOSX and darwin dependencies
- moved some GTKOSX include paths to generic darwin
- made GTKOSX dependent on being on darwin anyways
........
r6297 | trutkin | 2009-12-05 09:35:09 -0500 (Sat, 05 Dec 2009) | 2 lines
move coreaudio and audiounit handling to darwin section
........
r6298 | trutkin | 2009-12-05 09:53:40 -0500 (Sat, 05 Dec 2009) | 3 lines
use True/False instead of 1/0
fix another if-statement where it should be an elif-statement
........
r6299 | trutkin | 2009-12-05 14:11:09 -0500 (Sat, 05 Dec 2009) | 10 lines
fixes to get libardour building
- can't cast away volatile, so copy _transport_frame before emitting it.
- const_reverse_iterator::operator!=() isn't defined in this version of gcc.
- removed annoying HERE WE ARE CAAudioFile.h #warning.
- removed unnecessary include of sndfile.h in session.h.
- we don't want to set -march=i686 on the mac, so indent this if-statement so
it's only run on linux.
- DEBUG_STR() fails in the NDEBUG case, so wrap its use in an #ifndef NDEBUG
........
r6300 | trutkin | 2009-12-05 15:48:29 -0500 (Sat, 05 Dec 2009) | 2 lines
remove old scons-style CXXFLAGS_FOO in favor of just CXXFLAGS
........
r6301 | trutkin | 2009-12-05 16:01:10 -0500 (Sat, 05 Dec 2009) | 8 lines
clean up configure flags
- removed useless --aubio and --syslibs flags. The syslibs value is ignored
as we don't bring our own libraries with us anymoreand we use aubio
automatically if it's available
- added ways to turn off fpu_optimization and NLS
- fixed compiling on the mac without fpu_optimization
........
r6302 | trutkin | 2009-12-05 18:12:46 -0500 (Sat, 05 Dec 2009) | 5 lines
go back to prior uselib method for COREAUDIO, AUDIOUNIT, and GTKOSX
- fixed compile of CoreAudioSource
- re-did inclusion of coremidi_midiport.cc to depend on COREAUDIO presence
........
r6303 | trutkin | 2009-12-05 18:59:02 -0500 (Sat, 05 Dec 2009) | 5 lines
fixed compiler warnings about classes with virtual member functions, but no virtual destructor.
- Changed Metering to not use foo() = 0; to indicate it shouldn't be instantiated, but
private: Metering(), which is more idiomatic.
........
r6304 | trutkin | 2009-12-05 19:25:41 -0500 (Sat, 05 Dec 2009) | 2 lines
TOP_MENUBAR isn't used when building ardour.menus. Removed.
........
r6305 | trutkin | 2009-12-05 19:46:11 -0500 (Sat, 05 Dec 2009) | 5 lines
fix some AudioUnit compile errors
- update AudioUnit to use ChanCount
- fix some namespacing issues in audio_unit.h
........
r6306 | trutkin | 2009-12-05 20:08:48 -0500 (Sat, 05 Dec 2009) | 2 lines
make --extra-warn useful
........
r6308 | trutkin | 2009-12-05 22:59:42 -0500 (Sat, 05 Dec 2009) | 10 lines
fix compiling/linking with --coreaudio
- rearrange ardour_ui.h header in editor.cc to avoid conflict
- midi++ depends on OSX as well as COREAUDIO
- fixed including frameworks
- tweaked --extra-warn again. it's kinda redundent with --strict
- improved indentation in wscript
- use #ifdef HAVE_COREMIDI, not #if HAVE_COREMIDI. #if isn't interchangable
with #ifdef and won't work if HAVE_COREMIDI is defined with no value.
........
git-svn-id: svn://localhost/ardour2/branches/3.0@6310 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audio_unit.h')
-rw-r--r-- | libs/ardour/ardour/audio_unit.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h index d1dd92dd3d..9fbc188562 100644 --- a/libs/ardour/ardour/audio_unit.h +++ b/libs/ardour/ardour/audio_unit.h @@ -65,7 +65,7 @@ class AUPlugin : public ARDOUR::Plugin AUPlugin (const AUPlugin& other); virtual ~AUPlugin (); - std::string unique_id () const; + std::string unique_id () const; const char * label () const; const char * name () const { return _info->name.c_str(); } const char * maker () const { return _info->creator.c_str(); } @@ -81,10 +81,10 @@ class AUPlugin : public ARDOUR::Plugin void deactivate (); void set_block_size (nframes_t nframes); - int connect_and_run (vector<Sample*>& bufs, uint32_t maxbuf, int32_t& in, int32_t& out, nframes_t nframes, nframes_t offset); + int connect_and_run (std::vector<Sample*>& bufs, uint32_t maxbuf, int32_t& in, int32_t& out, nframes_t nframes, nframes_t offset); std::set<uint32_t> automatable() const; - string describe_parameter (uint32_t); - string state_node_name () const { return "audiounit"; } + std::string describe_parameter (uint32_t); + std::string state_node_name () const { return "audiounit"; } void print_parameter (uint32_t, char*, uint32_t len) const; bool parameter_is_audio (uint32_t) const; @@ -95,16 +95,16 @@ class AUPlugin : public ARDOUR::Plugin XMLNode& get_state(); int set_state(const XMLNode& node); - bool save_preset (string name); - bool load_preset (const string preset_label); + bool save_preset (std::string name); + bool load_preset (const std::string preset_label); std::vector<std::string> get_presets (); std::string current_preset() const; bool has_editor () const; int32_t can_do (int32_t in, int32_t& out); - uint32_t output_streams() const; - uint32_t input_streams() const; + ChanCount output_streams() const; + ChanCount input_streams() const; int32_t configure_io (int32_t in, int32_t out); boost::shared_ptr<CAAudioUnit> get_au () { return unit; } @@ -120,8 +120,8 @@ class AUPlugin : public ARDOUR::Plugin boost::shared_ptr<CAAudioUnit> unit; bool initialized; - int32_t input_channels; - int32_t output_channels; + ChanCount input_channels; + ChanCount output_channels; std::vector<std::pair<int,int> > io_configs; AudioBufferList* buffers; @@ -144,7 +144,7 @@ class AUPlugin : public ARDOUR::Plugin uint32_t current_maxbuf; nframes_t current_offset; nframes_t cb_offset; - vector<Sample*>* current_buffers; + std::vector<Sample*>* current_buffers; nframes_t frames_processed; std::vector<AUParameterDescriptor> descriptors; |