diff options
| -rw-r--r-- | libs/ardour/ardour/graph.h | 8 | ||||
| -rw-r--r-- | libs/ardour/ardour/worker.h | 2 | ||||
| -rw-r--r-- | libs/pbd/pbd/semutils.h | 6 | ||||
| -rw-r--r-- | libs/pbd/semutils.cc | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h index 2d4a0adb30..239f9ad1ab 100644 --- a/libs/ardour/ardour/graph.h +++ b/libs/ardour/ardour/graph.h @@ -101,12 +101,12 @@ private: std::vector<GraphNode *> _trigger_queue; pthread_mutex_t _trigger_mutex; - PBD::ProcessSemaphore _execution_sem; + PBD::Semaphore _execution_sem; /** Signalled to start a run of the graph for a process callback */ - PBD::ProcessSemaphore _callback_start_sem; - PBD::ProcessSemaphore _callback_done_sem; - PBD::ProcessSemaphore _cleanup_sem; + PBD::Semaphore _callback_start_sem; + PBD::Semaphore _callback_done_sem; + PBD::Semaphore _cleanup_sem; /** The number of processing threads that are asleep */ volatile gint _execution_tokens; diff --git a/libs/ardour/ardour/worker.h b/libs/ardour/ardour/worker.h index 529d59a4a6..c83f006f72 100644 --- a/libs/ardour/ardour/worker.h +++ b/libs/ardour/ardour/worker.h @@ -92,7 +92,7 @@ private: RingBuffer<uint8_t>* _requests; RingBuffer<uint8_t>* _responses; uint8_t* _response; - PBD::ProcessSemaphore _sem; + PBD::Semaphore _sem; bool _exit; Glib::Threads::Thread* _thread; diff --git a/libs/pbd/pbd/semutils.h b/libs/pbd/pbd/semutils.h index 50ac41919c..6c661ab499 100644 --- a/libs/pbd/pbd/semutils.h +++ b/libs/pbd/pbd/semutils.h @@ -34,7 +34,7 @@ namespace PBD { -class LIBPBD_API ProcessSemaphore { +class LIBPBD_API Semaphore { private: #ifdef WINDOWS_SEMAPHORE HANDLE _sem; @@ -48,8 +48,8 @@ class LIBPBD_API ProcessSemaphore { #endif public: - ProcessSemaphore (const char* name, int val); - ~ProcessSemaphore (); + Semaphore (const char* name, int val); + ~Semaphore (); #ifdef WINDOWS_SEMAPHORE diff --git a/libs/pbd/semutils.cc b/libs/pbd/semutils.cc index bafa447f8f..7f31d30faf 100644 --- a/libs/pbd/semutils.cc +++ b/libs/pbd/semutils.cc @@ -21,7 +21,7 @@ using namespace PBD; -ProcessSemaphore::ProcessSemaphore (const char* name, int val) +Semaphore::Semaphore (const char* name, int val) { #ifdef WINDOWS_SEMAPHORE if ((_sem = CreateSemaphore(NULL, val, 32767, name)) == NULL) { @@ -48,7 +48,7 @@ ProcessSemaphore::ProcessSemaphore (const char* name, int val) #endif } -ProcessSemaphore::~ProcessSemaphore () +Semaphore::~Semaphore () { #ifdef WINDOWS_SEMAPHORE CloseHandle(_sem); @@ -60,14 +60,14 @@ ProcessSemaphore::~ProcessSemaphore () #ifdef WINDOWS_SEMAPHORE int -ProcessSemaphore::signal () +Semaphore::signal () { // non-zero on success, opposite to posix return !ReleaseSemaphore(_sem, 1, NULL); } int -ProcessSemaphore::wait () +Semaphore::wait () { DWORD result = 0; result = WaitForSingleObject(_sem, INFINITE); |