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

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index c75f09a0..c90cac3f 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -19,14 +19,10 @@
 
 #include "libsigrok/libsigrok.hpp"
 
-namespace sigrok
-{
+#include <sstream>
 
-/** Custom shared_ptr deleter for children owned by their parent object. */
-template <class T> void reset_parent(T *child)
+namespace sigrok
 {
-	child->parent.reset();
-}
 
 /** Helper function to translate C errors to C++ exceptions. */
 static void check(int result)
@@ -44,16 +40,15 @@ static const char *valid_string(const char *input)
 		return "";
 }
 
-/** Helper function to convert between map<string, string> and GHashTable */
-
-static GHashTable *map_to_hash(map<string, string> input)
+/** 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_str_hash, g_str_equal, g_free, g_free);
+		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()),
-			g_strdup(entry.second.c_str()));
+			entry.second.gobj_copy());
     return output;
 }
 
@@ -84,15 +79,15 @@ 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]);
-	struct sr_output_format **output_list = sr_output_list();
+	const struct sr_output_module **output_list = sr_output_list();
 	if (output_list)
 		for (int i = 0; output_list[i]; i++)
-			output_formats[output_list[i]->id] =
+			output_formats[sr_output_id_get(output_list[i])] =
 				new OutputFormat(output_list[i]);
 }
 
@@ -113,8 +108,8 @@ map<string, shared_ptr<Driver>> Context::get_drivers()
 	{
 		auto name = entry.first;
 		auto driver = entry.second;
-		driver->parent = static_pointer_cast<Context>(shared_from_this());
-		result[name] = shared_ptr<Driver>(driver, reset_parent<Driver>);
+		result[name] = static_pointer_cast<Driver>(
+			driver->get_shared_pointer(this));
 	}
 	return result;
 }
@@ -126,9 +121,8 @@ map<string, shared_ptr<InputFormat>> Context::get_input_formats()
 	{
 		auto name = entry.first;
 		auto input_format = entry.second;
-		input_format->parent = static_pointer_cast<Context>(shared_from_this());
-		result[name] = shared_ptr<InputFormat>(input_format,
-			reset_parent<InputFormat>);
+		result[name] = static_pointer_cast<InputFormat>(
+			input_format->get_shared_pointer(this));
 	}
 	return result;
 }
@@ -140,9 +134,8 @@ map<string, shared_ptr<OutputFormat>> Context::get_output_formats()
 	{
 		auto name = entry.first;
 		auto output_format = entry.second;
-		output_format->parent = static_pointer_cast<Context>(shared_from_this());
-		result[name] = shared_ptr<OutputFormat>(output_format,
-			reset_parent<OutputFormat>);
+		result[name] = static_pointer_cast<OutputFormat>(
+			output_format->get_shared_pointer(this));
 	}
 	return result;
 }
@@ -233,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)
@@ -301,11 +315,8 @@ 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)
-	{
-		device->parent = parent->shared_from_this();
-		result.push_back(shared_ptr<HardwareDevice>(device,
-			reset_parent<HardwareDevice>));
-	}
+		result.push_back(static_pointer_cast<HardwareDevice>(
+			device->get_shared_pointer(parent)));
 	return result;
 }
 
@@ -339,30 +350,52 @@ void Configurable::config_set(const ConfigKey *key, Glib::VariantBase value)
 		key->get_id(), value.gobj()));
 }
 
-Glib::VariantBase Configurable::config_list(const ConfigKey *key)
+Glib::VariantContainerBase Configurable::config_list(const ConfigKey *key)
 {
 	GVariant *data;
 	check(sr_config_list(
 		config_driver, config_sdi, config_channel_group,
 		key->get_id(), &data));
-	return Glib::VariantBase(data);
+	return Glib::VariantContainerBase(data);
 }
 
 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)
 	{
 		auto channel = (struct sr_channel *) entry->data;
-		channels.push_back(new Channel(channel));
+		channels[channel] = new Channel(channel);
+	}
+
+	for (GSList *entry = structure->channel_groups; entry; entry = entry->next)
+	{
+		auto group = (struct sr_channel_group *) entry->data;
+		channel_groups[group->name] = new ChannelGroup(this, group);
 	}
 }
 
 Device::~Device()
 {
-	for (auto channel : channels)
-		delete channel;
+	for (auto entry : channels)
+		delete entry.second;
+	for (auto entry : channel_groups)
+		delete entry.second;
+}
+
+string Device::get_description()
+{
+	ostringstream s;
+
+	vector<string> parts =
+		{get_vendor(), get_model(), get_version()};
+
+	for (string part : parts)
+		if (part.length() > 0)
+			s << part;
+
+	return s.str();
 }
 
 string Device::get_vendor()
@@ -383,10 +416,28 @@ string Device::get_version()
 vector<shared_ptr<Channel>> Device::get_channels()
 {
 	vector<shared_ptr<Channel>> result;
-	for (auto channel : channels)
+	for (auto entry : channels)
+		result.push_back(static_pointer_cast<Channel>(
+			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(get_shared_from_this()));
+}
+
+map<string, shared_ptr<ChannelGroup>>
+Device::get_channel_groups()
+{
+	map<string, shared_ptr<ChannelGroup>> result;
+	for (auto entry: channel_groups)
 	{
-		channel->parent = static_pointer_cast<Device>(shared_from_this());
-		result.push_back(shared_ptr<Channel>(channel, reset_parent<Channel>));
+		auto name = entry.first;
+		auto channel_group = entry.second;
+		result[name] = static_pointer_cast<ChannelGroup>(
+			channel_group->get_shared_pointer(get_shared_from_this()));
 	}
 	return result;
 }
@@ -402,41 +453,25 @@ void Device::close()
 }
 
 HardwareDevice::HardwareDevice(Driver *driver, struct sr_dev_inst *structure) :
+	StructureWrapper(structure),
 	Device(structure),
 	driver(driver)
 {
-	for (GSList *entry = structure->channel_groups; entry; entry = entry->next)
-	{
-		auto group = (struct sr_channel_group *) entry->data;
-		channel_groups[group->name] = new ChannelGroup(this, group);
-	}
 }
 
 HardwareDevice::~HardwareDevice()
 {
-	for (auto entry : channel_groups)
-		delete entry.second;
 }
 
-shared_ptr<Driver> HardwareDevice::get_driver()
+shared_ptr<Device> HardwareDevice::get_shared_from_this()
 {
-	return static_pointer_cast<Driver>(driver->shared_from_this());
+	return static_pointer_cast<Device>(
+		static_pointer_cast<HardwareDevice>(shared_from_this()));
 }
 
-map<string, shared_ptr<ChannelGroup>>
-HardwareDevice::get_channel_groups()
+shared_ptr<Driver> HardwareDevice::get_driver()
 {
-	map<string, shared_ptr<ChannelGroup>> result;
-	for (auto entry: channel_groups)
-	{
-		auto name = entry.first;
-		auto channel_group = entry.second;
-		channel_group->parent =
-			static_pointer_cast<HardwareDevice>(shared_from_this());
-		result[name] = shared_ptr<ChannelGroup>(channel_group,
-			reset_parent<ChannelGroup>);
-	}
-	return result;
+	return static_pointer_cast<Driver>(driver->get_shared_pointer(parent));
 }
 
 Channel::Channel(struct sr_channel *structure) :
@@ -474,18 +509,18 @@ void Channel::set_enabled(bool value)
 	check(sr_dev_channel_enable(parent->structure, structure->index, value));
 }
 
-ChannelGroup::ChannelGroup(HardwareDevice *device,
+unsigned int Channel::get_index()
+{
+	return structure->index;
+}
+
+ChannelGroup::ChannelGroup(Device *device,
 		struct sr_channel_group *structure) :
-	StructureWrapper<HardwareDevice, struct sr_channel_group>(structure),
+	StructureWrapper<Device, struct sr_channel_group>(structure),
 	Configurable(device->structure->driver, device->structure, structure)
 {
 	for (GSList *entry = structure->channels; entry; entry = entry->next)
-	{
-		auto channel = (struct sr_channel *) entry->data;
-		for (auto device_channel : device->channels)
-			if (channel == device_channel->structure)
-				channels.push_back(device_channel);
-	}
+		channels.push_back(device->channels[(struct sr_channel *)entry->data]);
 }
 
 ChannelGroup::~ChannelGroup()
@@ -501,10 +536,8 @@ vector<shared_ptr<Channel>> ChannelGroup::get_channels()
 {
 	vector<shared_ptr<Channel>> result;
 	for (auto channel : channels)
-	{
-		channel->parent = static_pointer_cast<Device>(parent->shared_from_this());
-		result.push_back(shared_ptr<Channel>(channel, reset_parent<Channel>));
-	}
+		result.push_back(static_pointer_cast<Channel>(
+			channel->get_shared_pointer(parent)));
 	return result;
 }
 
@@ -532,10 +565,8 @@ vector<shared_ptr<TriggerStage>> Trigger::get_stages()
 {
 	vector<shared_ptr<TriggerStage>> result;
 	for (auto stage : stages)
-	{
-		stage->parent = static_pointer_cast<Trigger>(shared_from_this());
-		result.push_back(shared_ptr<TriggerStage>(stage, reset_parent<TriggerStage>));
-	}
+		result.push_back(static_pointer_cast<TriggerStage>(
+			stage->get_shared_pointer(this)));
 	return result;
 }
 
@@ -543,8 +574,8 @@ shared_ptr<TriggerStage> Trigger::add_stage()
 {
 	auto stage = new TriggerStage(sr_trigger_stage_add(structure));
 	stages.push_back(stage);
-	stage->parent = static_pointer_cast<Trigger>(shared_from_this());
-	return shared_ptr<TriggerStage>(stage, reset_parent<TriggerStage>);
+	return static_pointer_cast<TriggerStage>(
+		stage->get_shared_pointer(this));
 }
 
 TriggerStage::TriggerStage(struct sr_trigger_stage *structure) : 
@@ -567,10 +598,8 @@ vector<shared_ptr<TriggerMatch>> TriggerStage::get_matches()
 {
 	vector<shared_ptr<TriggerMatch>> result;
 	for (auto match : matches)
-	{
-		match->parent = static_pointer_cast<TriggerStage>(shared_from_this());
-		result.push_back(shared_ptr<TriggerMatch>(match, reset_parent<TriggerMatch>));
-	}
+		result.push_back(static_pointer_cast<TriggerMatch>(
+			match->get_shared_pointer(this)));
 	return result;
 }
 
@@ -620,7 +649,7 @@ void DatafeedCallbackData::run(const struct sr_dev_inst *sdi,
 	const struct sr_datafeed_packet *pkt)
 {
 	auto device = session->devices[sdi];
-	auto packet = shared_ptr<Packet>(new Packet(pkt), Packet::Deleter());
+	auto packet = shared_ptr<Packet>(new Packet(device, pkt), Packet::Deleter());
 	callback(device, packet);
 }
 
@@ -711,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;
@@ -748,7 +774,7 @@ void Session::begin_save(string filename)
 	save_samplerate = 0;
 }
 
-void Session::append(shared_ptr<Device> device, shared_ptr<Packet> packet)
+void Session::append(shared_ptr<Packet> packet)
 {
 	if (!saving)
 		throw Error(SR_ERR);
@@ -775,8 +801,9 @@ void Session::append(shared_ptr<Device> device, shared_ptr<Packet> packet)
 			{
 				GVariant *samplerate;
 
-				check(sr_config_get(device->structure->driver,
-					device->structure, NULL, SR_CONF_SAMPLERATE, &samplerate));
+				check(sr_config_get(packet->device->structure->driver,
+					packet->device->structure, NULL, SR_CONF_SAMPLERATE,
+					&samplerate));
 
 				save_samplerate = g_variant_get_uint64(samplerate);
 
@@ -787,7 +814,7 @@ void Session::append(shared_ptr<Device> device, shared_ptr<Packet> packet)
 			{
 				vector<shared_ptr<Channel>> save_channels;
 
-				for (auto channel : device->get_channels())
+				for (auto channel : packet->device->get_channels())
 					if (channel->structure->enabled &&
 							channel->structure->type == SR_CHANNEL_LOGIC)
 						save_channels.push_back(channel);
@@ -820,6 +847,12 @@ void Session::append(shared_ptr<Device> device, shared_ptr<Packet> packet)
 	}
 }
 
+void Session::append(void *data, size_t length, unsigned int unit_size)
+{
+	check(sr_session_append(structure, save_filename.c_str(),
+		(uint8_t *) data, unit_size, length));
+}
+
 static void datafeed_callback(const struct sr_dev_inst *sdi,
 	const struct sr_datafeed_packet *pkt, void *cb_data)
 {
@@ -913,11 +946,23 @@ void Session::set_trigger(shared_ptr<Trigger> trigger)
 	this->trigger = trigger;
 }
 
-Packet::Packet(const struct sr_datafeed_packet *structure) :
-	structure(structure)
+Packet::Packet(shared_ptr<Device> device,
+	const struct sr_datafeed_packet *structure) :
+	structure(structure),
+	device(device)
 {
 	switch (structure->type)
 	{
+		case SR_DF_HEADER:
+			payload = new Header(
+				static_cast<const struct sr_datafeed_header *>(
+					structure->payload));
+			break;
+		case SR_DF_META:
+			payload = new Meta(
+				static_cast<const struct sr_datafeed_meta *>(
+					structure->payload));
+			break;
 		case SR_DF_LOGIC:
 			payload = new Logic(
 				static_cast<const struct sr_datafeed_logic *>(
@@ -929,19 +974,28 @@ Packet::Packet(const struct sr_datafeed_packet *structure) :
 					structure->payload));
 			break;
 		default:
-			payload = NULL;
+			payload = nullptr;
 			break;
 	}
 }
 
 Packet::~Packet()
 {
-	delete payload;
+	if (payload)
+		delete payload;
 }
 
-PacketPayload *Packet::get_payload()
+const PacketType *Packet::get_type()
 {
-	return payload;
+	return PacketType::get(structure->type);
+}
+
+shared_ptr<PacketPayload> Packet::get_payload()
+{
+	if (payload)
+		return payload->get_shared_pointer(this);
+	else
+		throw Error(SR_ERR_NA);
 }
 
 PacketPayload::PacketPayload()
@@ -952,28 +1006,101 @@ PacketPayload::~PacketPayload()
 {
 }
 
-Logic::Logic(const struct sr_datafeed_logic *structure) : PacketPayload(),
-	structure(structure),
-	data(static_cast<uint8_t *>(structure->data),
-		static_cast<uint8_t *>(structure->data) + structure->length) {}
+Header::Header(const struct sr_datafeed_header *structure) :
+	StructureWrapper<Packet, const struct sr_datafeed_header>(structure),
+	PacketPayload()
+{
+}
+
+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;
+}
+
+Glib::TimeVal Header::get_start_time()
+{
+	return Glib::TimeVal(
+		structure->starttime.tv_sec,
+		structure->starttime.tv_usec);
+}
+
+Meta::Meta(const struct sr_datafeed_meta *structure) :
+	StructureWrapper<Packet, const struct sr_datafeed_meta>(structure),
+	PacketPayload()
+{
+}
+
+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;
+	for (auto l = structure->config; l; l = l->next)
+	{
+		auto config = (struct sr_config *) l->data;
+		result[ConfigKey::get(config->key)] = Glib::VariantBase(config->data);
+	}
+	return result;
+}
+
+Logic::Logic(const struct sr_datafeed_logic *structure) :
+	StructureWrapper<Packet, const struct sr_datafeed_logic>(structure),
+	PacketPayload()
+{
+}
 
 Logic::~Logic()
 {
 }
 
-void *Logic::get_data()
+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;
 }
 
-size_t Logic::get_data_size()
+size_t Logic::get_data_length()
 {
 	return structure->length;
 }
 
+unsigned int Logic::get_unit_size()
+{
+	return structure->unitsize;
+}
+
 Analog::Analog(const struct sr_datafeed_analog *structure) :
-	PacketPayload(),
-	structure(structure)
+	StructureWrapper<Packet, const struct sr_datafeed_analog>(structure),
+	PacketPayload()
 {
 }
 
@@ -981,14 +1108,17 @@ Analog::~Analog()
 {
 }
 
-void *Analog::get_data()
+shared_ptr<PacketPayload> Analog::get_shared_pointer(Packet *parent)
 {
-	return structure->data;
+	return static_pointer_cast<PacketPayload>(
+		static_pointer_cast<Analog>(
+		StructureWrapper<Packet, const struct sr_datafeed_analog>::
+			get_shared_pointer(parent)));
 }
 
-size_t Analog::get_data_size()
+float *Analog::get_data_pointer()
 {
-	return structure->num_samples * sizeof(float);
+	return structure->data;
 }
 
 unsigned int Analog::get_num_samples()
@@ -996,6 +1126,15 @@ unsigned int Analog::get_num_samples()
 	return structure->num_samples;
 }
 
+vector<shared_ptr<Channel>> Analog::get_channels()
+{
+	vector<shared_ptr<Channel>> result;
+	for (auto l = structure->channels; l; l = l->next)
+		result.push_back(parent->device->get_channel(
+			(struct sr_channel *)l->data));
+	return result;
+}
+
 const Quantity *Analog::get_mq()
 {
 	return Quantity::get(structure->mq);
@@ -1011,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)
 {
 }
 
@@ -1022,56 +1161,131 @@ 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));
+}
+
+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)
+{
+	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());
+}
+
+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()));
+}
+
+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);
+}
+
+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)
+{
 }
 
-bool InputFormat::format_match(string filename)
+InputDevice::~InputDevice()
 {
-	return structure->format_match(filename.c_str());
 }
 
-shared_ptr<InputFileDevice> InputFormat::open_file(string filename,
-		map<string, string> options)
+shared_ptr<Device> InputDevice::get_shared_from_this()
 {
-	auto input = g_new(struct sr_input, 1);
-	input->param = map_to_hash(options);
+	return static_pointer_cast<Device>(
+		static_pointer_cast<InputDevice>(shared_from_this()));
+}
 
-	/** Run initialisation. */
-	check(structure->init(input, filename.c_str()));
+Option::Option(const struct sr_option *structure,
+		shared_ptr<const struct sr_option *> structure_array) :
+	structure(structure),
+	structure_array(structure_array)
+{
+}
 
-	/** Create virtual device. */
-	return shared_ptr<InputFileDevice>(new InputFileDevice(
-		static_pointer_cast<InputFormat>(shared_from_this()), input, filename),
-		InputFileDevice::Deleter());
+Option::~Option()
+{
 }
 
-InputFileDevice::InputFileDevice(shared_ptr<InputFormat> format,
-		struct sr_input *input, string filename) :
-	Device(input->sdi),
-	input(input),
-	format(format),
-	filename(filename)
+string Option::get_id()
 {
+	return valid_string(structure->id);
 }
 
-InputFileDevice::~InputFileDevice()
+string Option::get_name()
 {
-	g_hash_table_unref(input->param);
-	g_free(input);
+	return valid_string(structure->name);
 }
 
-void InputFileDevice::load()
+string Option::get_description()
 {
-	check(format->structure->loadfile(input, filename.c_str()));
+	return valid_string(structure->desc);
 }
 
-OutputFormat::OutputFormat(struct sr_output_format *structure) :
-	StructureWrapper<Context, struct sr_output_format>(structure)
+Glib::VariantBase Option::get_default_value()
+{
+	return Glib::VariantBase(structure->def, true);
+}
+
+vector<Glib::VariantBase> Option::get_values()
+{
+	vector<Glib::VariantBase> result;
+	for (auto l = structure->values; l; l = l->next)
+		result.push_back(Glib::VariantBase((GVariant *) l->data, true));
+	return result;
+}
+
+OutputFormat::OutputFormat(const struct sr_output_module *structure) :
+	StructureWrapper<Context, const struct sr_output_module>(structure)
 {
 }
 
@@ -1081,16 +1295,28 @@ OutputFormat::~OutputFormat()
 
 string OutputFormat::get_name()
 {
-	return valid_string(structure->id);
+	return valid_string(sr_output_id_get(structure));
 }
 
 string OutputFormat::get_description()
 {
-	return valid_string(structure->description);
+	return valid_string(sr_output_description_get(structure));
+}
+
+map<string, shared_ptr<Option>> OutputFormat::get_options()
+{
+	const struct sr_option **options = sr_output_options_get(structure);
+	auto option_array = shared_ptr<const struct sr_option *>(
+		options, sr_output_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<Output> OutputFormat::create_output(
-	shared_ptr<Device> device, map<string, string> options)
+	shared_ptr<Device> device, map<string, Glib::VariantBase> options)
 {
 	return shared_ptr<Output>(
 		new Output(
@@ -1100,16 +1326,15 @@ shared_ptr<Output> OutputFormat::create_output(
 }
 
 Output::Output(shared_ptr<OutputFormat> format,
-		shared_ptr<Device> device, map<string, string> options) :
+		shared_ptr<Device> device, map<string, Glib::VariantBase> options) :
 	structure(sr_output_new(format->structure,
-		map_to_hash(options), device->structure)),
+		map_to_hash_variant(options), device->structure)),
 	format(format), device(device), options(options)
 {
 }
 
 Output::~Output()
 {
-	g_hash_table_unref(structure->params);
 	check(sr_output_free(structure));
 }