diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-07-25 17:48:55 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-07-25 17:48:55 +0000 |
| commit | 3cd8138a419cb165f56070ace0b21a1e63ec5a43 (patch) | |
| tree | 51efe9abff24a1367be227aebf8e2901433b0b88 /libs/ardour/ardour/audioengine.h | |
| parent | eb6e352dd0a307badf68ae4a216d15c03b4685de (diff) | |
convert from Glib:: to Glib::Threads for all thread-related API
git-svn-id: svn://localhost/ardour2/branches/3.0@13084 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audioengine.h')
| -rw-r--r-- | libs/ardour/ardour/audioengine.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 73e40e8ab4..1c0d0f1a55 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -31,7 +31,7 @@ #include <exception> #include <string> -#include <glibmm/thread.h> +#include <glibmm/threads.h> #include "pbd/rcu.h" #include "pbd/signals.h" @@ -85,7 +85,7 @@ public: int start (); bool running() const { return _running; } - Glib::Mutex& process_lock() { return _process_lock; } + Glib::Threads::Mutex& process_lock() { return _process_lock; } framecnt_t frame_rate () const; pframes_t frames_per_cycle () const; @@ -265,8 +265,8 @@ private: jack_client_t* volatile _jack; /* could be reset to null by SIGPIPE or another thread */ std::string jack_client_name; - Glib::Mutex _process_lock; - Glib::Cond session_removed; + Glib::Threads::Mutex _process_lock; + Glib::Threads::Cond session_removed; bool session_remove_pending; frameoffset_t session_removal_countdown; gain_t session_removal_gain; @@ -286,7 +286,7 @@ private: bool _pre_freewheel_mmc_enabled; int _usecs_per_cycle; bool port_remove_in_progress; - Glib::Thread* m_meter_thread; + Glib::Threads::Thread* m_meter_thread; ProcessThread* _main_thread; SerializedRCUManager<Ports> ports; |