diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-21 02:24:38 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-21 02:24:38 +0000 |
commit | d9cebc2edf8accded23c6f2a1caab73eb47a50fd (patch) | |
tree | 976c94ef8ec19b8e5149675eb5092ab6e9cb20de /libs/ardour/ardour/audioengine.h | |
parent | cf77196698a395e4174037f36f755b401de679f3 (diff) |
commits 6001-6525 inclusive from 2.X applied to 3.0
git-svn-id: svn://localhost/ardour2/branches/3.0@6942 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audioengine.h')
-rw-r--r-- | libs/ardour/ardour/audioengine.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 63f9afeb2b..5e2657c56c 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -224,7 +224,7 @@ _ the regular process() call to session->process() is not made. /* this signal is sent if JACK ever disconnects us */ - PBD::Signal0<void> Halted; + PBD::Signal1<void,const char*> Halted; /* these two are emitted when the engine itself is started and stopped @@ -306,6 +306,7 @@ _ the regular process() call to session->process() is not made. int connect_to_jack (std::string client_name, std::string session_uuid); static void halted (void *); + static void halted_info (jack_status_t,const char*,void *); void meter_thread (); void start_metering_thread (); |