X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=c90cac3f13ca69270457def55f71f06083448aee;hb=e8779db70cfe53db1d9f1f6ad00c4888ccf09b23;hp=8e5874ca88037b7fb6dfee748f80c06eb46241dc;hpb=70d3b20ba6189093c3a18473b3376644683f729d;p=libsigrok.git

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index 8e5874ca..c90cac3f 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -40,24 +40,11 @@ static const char *valid_string(const char *input)
 		return "";
 }
 
-/** Helper function to convert between map<string, string> and GHashTable */
-static GHashTable *map_to_hash_string(map<string, string> input)
-{
-	auto output = g_hash_table_new_full(
-		g_str_hash, g_str_equal, g_free, g_free);
-	for (auto entry : input)
-		g_hash_table_insert(output,
-			g_strdup(entry.first.c_str()),
-			g_strdup(entry.second.c_str()));
-    return output;
-}
-
 /** Helper function to convert between map<string, VariantBase> and GHashTable */
 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()),
@@ -92,10 +79,10 @@ Context::Context() :
 		for (int i = 0; driver_list[i]; i++)
 			drivers[driver_list[i]->name] =
 				new Driver(driver_list[i]);
-	struct sr_input_format **input_list = sr_input_list();
+	const struct sr_input_module **input_list = sr_input_list();
 	if (input_list)
 		for (int i = 0; input_list[i]; i++)
-			input_formats[input_list[i]->id] =
+			input_formats[sr_input_id_get(input_list[i])] =
 				new InputFormat(input_list[i]);
 	const struct sr_output_module **output_list = sr_output_list();
 	if (output_list)
@@ -239,6 +226,27 @@ shared_ptr<Trigger> Context::create_trigger(string name)
 		new Trigger(shared_from_this(), name), Trigger::Deleter());
 }
 
+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());
+}
+
+shared_ptr<Input> Context::open_stream(string header)
+{
+	const struct sr_input *input;
+
+	auto gstr = g_string_new(header.c_str());
+	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),
 	initialized(false)
@@ -353,7 +361,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)
 	{
@@ -410,14 +418,14 @@ 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)));
+			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));
+		channels[ptr]->get_shared_pointer(get_shared_from_this()));
 }
 
 map<string, shared_ptr<ChannelGroup>>
@@ -429,7 +437,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));
+			channel_group->get_shared_pointer(get_shared_from_this()));
 	}
 	return result;
 }
@@ -445,6 +453,7 @@ void Device::close()
 }
 
 HardwareDevice::HardwareDevice(Driver *driver, struct sr_dev_inst *structure) :
+	StructureWrapper(structure),
 	Device(structure),
 	driver(driver)
 {
@@ -454,6 +463,12 @@ HardwareDevice::~HardwareDevice()
 {
 }
 
+shared_ptr<Device> HardwareDevice::get_shared_from_this()
+{
+	return static_pointer_cast<Device>(
+		static_pointer_cast<HardwareDevice>(shared_from_this()));
+}
+
 shared_ptr<Driver> HardwareDevice::get_driver()
 {
 	return static_pointer_cast<Driver>(driver->get_shared_pointer(parent));
@@ -725,9 +740,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;
@@ -961,6 +973,9 @@ Packet::Packet(shared_ptr<Device> device,
 				static_cast<const struct sr_datafeed_analog *>(
 					structure->payload));
 			break;
+		default:
+			payload = nullptr;
+			break;
 	}
 }
 
@@ -977,7 +992,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()
@@ -989,8 +1007,8 @@ PacketPayload::~PacketPayload()
 }
 
 Header::Header(const struct sr_datafeed_header *structure) :
-	PacketPayload(),
-	StructureWrapper<Packet, const struct sr_datafeed_header>(structure)
+	StructureWrapper<Packet, const struct sr_datafeed_header>(structure),
+	PacketPayload()
 {
 }
 
@@ -998,6 +1016,14 @@ Header::~Header()
 {
 }
 
+shared_ptr<PacketPayload> Header::get_shared_pointer(Packet *parent)
+{
+	return static_pointer_cast<PacketPayload>(
+		static_pointer_cast<Header>(
+		StructureWrapper<Packet, const struct sr_datafeed_header>::
+			get_shared_pointer(parent)));
+}
+
 int Header::get_feed_version()
 {
 	return structure->feed_version;
@@ -1011,8 +1037,8 @@ Glib::TimeVal Header::get_start_time()
 }
 
 Meta::Meta(const struct sr_datafeed_meta *structure) :
-	PacketPayload(),
-	StructureWrapper<Packet, const struct sr_datafeed_meta>(structure)
+	StructureWrapper<Packet, const struct sr_datafeed_meta>(structure),
+	PacketPayload()
 {
 }
 
@@ -1020,6 +1046,14 @@ Meta::~Meta()
 {
 }
 
+shared_ptr<PacketPayload> Meta::get_shared_pointer(Packet *parent)
+{
+	return static_pointer_cast<PacketPayload>(
+		static_pointer_cast<Meta>(
+		StructureWrapper<Packet, const struct sr_datafeed_meta>::
+			get_shared_pointer(parent)));
+}
+
 map<const ConfigKey *, Glib::VariantBase> Meta::get_config()
 {
 	map<const ConfigKey *, Glib::VariantBase> result;
@@ -1032,8 +1066,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)
+	StructureWrapper<Packet, const struct sr_datafeed_logic>(structure),
+	PacketPayload()
 {
 }
 
@@ -1041,6 +1075,14 @@ Logic::~Logic()
 {
 }
 
+shared_ptr<PacketPayload> Logic::get_shared_pointer(Packet *parent)
+{
+	return static_pointer_cast<PacketPayload>(
+		static_pointer_cast<Logic>(
+		StructureWrapper<Packet, const struct sr_datafeed_logic>::
+			get_shared_pointer(parent)));
+}
+
 void *Logic::get_data_pointer()
 {
 	return structure->data;
@@ -1057,8 +1099,8 @@ unsigned int Logic::get_unit_size()
 }
 
 Analog::Analog(const struct sr_datafeed_analog *structure) :
-	PacketPayload(),
-	StructureWrapper<Packet, const struct sr_datafeed_analog>(structure)
+	StructureWrapper<Packet, const struct sr_datafeed_analog>(structure),
+	PacketPayload()
 {
 }
 
@@ -1066,6 +1108,14 @@ Analog::~Analog()
 {
 }
 
+shared_ptr<PacketPayload> Analog::get_shared_pointer(Packet *parent)
+{
+	return static_pointer_cast<PacketPayload>(
+		static_pointer_cast<Analog>(
+		StructureWrapper<Packet, const struct sr_datafeed_analog>::
+			get_shared_pointer(parent)));
+}
+
 float *Analog::get_data_pointer()
 {
 	return structure->data;
@@ -1100,8 +1150,8 @@ vector<const QuantityFlag *> Analog::get_mq_flags()
 	return QuantityFlag::flags_from_mask(structure->mqflags);
 }
 
-InputFormat::InputFormat(struct sr_input_format *structure) :
-	StructureWrapper<Context, struct sr_input_format>(structure)
+InputFormat::InputFormat(const struct sr_input_module *structure) :
+	StructureWrapper<Context, const struct sr_input_module>(structure)
 {
 }
 
@@ -1111,52 +1161,88 @@ InputFormat::~InputFormat()
 
 string InputFormat::get_name()
 {
-	return valid_string(structure->id);
+	return valid_string(sr_input_id_get(structure));
 }
 
 string InputFormat::get_description()
 {
-	return valid_string(structure->description);
+	return valid_string(sr_input_description_get(structure));
 }
 
-bool InputFormat::format_match(string filename)
+map<string, shared_ptr<Option>> InputFormat::get_options()
 {
-	return structure->format_match(filename.c_str());
+	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<InputFileDevice> InputFormat::open_file(string filename,
-		map<string, string> options)
+shared_ptr<Input> InputFormat::create_input(
+	map<string, Glib::VariantBase> options)
 {
-	auto input = g_new(struct sr_input, 1);
-	input->param = map_to_hash_string(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->shared_from_this(), input), Input::Deleter());
+}
 
-	/** Run initialisation. */
-	check(structure->init(input, filename.c_str()));
+Input::Input(shared_ptr<Context> context, const struct sr_input *structure) :
+	structure(structure),
+	context(context),
+	device(nullptr)
+{
+}
+
+shared_ptr<InputDevice> Input::get_device()
+{
+	if (!device)
+	{
+		auto sdi = sr_input_dev_inst_get(structure);
+		if (!sdi)
+			throw Error(SR_ERR_NA);
+		device = new InputDevice(shared_from_this(), sdi);
+	}
+
+	return static_pointer_cast<InputDevice>(
+		device->get_shared_pointer(shared_from_this()));
+}
 
-	/** Create virtual device. */
-	return shared_ptr<InputFileDevice>(new InputFileDevice(
-		static_pointer_cast<InputFormat>(shared_from_this()), input, filename),
-		InputFileDevice::Deleter());
+void Input::send(string data)
+{
+	auto gstr = g_string_new(data.c_str());
+	auto ret = sr_input_send(structure, gstr);
+	g_string_free(gstr, false);
+	check(ret);
 }
 
-InputFileDevice::InputFileDevice(shared_ptr<InputFormat> format,
-		struct sr_input *input, string filename) :
-	Device(input->sdi),
-	input(input),
-	format(format),
-	filename(filename)
+Input::~Input()
+{
+	if (device)
+		delete device;
+	check(sr_input_free(structure));
+}
+
+InputDevice::InputDevice(shared_ptr<Input> input,
+		struct sr_dev_inst *structure) :
+	StructureWrapper(structure),
+	Device(structure),
+	input(input)
 {
 }
 
-InputFileDevice::~InputFileDevice()
+InputDevice::~InputDevice()
 {
-	g_hash_table_unref(input->param);
-	g_free(input);
 }
 
-void InputFileDevice::load()
+shared_ptr<Device> InputDevice::get_shared_from_this()
 {
-	check(format->structure->loadfile(input, filename.c_str()));
+	return static_pointer_cast<Device>(
+		static_pointer_cast<InputDevice>(shared_from_this()));
 }
 
 Option::Option(const struct sr_option *structure,