projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prefer std::make_shared().
[pulseview.git]
/
pv
/
session.cpp
diff --git
a/pv/session.cpp
b/pv/session.cpp
index df09ff3b2ebc0b924a9158158de9a2362ab385db..ef2f39bb8ed3ddb88ded541959042ad531a5096a 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-76,6
+76,7
@@
using std::pair;
using std::recursive_mutex;
using std::set;
using std::shared_ptr;
using std::recursive_mutex;
using std::set;
using std::shared_ptr;
+using std::make_shared;
using std::string;
using std::unordered_set;
using std::vector;
using std::string;
using std::unordered_set;
using std::vector;
@@
-307,7
+308,7
@@
void Session::restore_settings(QSettings &settings)
settings.endGroup();
if (QFileInfo(filename).isReadable()) {
settings.endGroup();
if (QFileInfo(filename).isReadable()) {
- device =
std::
make_shared<devices::SessionFile>(device_manager_.context(),
+ device = make_shared<devices::SessionFile>(device_manager_.context(),
filename.toStdString());
set_device(device);
filename.toStdString());
set_device(device);
@@
-383,7
+384,7
@@
void Session::set_device(shared_ptr<devices::Device> device)
device_.reset();
device_.reset();
- // Revert name back to default name (e.g. "
Untitled-
1") as the data is gone
+ // Revert name back to default name (e.g. "
Session
1") as the data is gone
name_ = default_name_;
name_changed();
name_ = default_name_;
name_changed();
@@
-415,16
+416,17
@@
void Session::set_device(shared_ptr<devices::Device> device)
device_->open();
} catch (const QString &e) {
device_.reset();
device_->open();
} catch (const QString &e) {
device_.reset();
- device_changed();
- throw;
}
}
- device_->session()->add_datafeed_callback([=]
- (shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
- data_feed_in(device, packet);
- });
+ if (device_) {
+ device_->session()->add_datafeed_callback([=]
+ (shared_ptr<sigrok::Device> device, shared_ptr<Packet> packet) {
+ data_feed_in(device, packet);
+ });
+
+ update_signals();
+ }
- update_signals();
device_changed();
}
device_changed();
}
@@
-532,7
+534,7
@@
void Session::start_capture(function<void (const QString)> error_handler)
for (const shared_ptr<data::SignalData> d : all_signal_data_)
d->clear();
for (const shared_ptr<data::SignalData> d : all_signal_data_)
d->clear();
- // Revert name back to default name (e.g. "
Untitled-
1") as the data is gone
+ // Revert name back to default name (e.g. "
Session
1") as the data is gone
name_ = default_name_;
name_changed();
name_ = default_name_;
name_changed();
@@
-616,8
+618,7
@@
bool Session::add_decoder(srd_decoder *const dec)
try {
// Create the decoder
try {
// Create the decoder
- decoder_stack = shared_ptr<data::DecoderStack>(
- new data::DecoderStack(*this, dec));
+ decoder_stack = make_shared<data::DecoderStack>(*this, dec);
// Make a list of all the channels
std::vector<const srd_channel*> all_channels;
// Make a list of all the channels
std::vector<const srd_channel*> all_channels;
@@
-643,7
+644,7
@@
bool Session::add_decoder(srd_decoder *const dec)
// Create the decode signal
shared_ptr<data::SignalBase> signalbase =
// Create the decode signal
shared_ptr<data::SignalBase> signalbase =
-
shared_ptr<data::SignalBase>(new data::SignalBase(nullptr)
);
+
make_shared<data::SignalBase>(nullptr
);
signalbase->set_decoder_stack(decoder_stack);
signalbases_.insert(signalbase);
signalbase->set_decoder_stack(decoder_stack);
signalbases_.insert(signalbase);
@@
-771,8
+772,7
@@
void Session::update_signals()
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
if (!signalbase) {
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
if (!signalbase) {
- signalbase = shared_ptr<data::SignalBase>(
- new data::SignalBase(channel));
+ signalbase = make_shared<data::SignalBase>(channel);
signalbases_.insert(signalbase);
all_signal_data_.insert(logic_data_);
signalbases_.insert(signalbase);
all_signal_data_.insert(logic_data_);
@@
-788,8
+788,7
@@
void Session::update_signals()
case SR_CHANNEL_ANALOG:
{
if (!signalbase) {
case SR_CHANNEL_ANALOG:
{
if (!signalbase) {
- signalbase = shared_ptr<data::SignalBase>(
- new data::SignalBase(channel));
+ signalbase = make_shared<data::SignalBase>(channel);
signalbases_.insert(signalbase);
shared_ptr<data::Analog> data(new data::Analog());
signalbases_.insert(signalbase);
shared_ptr<data::Analog> data(new data::Analog());
@@
-953,8
+952,8
@@
void Session::feed_in_logic(shared_ptr<Logic> logic)
set_capture_state(Running);
// Create a new data segment
set_capture_state(Running);
// Create a new data segment
- cur_logic_segment_ =
shared_ptr
<data::LogicSegment>(
-
new data::LogicSegment(logic, cur_samplerate_)
);
+ cur_logic_segment_ =
make_shared
<data::LogicSegment>(
+
*logic_data_, logic, cur_samplerate_
);
logic_data_->push_segment(cur_logic_segment_);
// @todo Putting this here means that only listeners querying
logic_data_->push_segment(cur_logic_segment_);
// @todo Putting this here means that only listeners querying
@@
-997,11
+996,6
@@
void Session::feed_in_analog(shared_ptr<Analog> analog)
// in the sweep containing this segment.
sweep_beginning = true;
// in the sweep containing this segment.
sweep_beginning = true;
- // Create a segment, keep it in the maps of channels
- segment = shared_ptr<data::AnalogSegment>(
- new data::AnalogSegment(cur_samplerate_));
- cur_analog_segments_[channel] = segment;
-
// Find the analog data associated with the channel
shared_ptr<data::SignalBase> base = signalbase_from_channel(channel);
assert(base);
// Find the analog data associated with the channel
shared_ptr<data::SignalBase> base = signalbase_from_channel(channel);
assert(base);
@@
-1009,6
+1003,11
@@
void Session::feed_in_analog(shared_ptr<Analog> analog)
shared_ptr<data::Analog> data(base->analog_data());
assert(data);
shared_ptr<data::Analog> data(base->analog_data());
assert(data);
+ // Create a segment, keep it in the maps of channels
+ segment = make_shared<data::AnalogSegment>(
+ *data, cur_samplerate_);
+ cur_analog_segments_[channel] = segment;
+
// Push the segment into the analog data.
data->push_segment(segment);
}
// Push the segment into the analog data.
data->push_segment(segment);
}