X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=357c9d6f3cbccac46f24a7d1c74025c525b40324;hb=81b3ce374c3b6d48e5ed321ac7a871ce4248a0bb;hp=c88dc56683473d21c419333a5a0aa231b9d85195;hpb=61e6e2da45373acea5dab93a6ede57aae9901b1b;p=libsigrok.git

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index c88dc566..357c9d6f 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -77,7 +77,7 @@ Context::Context() :
 {
 	check(sr_init(&_structure));
 
-	struct sr_dev_driver **driver_list = sr_driver_list();
+	struct sr_dev_driver **driver_list = sr_driver_list(_structure);
 	if (driver_list)
 		for (int i = 0; driver_list[i]; i++)
 			_drivers[driver_list[i]->name] =
@@ -888,7 +888,7 @@ Session::Session(shared_ptr<Context> context) :
 	_context(context),
 	_saving(false)
 {
-	check(sr_session_new(context->structure, &_structure));
+	check(sr_session_new(context->_structure, &_structure));
 	_context->_session = this;
 }
 
@@ -898,7 +898,7 @@ Session::Session(shared_ptr<Context> context, string filename) :
 	_filename(filename),
 	_saving(false)
 {
-	check(sr_session_load(filename.c_str(), &_structure));
+	check(sr_session_load(context->_structure, filename.c_str(), &_structure));
 	GSList *dev_list;
 	check(sr_session_dev_list(_structure, &dev_list));
 	for (GSList *dev = dev_list; dev; dev = dev->next)
@@ -1438,9 +1438,9 @@ shared_ptr<InputDevice> Input::device()
 	return _device->get_shared_pointer(shared_from_this());
 }
 
-void Input::send(string data)
+void Input::send(void *data, size_t length)
 {
-	auto gstr = g_string_new(data.c_str());
+	auto gstr = g_string_new_len((gchar *)data, length);
 	auto ret = sr_input_send(_structure, gstr);
 	g_string_free(gstr, false);
 	check(ret);
@@ -1565,10 +1565,28 @@ shared_ptr<Output> OutputFormat::create_output(
 		Output::Deleter());
 }
 
+shared_ptr<Output> OutputFormat::create_output(string filename,
+	shared_ptr<Device> device, map<string, Glib::VariantBase> options)
+{
+	return shared_ptr<Output>(
+		new Output(filename, shared_from_this(), device, options),
+		Output::Deleter());
+}
+
 Output::Output(shared_ptr<OutputFormat> format,
 		shared_ptr<Device> device, map<string, Glib::VariantBase> options) :
 	UserOwned(sr_output_new(format->_structure,
-		map_to_hash_variant(options), device->_structure)),
+		map_to_hash_variant(options), device->_structure, NULL)),
+	_format(format),
+	_device(device),
+	_options(options)
+{
+}
+
+Output::Output(string filename, shared_ptr<OutputFormat> format,
+		shared_ptr<Device> device, map<string, Glib::VariantBase> options) :
+	UserOwned(sr_output_new(format->_structure,
+		map_to_hash_variant(options), device->_structure, filename.c_str())),
 	_format(format),
 	_device(device),
 	_options(options)