summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-05-01 23:26:14 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-05-01 23:26:14 +0000
commit0c7b7216efc71e9b3851f1b43f2191a99619ff25 (patch)
treeb957a47485c09a107bcce162d1bcf25caa81800a /libs/ardour/ardour
parentcdaec2d09e86e28d38d5d472a90032984b0bfcb0 (diff)
initial fixes to get build to work without new JACK MIDI, and to get it running with an older session, at least somewhat
git-svn-id: svn://localhost/ardour2/branches/midi@1773 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/audioengine.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index 48a3426d53..0263f83230 100644
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -46,6 +46,8 @@ class Port;
class AudioEngine : public sigc::trackable
{
public:
+ typedef std::set<Port*> Ports;
+
AudioEngine (std::string client_name);
virtual ~AudioEngine ();
@@ -66,6 +68,8 @@ class AudioEngine : public sigc::trackable
int start ();
bool running() const { return _running; }
+ int run_process_cycle (ARDOUR::Session*, jack_nframes_t nframes);
+
Glib::Mutex& process_lock() { return _process_lock; }
nframes_t frame_rate();
@@ -211,7 +215,6 @@ class AudioEngine : public sigc::trackable
bool reconnect_on_halt;
int _usecs_per_cycle;
- typedef std::set<Port*> Ports;
SerializedRCUManager<Ports> ports;
int process_callback (nframes_t nframes);