X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=dcbf80217f1b3307b92ffa7c9669b077aeba5cf7;hb=541c855e1d05a007e996f52639698a7d3881c957;hp=986b2c1e1da3fe60daa96ffbb0b15f9d71434f6d;hpb=ca3291e3ee7415c4c4505164ec931b91ea15cefe;p=libsigrok.git

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 986b2c1e..dcbf8021 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -44,8 +44,7 @@ static const char *valid_string(const char *input)
 static GHashTable *map_to_hash_variant(map<string, Glib::VariantBase> input)
 {
 	auto output = g_hash_table_new_full(
-		g_variant_hash, g_variant_equal, g_free,
-		(void (*)(void *))g_variant_unref);
+		g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref);
 	for (auto entry : input)
 		g_hash_table_insert(output,
 			g_strdup(entry.first.c_str()),
@@ -109,8 +108,7 @@ map<string, shared_ptr<Driver>> Context::get_drivers()
 	{
 		auto name = entry.first;
 		auto driver = entry.second;
-		result[name] = static_pointer_cast<Driver>(
-			driver->get_shared_pointer(this));
+		result[name] = driver->get_shared_pointer(this);
 	}
 	return result;
 }
@@ -122,8 +120,7 @@ map<string, shared_ptr<InputFormat>> Context::get_input_formats()
 	{
 		auto name = entry.first;
 		auto input_format = entry.second;
-		result[name] = static_pointer_cast<InputFormat>(
-			input_format->get_shared_pointer(this));
+		result[name] = input_format->get_shared_pointer(this);
 	}
 	return result;
 }
@@ -135,8 +132,7 @@ map<string, shared_ptr<OutputFormat>> Context::get_output_formats()
 	{
 		auto name = entry.first;
 		auto output_format = entry.second;
-		result[name] = static_pointer_cast<OutputFormat>(
-			output_format->get_shared_pointer(this));
+		result[name] = output_format->get_shared_pointer(this);
 	}
 	return result;
 }
@@ -229,26 +225,27 @@ shared_ptr<Trigger> Context::create_trigger(string name)
 
 shared_ptr<Input> Context::open_file(string filename)
 {
-	auto input = sr_input_scan_file(filename.c_str());
-	if (!input)
-		throw Error(SR_ERR_NA);
+	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());
 }
 
 shared_ptr<Input> Context::open_stream(string header)
 {
+	const struct sr_input *input;
+
 	auto gstr = g_string_new(header.c_str());
-	auto input = sr_input_scan_buffer(gstr);
-	g_string_free(gstr, false);
-	if (!input)
-		throw Error(SR_ERR_NA);
+	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());
 }
 
 Driver::Driver(struct sr_dev_driver *structure) :
-	StructureWrapper<Context, struct sr_dev_driver>(structure),
+	ParentOwned(structure),
 	initialized(false)
 {
 }
@@ -315,8 +312,7 @@ vector<shared_ptr<HardwareDevice>> Driver::scan(
 	/* Create list of shared pointers to device instances for return. */
 	vector<shared_ptr<HardwareDevice>> result;
 	for (auto device : devices)
-		result.push_back(static_pointer_cast<HardwareDevice>(
-			device->get_shared_pointer(parent)));
+		result.push_back(device->get_shared_pointer(parent));
 	return result;
 }
 
@@ -361,7 +357,7 @@ Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key)
 
 Device::Device(struct sr_dev_inst *structure) :
 	Configurable(structure->driver, structure, NULL),
-	StructureWrapper<Context, struct sr_dev_inst>(structure)
+	structure(structure)
 {
 	for (GSList *entry = structure->channels; entry; entry = entry->next)
 	{
@@ -417,15 +413,13 @@ vector<shared_ptr<Channel>> Device::get_channels()
 {
 	vector<shared_ptr<Channel>> result;
 	for (auto entry : channels)
-		result.push_back(static_pointer_cast<Channel>(
-			entry.second->get_shared_pointer(this)));
+		result.push_back(entry.second->get_shared_pointer(get_shared_from_this()));
 	return result;
 }
 
 shared_ptr<Channel> Device::get_channel(struct sr_channel *ptr)
 {
-	return static_pointer_cast<Channel>(
-		channels[ptr]->get_shared_pointer(this));
+	return channels[ptr]->get_shared_pointer(get_shared_from_this());
 }
 
 map<string, shared_ptr<ChannelGroup>>
@@ -436,8 +430,7 @@ Device::get_channel_groups()
 	{
 		auto name = entry.first;
 		auto channel_group = entry.second;
-		result[name] = static_pointer_cast<ChannelGroup>(
-			channel_group->get_shared_pointer(this));
+		result[name] = channel_group->get_shared_pointer(get_shared_from_this());
 	}
 	return result;
 }
@@ -453,6 +446,7 @@ void Device::close()
 }
 
 HardwareDevice::HardwareDevice(Driver *driver, struct sr_dev_inst *structure) :
+	ParentOwned(structure),
 	Device(structure),
 	driver(driver)
 {
@@ -462,13 +456,18 @@ HardwareDevice::~HardwareDevice()
 {
 }
 
+shared_ptr<Device> HardwareDevice::get_shared_from_this()
+{
+	return static_pointer_cast<Device>(shared_from_this());
+}
+
 shared_ptr<Driver> HardwareDevice::get_driver()
 {
-	return static_pointer_cast<Driver>(driver->get_shared_pointer(parent));
+	return driver->get_shared_pointer(parent);
 }
 
 Channel::Channel(struct sr_channel *structure) :
-	StructureWrapper<Device, struct sr_channel>(structure),
+	ParentOwned(structure),
 	type(ChannelType::get(structure->type))
 {
 }
@@ -509,7 +508,7 @@ unsigned int Channel::get_index()
 
 ChannelGroup::ChannelGroup(Device *device,
 		struct sr_channel_group *structure) :
-	StructureWrapper<Device, struct sr_channel_group>(structure),
+	ParentOwned(structure),
 	Configurable(device->structure->driver, device->structure, structure)
 {
 	for (GSList *entry = structure->channels; entry; entry = entry->next)
@@ -529,8 +528,7 @@ vector<shared_ptr<Channel>> ChannelGroup::get_channels()
 {
 	vector<shared_ptr<Channel>> result;
 	for (auto channel : channels)
-		result.push_back(static_pointer_cast<Channel>(
-			channel->get_shared_pointer(parent)));
+		result.push_back(channel->get_shared_pointer(parent));
 	return result;
 }
 
@@ -558,8 +556,7 @@ vector<shared_ptr<TriggerStage>> Trigger::get_stages()
 {
 	vector<shared_ptr<TriggerStage>> result;
 	for (auto stage : stages)
-		result.push_back(static_pointer_cast<TriggerStage>(
-			stage->get_shared_pointer(this)));
+		result.push_back(stage->get_shared_pointer(this));
 	return result;
 }
 
@@ -567,12 +564,11 @@ shared_ptr<TriggerStage> Trigger::add_stage()
 {
 	auto stage = new TriggerStage(sr_trigger_stage_add(structure));
 	stages.push_back(stage);
-	return static_pointer_cast<TriggerStage>(
-		stage->get_shared_pointer(this));
+	return stage->get_shared_pointer(this);
 }
 
 TriggerStage::TriggerStage(struct sr_trigger_stage *structure) : 
-	StructureWrapper<Trigger, struct sr_trigger_stage>(structure)
+	ParentOwned(structure)
 {
 }
 
@@ -591,8 +587,7 @@ vector<shared_ptr<TriggerMatch>> TriggerStage::get_matches()
 {
 	vector<shared_ptr<TriggerMatch>> result;
 	for (auto match : matches)
-		result.push_back(static_pointer_cast<TriggerMatch>(
-			match->get_shared_pointer(this)));
+		result.push_back(match->get_shared_pointer(this));
 	return result;
 }
 
@@ -609,7 +604,7 @@ void TriggerStage::add_match(shared_ptr<Channel> channel, const TriggerMatchType
 }
 
 TriggerMatch::TriggerMatch(struct sr_trigger_match *structure, shared_ptr<Channel> channel) :
-	StructureWrapper<TriggerStage, struct sr_trigger_match>(structure), channel(channel)
+	ParentOwned(structure), channel(channel)
 {
 }
 
@@ -733,9 +728,6 @@ vector<shared_ptr<Device>> Session::get_devices()
 	for (GSList *dev = dev_list; dev; dev = dev->next)
 	{
 		auto sdi = (struct sr_dev_inst *) dev->data;
-		if (devices.count(sdi) == 0)
-			devices[sdi] = shared_ptr<Device>(
-				new Device(sdi), Device::Deleter());
 		result.push_back(devices[sdi]);
 	}
 	return result;
@@ -969,6 +961,9 @@ Packet::Packet(shared_ptr<Device> device,
 				static_cast<const struct sr_datafeed_analog *>(
 					structure->payload));
 			break;
+		default:
+			payload = nullptr;
+			break;
 	}
 }
 
@@ -985,7 +980,10 @@ const PacketType *Packet::get_type()
 
 shared_ptr<PacketPayload> Packet::get_payload()
 {
-	return payload->get_shared_pointer(this);
+	if (payload)
+		return payload->get_shared_pointer(this);
+	else
+		throw Error(SR_ERR_NA);
 }
 
 PacketPayload::PacketPayload()
@@ -997,8 +995,8 @@ PacketPayload::~PacketPayload()
 }
 
 Header::Header(const struct sr_datafeed_header *structure) :
-	PacketPayload(),
-	StructureWrapper<Packet, const struct sr_datafeed_header>(structure)
+	ParentOwned(structure),
+	PacketPayload()
 {
 }
 
@@ -1006,6 +1004,11 @@ Header::~Header()
 {
 }
 
+shared_ptr<PacketPayload> Header::get_shared_pointer(Packet *parent)
+{
+	return static_pointer_cast<PacketPayload>(get_shared_pointer(parent));
+}
+
 int Header::get_feed_version()
 {
 	return structure->feed_version;
@@ -1019,8 +1022,8 @@ Glib::TimeVal Header::get_start_time()
 }
 
 Meta::Meta(const struct sr_datafeed_meta *structure) :
-	PacketPayload(),
-	StructureWrapper<Packet, const struct sr_datafeed_meta>(structure)
+	ParentOwned(structure),
+	PacketPayload()
 {
 }
 
@@ -1028,6 +1031,11 @@ Meta::~Meta()
 {
 }
 
+shared_ptr<PacketPayload> Meta::get_shared_pointer(Packet *parent)
+{
+	return static_pointer_cast<PacketPayload>(get_shared_pointer(parent));
+}
+
 map<const ConfigKey *, Glib::VariantBase> Meta::get_config()
 {
 	map<const ConfigKey *, Glib::VariantBase> result;
@@ -1040,8 +1048,8 @@ map<const ConfigKey *, Glib::VariantBase> Meta::get_config()
 }
 
 Logic::Logic(const struct sr_datafeed_logic *structure) :
-	PacketPayload(),
-	StructureWrapper<Packet, const struct sr_datafeed_logic>(structure)
+	ParentOwned(structure),
+	PacketPayload()
 {
 }
 
@@ -1049,6 +1057,11 @@ Logic::~Logic()
 {
 }
 
+shared_ptr<PacketPayload> Logic::get_shared_pointer(Packet *parent)
+{
+	return static_pointer_cast<PacketPayload>(get_shared_pointer(parent));
+}
+
 void *Logic::get_data_pointer()
 {
 	return structure->data;
@@ -1065,8 +1078,8 @@ unsigned int Logic::get_unit_size()
 }
 
 Analog::Analog(const struct sr_datafeed_analog *structure) :
-	PacketPayload(),
-	StructureWrapper<Packet, const struct sr_datafeed_analog>(structure)
+	ParentOwned(structure),
+	PacketPayload()
 {
 }
 
@@ -1074,6 +1087,11 @@ Analog::~Analog()
 {
 }
 
+shared_ptr<PacketPayload> Analog::get_shared_pointer(Packet *parent)
+{
+	return static_pointer_cast<PacketPayload>(get_shared_pointer(parent));
+}
+
 float *Analog::get_data_pointer()
 {
 	return structure->data;
@@ -1109,7 +1127,7 @@ vector<const QuantityFlag *> Analog::get_mq_flags()
 }
 
 InputFormat::InputFormat(const struct sr_input_module *structure) :
-	StructureWrapper<Context, const struct sr_input_module>(structure)
+	ParentOwned(structure)
 {
 }
 
@@ -1127,6 +1145,18 @@ string InputFormat::get_description()
 	return valid_string(sr_input_description_get(structure));
 }
 
+map<string, shared_ptr<Option>> InputFormat::get_options()
+{
+	const struct sr_option **options = sr_input_options_get(structure);
+	auto option_array = shared_ptr<const struct sr_option *>(
+		options, sr_input_options_free);
+	map<string, shared_ptr<Option>> result;
+	for (int i = 0; options[i]; i++)
+		result[options[i]->id] = shared_ptr<Option>(
+			new Option(options[i], option_array), Option::Deleter());
+	return result;
+}
+
 shared_ptr<Input> InputFormat::create_input(
 	map<string, Glib::VariantBase> options)
 {
@@ -1154,8 +1184,7 @@ shared_ptr<InputDevice> Input::get_device()
 		device = new InputDevice(shared_from_this(), sdi);
 	}
 
-	return static_pointer_cast<InputDevice>(
-		device->get_shared_pointer(context->shared_from_this()));
+	return device->get_shared_pointer(shared_from_this());
 }
 
 void Input::send(string data)
@@ -1173,8 +1202,10 @@ Input::~Input()
 	check(sr_input_free(structure));
 }
 
-InputDevice::InputDevice(shared_ptr<Input> input, struct sr_dev_inst *sdi) :
-	Device(sdi),
+InputDevice::InputDevice(shared_ptr<Input> input,
+		struct sr_dev_inst *structure) :
+	ParentOwned(structure),
+	Device(structure),
 	input(input)
 {
 }
@@ -1183,6 +1214,11 @@ InputDevice::~InputDevice()
 {
 }
 
+shared_ptr<Device> InputDevice::get_shared_from_this()
+{
+	return static_pointer_cast<Device>(shared_from_this());
+}
+
 Option::Option(const struct sr_option *structure,
 		shared_ptr<const struct sr_option *> structure_array) :
 	structure(structure),
@@ -1223,7 +1259,7 @@ vector<Glib::VariantBase> Option::get_values()
 }
 
 OutputFormat::OutputFormat(const struct sr_output_module *structure) :
-	StructureWrapper<Context, const struct sr_output_module>(structure)
+	ParentOwned(structure)
 {
 }
 
@@ -1257,9 +1293,7 @@ shared_ptr<Output> OutputFormat::create_output(
 	shared_ptr<Device> device, map<string, Glib::VariantBase> options)
 {
 	return shared_ptr<Output>(
-		new Output(
-			static_pointer_cast<OutputFormat>(shared_from_this()),
-				device, options),
+		new Output(shared_from_this(), device, options),
 		Output::Deleter());
 }