#include "libsigrok/libsigrok.hpp"
+#include <sstream>
+
namespace sigrok
{
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_variant_hash, g_variant_equal, g_free,
+ (void (*)(void *))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;
}
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]);
}
new Trigger(shared_from_this(), name), Trigger::Deleter());
}
+shared_ptr<Input> Context::open_file(string filename)
+{
+ auto input = sr_input_scan_file(filename.c_str());
+ if (!input)
+ throw Error(SR_ERR_NA);
+ return shared_ptr<Input>(
+ new Input(shared_from_this(), input), Input::Deleter());
+}
+
+shared_ptr<Input> Context::open_stream(string header)
+{
+ 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);
+ 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)
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()
{
return valid_string(structure->vendor);
check(sr_dev_channel_enable(parent->structure, structure->index, value));
}
+unsigned int Channel::get_index()
+{
+ return structure->index;
+}
+
ChannelGroup::ChannelGroup(Device *device,
struct sr_channel_group *structure) :
StructureWrapper<Device, struct sr_channel_group>(structure),
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)
{
}
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));
+}
+
+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(context->shared_from_this()));
}
-bool InputFormat::format_match(string filename)
+void Input::send(string data)
{
- return structure->format_match(filename.c_str());
+ auto gstr = g_string_new(data.c_str());
+ auto ret = sr_input_send(structure, gstr);
+ g_string_free(gstr, false);
+ check(ret);
}
-shared_ptr<InputFileDevice> InputFormat::open_file(string filename,
- map<string, string> options)
+Input::~Input()
{
- auto input = g_new(struct sr_input, 1);
- input->param = map_to_hash(options);
+ if (device)
+ delete device;
+ check(sr_input_free(structure));
+}
- /** Run initialisation. */
- check(structure->init(input, filename.c_str()));
+InputDevice::InputDevice(shared_ptr<Input> input, struct sr_dev_inst *sdi) :
+ Device(sdi),
+ input(input)
+{
+}
- /** Create virtual device. */
- return shared_ptr<InputFileDevice>(new InputFileDevice(
- static_pointer_cast<InputFormat>(shared_from_this()), input, filename),
- InputFileDevice::Deleter());
+InputDevice::~InputDevice()
+{
}
-InputFileDevice::InputFileDevice(shared_ptr<InputFormat> format,
- struct sr_input *input, string filename) :
- Device(input->sdi),
- input(input),
- format(format),
- filename(filename)
+Option::Option(const struct sr_option *structure,
+ shared_ptr<const struct sr_option *> structure_array) :
+ structure(structure),
+ structure_array(structure_array)
{
}
-InputFileDevice::~InputFileDevice()
+Option::~Option()
{
- g_hash_table_unref(input->param);
- g_free(input);
}
-void InputFileDevice::load()
+string Option::get_id()
{
- check(format->structure->loadfile(input, filename.c_str()));
+ return valid_string(structure->id);
}
-OutputFormat::OutputFormat(struct sr_output_format *structure) :
- StructureWrapper<Context, struct sr_output_format>(structure)
+string Option::get_name()
+{
+ return valid_string(structure->name);
+}
+
+string Option::get_description()
+{
+ return valid_string(structure->desc);
+}
+
+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)
{
}
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(
}
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));
}
projects / libsigrok.git / blobdiff