shared_ptr<Context> Context::create()
{
- return shared_ptr<Context>(new Context(), Context::Deleter());
+ return shared_ptr<Context>{new Context{}, default_delete<Context>{}};
}
Context::Context() :
shared_ptr<Session> Context::create_session()
{
- return shared_ptr<Session>(
- new Session(shared_from_this()), Session::Deleter());
+ return shared_ptr<Session>{new Session{shared_from_this()},
+ default_delete<Session>{}};
}
shared_ptr<UserDevice> Context::create_user_device(
string vendor, string model, string version)
{
- return shared_ptr<UserDevice>(
- new UserDevice(vendor, model, version), UserDevice::Deleter());
+ return shared_ptr<UserDevice>{
+ new UserDevice{move(vendor), move(model), move(version)},
+ default_delete<UserDevice>{}};
}
shared_ptr<Packet> Context::create_header_packet(Glib::TimeVal start_time)
auto packet = g_new(struct sr_datafeed_packet, 1);
packet->type = SR_DF_HEADER;
packet->payload = header;
- return shared_ptr<Packet>(new Packet(nullptr, packet), Packet::Deleter());
+ return shared_ptr<Packet>{new Packet{nullptr, packet},
+ default_delete<Packet>{}};
}
shared_ptr<Packet> Context::create_meta_packet(
- const map<const ConfigKey *, Glib::VariantBase> &config)
+ map<const ConfigKey *, Glib::VariantBase> config)
{
auto meta = g_new0(struct sr_datafeed_meta, 1);
for (const auto &input : config)
auto packet = g_new(struct sr_datafeed_packet, 1);
packet->type = SR_DF_META;
packet->payload = meta;
- return shared_ptr<Packet>(new Packet(nullptr, packet), Packet::Deleter());
+ return shared_ptr<Packet>{new Packet{nullptr, packet},
+ default_delete<Packet>{}};
}
shared_ptr<Packet> Context::create_logic_packet(
auto packet = g_new(struct sr_datafeed_packet, 1);
packet->type = SR_DF_LOGIC;
packet->payload = logic;
- return shared_ptr<Packet>(new Packet(nullptr, packet), Packet::Deleter());
+ return shared_ptr<Packet>{new Packet{nullptr, packet}, default_delete<Packet>{}};
}
shared_ptr<Packet> Context::create_analog_packet(
- const vector<shared_ptr<Channel> > &channels,
+ vector<shared_ptr<Channel> > channels,
float *data_pointer, unsigned int num_samples, const Quantity *mq,
- const Unit *unit, const vector<const QuantityFlag *> &mqflags)
+ const Unit *unit, vector<const QuantityFlag *> mqflags)
{
auto analog = g_new0(struct sr_datafeed_analog, 1);
auto meaning = g_new0(struct sr_analog_meaning, 1);
analog->num_samples = num_samples;
meaning->mq = static_cast<sr_mq>(mq->id());
meaning->unit = static_cast<sr_unit>(unit->id());
- meaning->mqflags = static_cast<sr_mqflag>(QuantityFlag::mask_from_flags(mqflags));
+ meaning->mqflags = static_cast<sr_mqflag>(QuantityFlag::mask_from_flags(move(mqflags)));
analog->data = data_pointer;
auto packet = g_new(struct sr_datafeed_packet, 1);
packet->type = SR_DF_ANALOG;
packet->payload = analog;
- return shared_ptr<Packet>(new Packet(nullptr, packet), Packet::Deleter());
+ return shared_ptr<Packet>{new Packet{nullptr, packet}, default_delete<Packet>{}};
}
shared_ptr<Session> Context::load_session(string filename)
{
- return shared_ptr<Session>(
- new Session(shared_from_this(), move(filename)), Session::Deleter());
+ return shared_ptr<Session>{
+ new Session{shared_from_this(), move(filename)},
+ default_delete<Session>{}};
}
shared_ptr<Trigger> Context::create_trigger(string name)
{
- return shared_ptr<Trigger>(
- new Trigger(shared_from_this(), move(name)), Trigger::Deleter());
+ return shared_ptr<Trigger>{
+ new Trigger{shared_from_this(), move(name)},
+ default_delete<Trigger>{}};
}
shared_ptr<Input> Context::open_file(string filename)
const struct sr_input *input;
check(sr_input_scan_file(filename.c_str(), &input));
- return shared_ptr<Input>(
- new Input(shared_from_this(), input), Input::Deleter());
+ return shared_ptr<Input>{
+ new Input{shared_from_this(), input},
+ default_delete<Input>{}};
}
shared_ptr<Input> Context::open_stream(string header)
auto ret = sr_input_scan_buffer(gstr, &input);
g_string_free(gstr, true);
check(ret);
- return shared_ptr<Input>(
- new Input(shared_from_this(), input), Input::Deleter());
+ return shared_ptr<Input>{
+ new Input{shared_from_this(), input},
+ default_delete<Input>{}};
}
map<string, string> Context::serials(shared_ptr<Driver> driver) const
}
vector<shared_ptr<HardwareDevice>> Driver::scan(
- const map<const ConfigKey *, Glib::VariantBase> &options)
+ map<const ConfigKey *, Glib::VariantBase> options)
{
/* Initialise the driver if not yet done. */
if (!_initialized)
for (GSList *device = device_list; device; device = device->next)
{
auto *const sdi = static_cast<struct sr_dev_inst *>(device->data);
- result.push_back(shared_ptr<HardwareDevice>(
- new HardwareDevice(shared_from_this(), sdi),
- HardwareDevice::Deleter()));
+ shared_ptr<HardwareDevice> hwdev {
+ new HardwareDevice{shared_from_this(), sdi},
+ default_delete<HardwareDevice>{}};
+ result.push_back(move(hwdev));
}
/* Free GSList returned from scan. */
const struct sr_datafeed_packet *pkt)
{
auto device = _session->get_device(sdi);
- auto packet = shared_ptr<Packet>(new Packet(device, pkt), Packet::Deleter());
+ shared_ptr<Packet> packet {new Packet{device, pkt}, default_delete<Packet>{}};
_callback(move(device), move(packet));
}
map<string, shared_ptr<Option>> InputFormat::options()
{
- const struct sr_option **options = sr_input_options_get(_structure);
map<string, shared_ptr<Option>> result;
- if (options)
+
+ if (const struct sr_option **options = sr_input_options_get(_structure))
{
- auto option_array = shared_ptr<const struct sr_option *>(
- options, sr_input_options_free);
- for (int i = 0; options[i]; i++)
- result[options[i]->id] = shared_ptr<Option>(
- new Option(options[i], option_array), Option::Deleter());
+ shared_ptr<const struct sr_option *> option_array
+ {options, &sr_input_options_free};
+ for (int i = 0; options[i]; i++) {
+ shared_ptr<Option> opt {
+ new Option{options[i], option_array},
+ default_delete<Option>{}};
+ result.emplace(opt->id(), move(opt));
+ }
}
return result;
}
shared_ptr<Input> InputFormat::create_input(
- const map<string, Glib::VariantBase> &options)
+ map<string, Glib::VariantBase> options)
{
auto input = sr_input_new(_structure, map_to_hash_variant(options));
if (!input)
throw Error(SR_ERR_ARG);
- return shared_ptr<Input>(new Input(_parent, input), Input::Deleter());
+ return shared_ptr<Input>{new Input{_parent, input}, default_delete<Input>{}};
}
Input::Input(shared_ptr<Context> context, const struct sr_input *structure) :
map<string, shared_ptr<Option>> OutputFormat::options()
{
- const struct sr_option **options = sr_output_options_get(_structure);
map<string, shared_ptr<Option>> result;
- if (options)
+
+ if (const struct sr_option **options = sr_output_options_get(_structure))
{
- auto option_array = shared_ptr<const struct sr_option *>(
- options, sr_output_options_free);
- for (int i = 0; options[i]; i++)
- result[options[i]->id] = shared_ptr<Option>(
- new Option(options[i], option_array), Option::Deleter());
+ shared_ptr<const struct sr_option *> option_array
+ {options, &sr_output_options_free};
+ for (int i = 0; options[i]; i++) {
+ shared_ptr<Option> opt {
+ new Option{options[i], option_array},
+ default_delete<Option>{}};
+ result.emplace(opt->id(), move(opt));
+ }
}
return result;
}
shared_ptr<Output> OutputFormat::create_output(
- shared_ptr<Device> device, const map<string, Glib::VariantBase> &options)
+ shared_ptr<Device> device, map<string, Glib::VariantBase> options)
{
- return shared_ptr<Output>(
- new Output(shared_from_this(), move(device), options),
- Output::Deleter());
+ return shared_ptr<Output>{
+ new Output{shared_from_this(), move(device), move(options)},
+ default_delete<Output>{}};
}
shared_ptr<Output> OutputFormat::create_output(string filename,
- shared_ptr<Device> device, const map<string, Glib::VariantBase> &options)
+ shared_ptr<Device> device, map<string, Glib::VariantBase> options)
{
- return shared_ptr<Output>(
- new Output(move(filename), shared_from_this(), move(device), options),
- Output::Deleter());
+ return shared_ptr<Output>{
+ new Output{move(filename), shared_from_this(), move(device), move(options)},
+ default_delete<Output>{}};
}
bool OutputFormat::test_flag(const OutputFlag *flag) const
}
Output::Output(shared_ptr<OutputFormat> format,
- shared_ptr<Device> device, const map<string, Glib::VariantBase> &options) :
+ shared_ptr<Device> device, map<string, Glib::VariantBase> options) :
_structure(sr_output_new(format->_structure,
map_to_hash_variant(options), device->_structure, nullptr)),
_format(move(format)),
_device(move(device)),
- _options(options)
+ _options(move(options))
{
}
Output::Output(string filename, shared_ptr<OutputFormat> format,
- shared_ptr<Device> device, const map<string, Glib::VariantBase> &options) :
+ shared_ptr<Device> device, map<string, Glib::VariantBase> options) :
_structure(sr_output_new(format->_structure,
map_to_hash_variant(options), device->_structure, filename.c_str())),
_format(move(format)),
_device(move(device)),
- _options(options)
+ _options(move(options))
{
}