[beast: 66/95] BSE: use Bse::Mutex



commit ba4d1f9e8ca3c2bb360fb810aa178aceb8ad5567
Author: Tim Janik <timj gnu org>
Date:   Wed Mar 20 04:20:33 2013 +0100

    BSE: use Bse::Mutex

 bse/bsecore.cc   |   10 +++++-----
 bse/gslcommon.cc |   12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/bse/bsecore.cc b/bse/bsecore.cc
index 676d1e4..8c5948e 100644
--- a/bse/bsecore.cc
+++ b/bse/bsecore.cc
@@ -27,7 +27,7 @@ init_async (int *argc, char ***argv, const char *app_name, SfiInitValue values[]
 }
 
 // == TaskRegistry ==
-static Rapicorn::Mutex    task_registry_mutex_;
+static Bse::Mutex         task_registry_mutex_;
 static TaskRegistry::List task_registry_tasks_;
 
 void
@@ -36,14 +36,14 @@ TaskRegistry::add (const std::string &name, int pid, int tid)
   Rapicorn::TaskStatus task (pid, tid);
   task.name = name;
   task.update();
-  Bse::ScopedLock<Rapicorn::Mutex> locker (task_registry_mutex_);
+  Bse::ScopedLock<Bse::Mutex> locker (task_registry_mutex_);
   task_registry_tasks_.push_back (task);
 }
 
 bool
 TaskRegistry::remove (int tid)
 {
-  Bse::ScopedLock<Rapicorn::Mutex> locker (task_registry_mutex_);
+  Bse::ScopedLock<Bse::Mutex> locker (task_registry_mutex_);
   for (auto it = task_registry_tasks_.begin(); it != task_registry_tasks_.end(); it++)
     if (it->task_id == tid)
       {
@@ -56,7 +56,7 @@ TaskRegistry::remove (int tid)
 void
 TaskRegistry::update ()
 {
-  Bse::ScopedLock<Rapicorn::Mutex> locker (task_registry_mutex_);
+  Bse::ScopedLock<Bse::Mutex> locker (task_registry_mutex_);
   for (auto &task : task_registry_tasks_)
     task.update();
 }
@@ -64,7 +64,7 @@ TaskRegistry::update ()
 TaskRegistry::List
 TaskRegistry::list ()
 {
-  Bse::ScopedLock<Rapicorn::Mutex> locker (task_registry_mutex_);
+  Bse::ScopedLock<Bse::Mutex> locker (task_registry_mutex_);
   return task_registry_tasks_;
 }
 
diff --git a/bse/gslcommon.cc b/bse/gslcommon.cc
index 6a00cef..194f027 100644
--- a/bse/gslcommon.cc
+++ b/bse/gslcommon.cc
@@ -15,7 +15,7 @@
 namespace Bse {
 
 // == TickStamp ==
-static Rapicorn::Mutex          global_tick_stamp_mutex;
+static Bse::Mutex               global_tick_stamp_mutex;
 static uint64                  tick_stamp_system_time = 0;
 static uint64                   tick_stamp_leaps = 0;
 Rapicorn::Atomic<uint64>        TickStamp::global_tick_stamp = 0;       // initialized to 1 from gsl_init(), 
so 0 == invalid
@@ -31,7 +31,7 @@ TickStamp::_init_forgsl()
 void
 TickStamp::_set_leap (uint64 ticks)
 {
-  Bse::ScopedLock<Rapicorn::Mutex> locker (global_tick_stamp_mutex);
+  Bse::ScopedLock<Bse::Mutex> locker (global_tick_stamp_mutex);
   tick_stamp_leaps = ticks;
 }
 
@@ -44,7 +44,7 @@ TickStamp::_increment ()
   systime = sfi_time_system ();
   newstamp = global_tick_stamp + tick_stamp_leaps;
   {
-    Bse::ScopedLock<Rapicorn::Mutex> locker (global_tick_stamp_mutex);
+    Bse::ScopedLock<Bse::Mutex> locker (global_tick_stamp_mutex);
     global_tick_stamp = newstamp;
     tick_stamp_system_time = systime;
   }
@@ -84,7 +84,7 @@ TickStamp::Update
 TickStamp::get_last()
 {
   Update ustamp;
-  Bse::ScopedLock<Rapicorn::Mutex> locker (global_tick_stamp_mutex);
+  Bse::ScopedLock<Bse::Mutex> locker (global_tick_stamp_mutex);
   ustamp.tick_stamp = global_tick_stamp;
   ustamp.system_time = tick_stamp_system_time;
   return ustamp;
@@ -114,7 +114,7 @@ TickStamp::create_wakeup (const std::function<void()> &wakeup)
 void
 TickStamp::Wakeup::awake_after (uint64 stamp)
 {
-  Bse::ScopedLock<Rapicorn::Mutex> locker (global_tick_stamp_mutex);
+  Bse::ScopedLock<Bse::Mutex> locker (global_tick_stamp_mutex);
   if (!awake_stamp_ && stamp)
     {
       tick_stamp_wakeups.push_back (shared_from_this());
@@ -150,7 +150,7 @@ TickStamp::Wakeup::awake_before (uint64 stamp)
 void
 TickStamp::Wakeup::_emit_wakeups (uint64 wakeup_stamp)
 {
-  Bse::ScopedLock<Rapicorn::Mutex> locker (global_tick_stamp_mutex);
+  Bse::ScopedLock<Bse::Mutex> locker (global_tick_stamp_mutex);
   std::list<TickStampWakeupP> list, notifies;
   list.swap (tick_stamp_wakeups);
   for (auto it : list)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]