diff options
author | David Robillard <d@drobilla.net> | 2006-06-13 02:43:40 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-06-13 02:43:40 +0000 |
commit | edc7a146f5f3c9facd97b3e8951e1607b5e9ec31 (patch) | |
tree | 3b5b467ee5643d1bff7c17c952ec52f7fd02500a /libs/ardour/ardour/audioengine.h | |
parent | 27e00ec4e706ac1620a43c1fc1f27e25df546695 (diff) |
Merged with trunk
git-svn-id: svn://localhost/ardour2/branches/midi@580 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audioengine.h')
-rw-r--r-- | libs/ardour/ardour/audioengine.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 36dbbd1dbe..788ac679dd 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -237,10 +237,10 @@ class AudioEngine : public sigc::trackable int connect_to_jack (std::string client_name); - static void* _meter_thread (void* arg); - void* meter_thread (); - pthread_t meter_thread_id; - void maybe_start_metering_thread (); + void meter_thread (); + void start_metering_thread (); + Glib::Thread* m_meter_thread; + mutable gint m_meter_exit; }; }; /* namespace ARDOUR */ |