ardour/livetrax
13
0
Fork 0
Code

Replace boost atomics with std version

Browse Source
This commit is contained in:
Alejandro Domínguez 2024-08-19 07:39:50 +02:00 committed by Robin Gareus
parent 1ee044c5fc
commit 88e38b2699
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/step_sequencer.h
View File

@ -21,7 +21,6 @@
#include <vector>
#include <unistd.h>
#include <boost/atomic.hpp>
#include <boost/intrusive/list.hpp>
#include <glibmm/threads.h>

21
libs/ardour/ardour/transport_master.h
View File

@ -20,7 +20,6 @@
#include <vector>
#include <boost/atomic.hpp>
#include <boost/optional.hpp>
#include <glibmm/threads.h>
@ -81,11 +80,11 @@ struct LIBARDOUR_API SafeTime {
* complete and the values stored there are consistent.
*/
boost::atomic<int> guard1;
samplepos_t position;
samplepos_t timestamp;
double speed;
boost::atomic<int> guard2;
std::atomic<int> guard1;
samplepos_t position;
samplepos_t timestamp;
double speed;
std::atomic<int> guard2;
SafeTime ()
{
@ -107,11 +106,11 @@ struct LIBARDOUR_API SafeTime {
void update (samplepos_t p, samplepos_t t, double s)
{
guard1.fetch_add (1, boost::memory_order_acquire);
guard1.fetch_add (1, std::memory_order_acquire);
position = p;
timestamp = t;
speed = s;
guard2.fetch_add (1, boost::memory_order_acquire);
guard2.fetch_add (1, std::memory_order_acquire);
}
void safe_read (SafeTime& dst) const
@ -124,14 +123,14 @@ struct LIBARDOUR_API SafeTime {
Glib::usleep (20);
tries = 0;
}
dst.guard1.store (guard1.load (boost::memory_order_seq_cst), boost::memory_order_seq_cst);
dst.guard1.store (guard1.load (std::memory_order_seq_cst), std::memory_order_seq_cst);
dst.position = position;
dst.timestamp = timestamp;
dst.speed = speed;
dst.guard2.store (guard2.load (boost::memory_order_seq_cst), boost::memory_order_seq_cst);
dst.guard2.store (guard2.load (std::memory_order_seq_cst), std::memory_order_seq_cst);
tries++;
} while (dst.guard1.load (boost::memory_order_seq_cst) != dst.guard2.load (boost::memory_order_seq_cst));
} while (dst.guard1.load (std::memory_order_seq_cst) != dst.guard2.load (std::memory_order_seq_cst));
}
};