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
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
From 895b2ccca3f7e56deba8a30a1160018c7ed915e0 Mon Sep 17 00:00:00 2001
From: Mike Walters <mike@flomp.net>
Date: Mon, 22 Feb 2021 21:44:53 +0000
Subject: [PATCH 10/31] use make_unique instead of new
---
inputsource.cpp | 38 +++++++++++++++++++-------------------
samplebuffer.cpp | 4 ++--
tunertransform.cpp | 2 +-
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/inputsource.cpp b/inputsource.cpp
index 59abe38..50a617c 100644
--- a/inputsource.cpp
+++ b/inputsource.cpp
@@ -211,24 +211,24 @@ void InputSource::readMetaData(const QString &filename)
auto global_core = metaData.global.access<core::GlobalT>();
if(global_core.datatype.compare("cf32_le") == 0) {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new ComplexF32SampleAdapter());
+ sampleAdapter = std::make_unique<ComplexF32SampleAdapter>();
} else if(global_core.datatype.compare("ci16_le") == 0) {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new ComplexS16SampleAdapter());
+ sampleAdapter = std::make_unique<ComplexS16SampleAdapter>();
} else if(global_core.datatype.compare("ci8") == 0) {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new ComplexS8SampleAdapter());
+ sampleAdapter = std::make_unique<ComplexS8SampleAdapter>();
} else if(global_core.datatype.compare("cu8") == 0) {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new ComplexU8SampleAdapter());
+ sampleAdapter = std::make_unique<ComplexU8SampleAdapter>();
} else if(global_core.datatype.compare("rf32_le") == 0) {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new RealF32SampleAdapter());
+ sampleAdapter = std::make_unique<RealF32SampleAdapter>();
_realSignal = true;
} else if(global_core.datatype.compare("ri16_le") == 0) {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new RealS16SampleAdapter());
+ sampleAdapter = std::make_unique<RealS16SampleAdapter>();
_realSignal = true;
} else if(global_core.datatype.compare("ri8") == 0) {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new RealS8SampleAdapter());
+ sampleAdapter = std::make_unique<RealS8SampleAdapter>();
_realSignal = true;
} else if(global_core.datatype.compare("ru8") == 0) {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new RealU8SampleAdapter());
+ sampleAdapter = std::make_unique<RealU8SampleAdapter>();
_realSignal = true;
} else {
throw std::runtime_error("SigMF meta data specifies unsupported datatype");
@@ -261,35 +261,35 @@ void InputSource::openFile(const char *filename)
std::string suffix = std::string(fileInfo.suffix().toLower().toUtf8().constData());
if(_fmt!=""){ suffix = _fmt; } // allow fmt override
if ((suffix == "cfile") || (suffix == "cf32") || (suffix == "fc32")) {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new ComplexF32SampleAdapter());
+ sampleAdapter = std::make_unique<ComplexF32SampleAdapter>();
}
else if ((suffix == "cs16") || (suffix == "sc16") || (suffix == "c16")) {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new ComplexS16SampleAdapter());
+ sampleAdapter = std::make_unique<ComplexS16SampleAdapter>();
}
else if ((suffix == "cs8") || (suffix == "sc8") || (suffix == "c8")) {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new ComplexS8SampleAdapter());
+ sampleAdapter = std::make_unique<ComplexS8SampleAdapter>();
}
else if ((suffix == "cu8") || (suffix == "uc8")) {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new ComplexU8SampleAdapter());
+ sampleAdapter = std::make_unique<ComplexU8SampleAdapter>();
}
else if (suffix == "f32") {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new RealF32SampleAdapter());
+ sampleAdapter = std::make_unique<RealF32SampleAdapter>();
_realSignal = true;
}
else if (suffix == "s16") {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new RealS16SampleAdapter());
+ sampleAdapter = std::make_unique<RealS16SampleAdapter>();
_realSignal = true;
}
else if (suffix == "s8") {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new RealS8SampleAdapter());
+ sampleAdapter = std::make_unique<RealS8SampleAdapter>();
_realSignal = true;
}
else if (suffix == "u8") {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new RealU8SampleAdapter());
+ sampleAdapter = std::make_unique<RealU8SampleAdapter>();
_realSignal = true;
}
else {
- sampleAdapter = std::unique_ptr<SampleAdapter>(new ComplexF32SampleAdapter());
+ sampleAdapter = std::make_unique<ComplexF32SampleAdapter>();
}
QString dataFilename;
@@ -319,7 +319,7 @@ void InputSource::openFile(const char *filename)
dataFilename = filename;
}
- std::unique_ptr<QFile> file(new QFile(dataFilename));
+ auto file = std::make_unique<QFile>(dataFilename);
if (!file->open(QFile::ReadOnly)) {
throw std::runtime_error(file->errorString().toStdString());
}
@@ -364,7 +364,7 @@ std::unique_ptr<std::complex<float>[]> InputSource::getSamples(size_t start, siz
if (start + length > sampleCount)
return nullptr;
- std::unique_ptr<std::complex<float>[]> dest(new std::complex<float>[length]);
+ auto dest = std::make_unique<std::complex<float>[]>(length);
sampleAdapter->copyRange(mmapData, start, length, dest.get());
return dest;
diff --git a/samplebuffer.cpp b/samplebuffer.cpp
index f008a3c..4fb0e09 100644
--- a/samplebuffer.cpp
+++ b/samplebuffer.cpp
@@ -42,8 +42,8 @@ std::unique_ptr<Tout[]> SampleBuffer<Tin, Tout>::getSamples(size_t start, size_t
if (samples == nullptr)
return nullptr;
- std::unique_ptr<Tout[]> temp(new Tout[history + length]);
- std::unique_ptr<Tout[]> dest(new Tout[length]);
+ auto temp = std::make_unique<Tout[]>(history + length);
+ auto dest = std::make_unique<Tout[]>(length);
QMutexLocker ml(&mutex);
work(samples.get(), temp.get(), history + length, start);
memcpy(dest.get(), temp.get() + history, length * sizeof(Tout));
diff --git a/tunertransform.cpp b/tunertransform.cpp
index 11fed07..fc89a36 100644
--- a/tunertransform.cpp
+++ b/tunertransform.cpp
@@ -29,7 +29,7 @@ TunerTransform::TunerTransform(std::shared_ptr<SampleSource<std::complex<float>>
void TunerTransform::work(void *input, void *output, int count, size_t sampleid)
{
auto out = static_cast<std::complex<float>*>(output);
- std::unique_ptr<std::complex<float>[]> temp(new std::complex<float>[count]);
+ auto temp = std::make_unique<std::complex<float>[]>(count);
// Mix down
nco_crcf mix = nco_crcf_create(LIQUID_NCO);
--
2.35.1
|
