diff options
| author | David Robillard <d@drobilla.net> | 2006-08-12 19:43:09 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-08-12 19:43:09 +0000 |
| commit | a98a67120eea8ebb817eebea048affc182ea054e (patch) | |
| tree | 2c8c9db7c0d8d18bf5185e10d471d6daa7a7de3d /libs/ardour/ardour | |
| parent | 30ab1fd61569f9d7fb7410d483fa68cbf9865c37 (diff) | |
Merged with trunk R795
Fiddled with scrolling to leave a bit of context on each side. 'scroll interval' is a single float, should make it a configuration variable some day
git-svn-id: svn://localhost/ardour2/branches/midi@796 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/audio_unit.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/cycles.h | 13 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h index 5b5cd537ab..56179125bb 100644 --- a/libs/ardour/ardour/audio_unit.h +++ b/libs/ardour/ardour/audio_unit.h @@ -86,6 +86,9 @@ class AUPlugin : public ARDOUR::Plugin bool has_editor () const; + CAAudioUnit* get_au () { return unit; } + CAComponent* get_comp () { return comp; } + private: CAComponent* comp; CAAudioUnit* unit; @@ -110,6 +113,7 @@ class AUPluginInfo : public PluginInfo { private: static std::string get_name (CAComponentDescription&); + void setup_nchannels (CAComponentDescription&); }; typedef boost::shared_ptr<AUPluginInfo> AUPluginInfoPtr; diff --git a/libs/ardour/ardour/cycles.h b/libs/ardour/ardour/cycles.h index f194988da9..ad3e512669 100644 --- a/libs/ardour/ardour/cycles.h +++ b/libs/ardour/ardour/cycles.h @@ -186,8 +186,19 @@ static inline cycles_t get_cycles (void) /* begin mach */ #elif defined(__APPLE__) -#include <CoreAudio/CoreAudioTypes.h> + +#ifdef HAVE_COREAUDIO #include <CoreAudio/HostTime.h> +#else // Due to MacTypes.h and libgnomecanvasmm Rect conflict +typedef unsigned long long UInt64; + +extern UInt64 +AudioGetCurrentHostTime(); + +extern UInt64 +AudioConvertHostTimeToNanos(UInt64 inHostTime); +#endif + typedef UInt64 cycles_t; static inline cycles_t get_cycles (void) { diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index cac27168a1..a9b8cbf290 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -493,7 +493,7 @@ class Session : public sigc::trackable, public Stateful int save_state (string snapshot_name, bool pending = false); int restore_state (string snapshot_name); int save_template (string template_name); - int save_history (); + int save_history (string snapshot_name = ""); static int rename_template (string old_name, string new_name); |