From: Martin Ling <redacted>
Date: Sun, 24 Aug 2014 13:22:03 +0000 (+0100)
Subject: C++: Implement InputFormat::get_options()
X-Git-Tag: libsigrok-0.4.0~1096
X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=43942280bb42a1dd82957aa582fd43d6e2e5dc96

C++: Implement InputFormat::get_options()
---

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index edd68bd4..ed89b8bd 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -1128,6 +1128,19 @@ string InputFormat::get_description()
 	return valid_string(sr_input_description_get(structure));
 }
 
+map<string, shared_ptr<Option>> InputFormat::get_options()
+{
+	const struct sr_option *option = sr_input_options_get(structure);
+	auto option_array = shared_ptr<const struct sr_option>(
+		option, [=](const struct sr_option *) {
+			sr_input_options_free(structure); });
+	map<string, shared_ptr<Option>> result;
+	for (; option->id; option++)
+		result[option->id] = shared_ptr<Option>(
+			new Option(option, option_array), Option::Deleter());
+	return result;
+}
+
 shared_ptr<Input> InputFormat::create_input(
 	map<string, Glib::VariantBase> options)
 {
diff --git a/bindings/cxx/include/libsigrok/libsigrok.hpp b/bindings/cxx/include/libsigrok/libsigrok.hpp
index cc57d1a0..f05205a6 100644
--- a/bindings/cxx/include/libsigrok/libsigrok.hpp
+++ b/bindings/cxx/include/libsigrok/libsigrok.hpp
@@ -825,6 +825,7 @@ protected:
 		void operator()(Option *option) { delete option; }
 	};
 	friend class Deleter;
+	friend class InputFormat;
 	friend class OutputFormat;
 };