1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
From 2dee776aad88060d41086c4fb0191ecb0bded86c Mon Sep 17 00:00:00 2001
From: Chris Cannam <cannam@all-day-breakfast.com>
Date: Mon, 14 Apr 2025 16:21:05 +0100
Subject: [PATCH] Fix incompatibility between atomic and qt with just-updated
compiler and libraries
---
data/model/EditableDenseThreeDimensionalModel.cpp | 8 ++++----
data/model/NoteModel.h | 4 ++--
data/model/RegionModel.h | 4 ++--
data/model/SparseTimeValueModel.h | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/svcore/data/model/EditableDenseThreeDimensionalModel.cpp b/svcore/data/model/EditableDenseThreeDimensionalModel.cpp
index da5ff904..7a621631 100644
--- a/svcore/data/model/EditableDenseThreeDimensionalModel.cpp
+++ b/svcore/data/model/EditableDenseThreeDimensionalModel.cpp
@@ -458,10 +458,10 @@ EditableDenseThreeDimensionalModel::toXml(QTextStream &out,
Model::toXml
(out, indent,
QString("type=\"dense\" dimensions=\"3\" windowSize=\"%1\" yBinCount=\"%2\" minimum=\"%3\" maximum=\"%4\" dataset=\"%5\" startFrame=\"%6\" %7")
- .arg(m_resolution)
- .arg(m_yBinCount)
- .arg(m_minimum)
- .arg(m_maximum)
+ .arg(m_resolution.load())
+ .arg(m_yBinCount.load())
+ .arg(m_minimum.load())
+ .arg(m_maximum.load())
.arg(getExportId())
.arg(m_startFrame)
.arg(extraAttributes));
diff --git a/svcore/data/model/NoteModel.h b/svcore/data/model/NoteModel.h
index 8c3a421e..28e145c2 100644
--- a/svcore/data/model/NoteModel.h
+++ b/svcore/data/model/NoteModel.h
@@ -403,8 +403,8 @@ class NoteModel : public Model,
.arg(m_events.getExportId())
.arg(m_subtype == FLEXI_NOTE ? "flexinote" : "note")
.arg(m_valueQuantization)
- .arg(m_valueMinimum)
- .arg(m_valueMaximum)
+ .arg(m_valueMinimum.load())
+ .arg(m_valueMaximum.load())
.arg(encodeEntities(m_units))
.arg(extraAttributes));
diff --git a/svcore/data/model/RegionModel.h b/svcore/data/model/RegionModel.h
index 916a0477..db021ae7 100644
--- a/svcore/data/model/RegionModel.h
+++ b/svcore/data/model/RegionModel.h
@@ -335,8 +335,8 @@ class RegionModel : public Model,
.arg(m_events.getExportId())
.arg("region")
.arg(m_valueQuantization)
- .arg(m_valueMinimum)
- .arg(m_valueMaximum)
+ .arg(m_valueMinimum.load())
+ .arg(m_valueMaximum.load())
.arg(encodeEntities(m_units))
.arg(extraAttributes));
diff --git a/svcore/data/model/SparseTimeValueModel.h b/svcore/data/model/SparseTimeValueModel.h
index fe6e70cc..70335038 100644
--- a/svcore/data/model/SparseTimeValueModel.h
+++ b/svcore/data/model/SparseTimeValueModel.h
@@ -342,8 +342,8 @@ class SparseTimeValueModel : public Model,
.arg("true") // always true after model reaches 100% -
// subsequent events are always notified
.arg(m_events.getExportId())
- .arg(m_valueMinimum)
- .arg(m_valueMaximum)
+ .arg(m_valueMinimum.load())
+ .arg(m_valueMaximum.load())
.arg(encodeEntities(m_units))
.arg(extraAttributes));
|
