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
|
Description: Fix FTBFS with gcc-15
Author: Chris Cannam
Origin: upstream
Bug: https://github.com/sonic-visualiser/sonic-visualiser/issues/112
Applied-Upstream: https://github.com/sonic-visualiser/svcore/commit/2dee776aad88060d41086c4fb0191ecb0bded86c
Last-Update: 2025-11-03
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- sonic-visualiser.orig/svcore/data/model/NoteModel.h
+++ sonic-visualiser/svcore/data/model/NoteModel.h
@@ -403,8 +403,8 @@
.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));
--- sonic-visualiser.orig/svcore/data/model/RegionModel.h
+++ sonic-visualiser/svcore/data/model/RegionModel.h
@@ -335,8 +335,8 @@
.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));
--- sonic-visualiser.orig/svcore/data/model/SparseTimeValueModel.h
+++ sonic-visualiser/svcore/data/model/SparseTimeValueModel.h
@@ -342,8 +342,8 @@
.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));
--- sonic-visualiser.orig/svcore/data/model/EditableDenseThreeDimensionalModel.cpp
+++ sonic-visualiser/svcore/data/model/EditableDenseThreeDimensionalModel.cpp
@@ -458,10 +458,10 @@
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));
|
