projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed incomplete merge for audioengine.cc
[ardour.git]
/
libs
/
ardour
/
ardour
/
audio_unit.h
diff --git
a/libs/ardour/ardour/audio_unit.h
b/libs/ardour/ardour/audio_unit.h
index 07f41f55261b0d304673918e9497966e84623339..13b16827cba6150adcbbbeb1af9c93866dc1b72b 100644
(file)
--- a/
libs/ardour/ardour/audio_unit.h
+++ b/
libs/ardour/ardour/audio_unit.h
@@
-41,21
+41,20
@@
class CAComponent;
class CAAudioUnit;
class CAComponentDescription;
class CAComponent;
class CAAudioUnit;
class CAComponentDescription;
-struct
LIBARDOUR_API
AudioBufferList;
+struct AudioBufferList;
namespace ARDOUR {
class AudioEngine;
class Session;
namespace ARDOUR {
class AudioEngine;
class Session;
-struct LIBARDOUR_API AUParameterDescriptor : public P
lugin::P
arameterDescriptor {
+struct LIBARDOUR_API AUParameterDescriptor : public ParameterDescriptor {
// additional fields to make operations more efficient
AudioUnitParameterID id;
AudioUnitScope scope;
AudioUnitElement element;
// additional fields to make operations more efficient
AudioUnitParameterID id;
AudioUnitScope scope;
AudioUnitElement element;
- float default_value;
bool automatable;
bool automatable;
- AudioUnitParameterUnit unit;
+ AudioUnitParameterUnit
au_
unit;
};
class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
};
class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin
@@
-243,6
+242,7
@@
class LIBARDOUR_API AUPluginInfo : public PluginInfo {
bool reconfigurable_io() const { return true; }
static PluginInfoList* discover ();
bool reconfigurable_io() const { return true; }
static PluginInfoList* discover ();
+ static bool au_get_crashlog (std::string &msg);
static void get_names (CAComponentDescription&, std::string& name, std::string& maker);
static std::string stringify_descriptor (const CAComponentDescription&);
static void get_names (CAComponentDescription&, std::string& name, std::string& maker);
static std::string stringify_descriptor (const CAComponentDescription&);
@@
-251,6
+251,11
@@
class LIBARDOUR_API AUPluginInfo : public PluginInfo {
private:
boost::shared_ptr<CAComponentDescription> descriptor;
UInt32 version;
private:
boost::shared_ptr<CAComponentDescription> descriptor;
UInt32 version;
+ static FILE * _crashlog_fd;
+
+ static void au_start_crashlog (void);
+ static void au_remove_crashlog (void);
+ static void au_crashlog (std::string);
static void discover_music (PluginInfoList&);
static void discover_fx (PluginInfoList&);
static void discover_music (PluginInfoList&);
static void discover_fx (PluginInfoList&);