X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=c08279051b18377726bde6ed20e80f01ba6e4601;hb=6f1346fbd7bbb6cca97d8a6c02b36156fce24ec2;hp=c915c8a7479920a23069a8c45dfe02983a766456;hpb=c7bc82ffa1b09a228a8395049e2b691cd7bd85f8;p=libsigrok.git diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp index c915c8a7..c0827905 100644 --- a/bindings/cxx/classes.cpp +++ b/bindings/cxx/classes.cpp @@ -652,8 +652,7 @@ string Channel::name() void Channel::set_name(string name) { - check(sr_dev_channel_name_set(_parent->_structure, - _structure->index, name.c_str())); + check(sr_dev_channel_name_set(_structure, name.c_str())); } const ChannelType *Channel::type() @@ -668,7 +667,7 @@ bool Channel::enabled() void Channel::set_enabled(bool value) { - check(sr_dev_channel_enable(_parent->_structure, _structure->index, value)); + check(sr_dev_channel_enable(_structure, value)); } unsigned int Channel::index() @@ -1534,6 +1533,15 @@ string OutputFormat::description() return valid_string(sr_output_description_get(_structure)); } +vector OutputFormat::extensions() +{ + vector exts; + for (const char *const *e = sr_output_extensions_get(_structure); + e && *e; e++) + exts.push_back(*e); + return exts; +} + map> OutputFormat::options() { const struct sr_option **options = sr_output_options_get(_structure);