X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=bindings%2Fcxx%2Fclasses.cpp;h=3e441f72252c2e4a34ebe30c303cd7a0e4b07a1c;hb=5faebab2903dc91949edc31f0a4b118d86090a30;hp=b7a3d84d997a9c010cb8f95b1f15f488c23a020e;hpb=782b16447b25ce31d41764ae91681a6aa4f3fe0d;p=libsigrok.git

diff --git a/bindings/cxx/classes.cpp b/bindings/cxx/classes.cpp
index b7a3d84d..3e441f72 100644
--- a/bindings/cxx/classes.cpp
+++ b/bindings/cxx/classes.cpp
@@ -17,6 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/* Needed for isascii(), as used in the GNU libstdc++ headers */
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600
+#endif
+
+#include <config.h>
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <sstream>
@@ -66,6 +72,50 @@ Error::~Error() throw()
 {
 }
 
+ResourceReader::~ResourceReader()
+{
+}
+
+SR_PRIV int ResourceReader::open_callback(struct sr_resource *res,
+		const char *name, void *cb_data)
+{
+	try {
+		auto *const reader = static_cast<ResourceReader*>(cb_data);
+		reader->open(res, name);
+	} catch (const Error &err) {
+		return err.result;
+	} catch (...) {
+		return SR_ERR;
+	}
+	return SR_OK;
+}
+
+SR_PRIV int ResourceReader::close_callback(struct sr_resource *res, void *cb_data)
+{
+	try {
+		auto *const reader = static_cast<ResourceReader*>(cb_data);
+		reader->close(res);
+	} catch (const Error &err) {
+		return err.result;
+	} catch (...) {
+		return SR_ERR;
+	}
+	return SR_OK;
+}
+
+SR_PRIV ssize_t ResourceReader::read_callback(const struct sr_resource *res,
+		void *buf, size_t count, void *cb_data)
+{
+	try {
+		auto *const reader = static_cast<ResourceReader*>(cb_data);
+		return reader->read(res, buf, count);
+	} catch (const Error &err) {
+		return err.result;
+	} catch (...) {
+		return SR_ERR;
+	}
+}
+
 shared_ptr<Context> Context::create()
 {
 	return shared_ptr<Context>(new Context(), Context::Deleter());
@@ -190,13 +240,26 @@ void Context::set_log_callback(LogCallbackFunction callback)
 {
 	_log_callback = callback;
 	check(sr_log_callback_set(call_log_callback, &_log_callback));
-} 
+}
 
 void Context::set_log_callback_default()
 {
 	check(sr_log_callback_set_default());
 	_log_callback = nullptr;
-} 
+}
+
+void Context::set_resource_reader(ResourceReader *reader)
+{
+	if (reader) {
+		check(sr_resource_set_hooks(_structure,
+				&ResourceReader::open_callback,
+				&ResourceReader::close_callback,
+				&ResourceReader::read_callback, reader));
+	} else {
+		check(sr_resource_set_hooks(_structure,
+				nullptr, nullptr, nullptr, nullptr));
+	}
+}
 
 shared_ptr<Session> Context::create_session()
 {
@@ -256,12 +319,12 @@ shared_ptr<Packet> Context::create_logic_packet(
 	return shared_ptr<Packet>(new Packet(nullptr, packet), Packet::Deleter());
 }
 
-shared_ptr<Packet> Context::create_analog_packet(
+shared_ptr<Packet> Context::create_analog_old_packet(
 	vector<shared_ptr<Channel> > channels,
 	float *data_pointer, unsigned int num_samples, const Quantity *mq,
 	const Unit *unit, vector<const QuantityFlag *> mqflags)
 {
-	auto analog = g_new0(struct sr_datafeed_analog, 1);
+	auto analog = g_new0(struct sr_datafeed_analog_old, 1);
 	for (auto channel : channels)
 		analog->channels = g_slist_append(analog->channels, channel->_structure);
 	analog->num_samples = num_samples;
@@ -270,7 +333,7 @@ shared_ptr<Packet> Context::create_analog_packet(
 	analog->mqflags = QuantityFlag::mask_from_flags(mqflags);
 	analog->data = data_pointer;
 	auto packet = g_new(struct sr_datafeed_packet, 1);
-	packet->type = SR_DF_ANALOG;
+	packet->type = SR_DF_ANALOG_OLD;
 	packet->payload = analog;
 	return shared_ptr<Packet>(new Packet(nullptr, packet), Packet::Deleter());
 }
@@ -809,55 +872,6 @@ void DatafeedCallbackData::run(const struct sr_dev_inst *sdi,
 	_callback(device, packet);
 }
 
-SourceCallbackData::SourceCallbackData(shared_ptr<EventSource> source) :
-	_source(source)
-{
-}
-
-bool SourceCallbackData::run(int revents)
-{
-	return _source->_callback((Glib::IOCondition) revents);
-}
-
-shared_ptr<EventSource> EventSource::create(int fd, Glib::IOCondition events,
-	int timeout, SourceCallbackFunction callback)
-{
-	auto result = new EventSource(timeout, callback);
-	result->_type = EventSource::SOURCE_FD;
-	result->_fd = fd;
-	result->_events = events;
-	return shared_ptr<EventSource>(result, EventSource::Deleter());
-}
-
-shared_ptr<EventSource> EventSource::create(Glib::PollFD pollfd, int timeout,
-	SourceCallbackFunction callback)
-{
-	auto result = new EventSource(timeout, callback);
-	result->_type = EventSource::SOURCE_POLLFD;
-	result->_pollfd = pollfd;
-	return shared_ptr<EventSource>(result, EventSource::Deleter());
-}
-
-shared_ptr<EventSource> EventSource::create(Glib::RefPtr<Glib::IOChannel> channel,
-	Glib::IOCondition events, int timeout, SourceCallbackFunction callback)
-{
-	auto result = new EventSource(timeout, callback);
-	result->_type = EventSource::SOURCE_IOCHANNEL;
-	result->_channel = channel;
-	result->_events = events;
-	return shared_ptr<EventSource>(result, EventSource::Deleter());
-}
-
-EventSource::EventSource(int timeout, SourceCallbackFunction callback) :
-	_timeout(timeout),
-	_callback(callback)
-{
-}
-
-EventSource::~EventSource()
-{
-}
-
 SessionDevice::SessionDevice(struct sr_dev_inst *structure) :
 	ParentOwned(structure),
 	Device(structure)
@@ -875,8 +889,7 @@ shared_ptr<Device> SessionDevice::get_shared_from_this()
 
 Session::Session(shared_ptr<Context> context) :
 	UserOwned(_structure),
-	_context(context),
-	_saving(false)
+	_context(context)
 {
 	check(sr_session_new(context->_structure, &_structure));
 	_context->_session = this;
@@ -885,8 +898,7 @@ Session::Session(shared_ptr<Context> context) :
 Session::Session(shared_ptr<Context> context, string filename) :
 	UserOwned(_structure),
 	_context(context),
-	_filename(filename),
-	_saving(false)
+	_filename(filename)
 {
 	check(sr_session_load(context->_structure, filename.c_str(), &_structure));
 	GSList *dev_list;
@@ -906,9 +918,6 @@ Session::~Session()
 	for (auto callback : _datafeed_callbacks)
 		delete callback;
 
-	for (auto entry : _source_callbacks)
-		delete entry.second;
-
 	for (auto entry : _owned_devices)
 		delete entry.second;
 }
@@ -964,91 +973,29 @@ void Session::stop()
 	check(sr_session_stop(_structure));
 }
 
-void Session::begin_save(string filename)
+bool Session::is_running() const
 {
-	_saving = true;
-	_save_initialized = false;
-	_save_filename = filename;
-	_save_samplerate = 0;
+	const int ret = sr_session_is_running(_structure);
+	if (ret < 0)
+		throw Error{ret};
+	return (ret != 0);
 }
 
-void Session::append(shared_ptr<Packet> packet)
+static void session_stopped_callback(void *data)
 {
-	if (!_saving)
-		throw Error(SR_ERR);
-
-	switch (packet->_structure->type)
-	{
-		case SR_DF_META:
-		{
-			auto meta = (const struct sr_datafeed_meta *)
-				packet->_structure->payload;
-
-			for (auto l = meta->config; l; l = l->next)
-			{
-				auto config = (struct sr_config *) l->data;
-				if (config->key == SR_CONF_SAMPLERATE)
-					_save_samplerate = g_variant_get_uint64(config->data);
-			}
-
-			break;
-		}
-		case SR_DF_LOGIC:
-		{
-			if (_save_samplerate == 0)
-			{
-				GVariant *samplerate;
-
-				check(sr_config_get(sr_dev_inst_driver_get(packet->_device->_structure),
-					packet->_device->_structure, NULL, SR_CONF_SAMPLERATE,
-					&samplerate));
-
-				_save_samplerate = g_variant_get_uint64(samplerate);
-
-				g_variant_unref(samplerate);
-			}
-
-			if (!_save_initialized)
-			{
-				vector<shared_ptr<Channel>> save_channels;
-
-				for (auto channel : packet->_device->channels())
-					if (channel->_structure->enabled &&
-							channel->_structure->type == SR_CHANNEL_LOGIC)
-						save_channels.push_back(channel);
-
-				auto channels = g_new(char *, save_channels.size());
-
-				int i = 0;
-				for (auto channel : save_channels)
-						channels[i++] = channel->_structure->name;
-				channels[i] = NULL;
-
-				int ret = sr_session_save_init(_structure, _save_filename.c_str(),
-						_save_samplerate, channels);
-
-				g_free(channels);
-
-				if (ret != SR_OK)
-					throw Error(ret);
-
-				_save_initialized = true;
-			}
-
-			auto logic = (const struct sr_datafeed_logic *)
-				packet->_structure->payload;
-
-			check(sr_session_append(_structure, _save_filename.c_str(),
-				(uint8_t *) logic->data, logic->unitsize,
-				logic->length / logic->unitsize));
-		}
-	}
+	auto *const callback = static_cast<SessionStoppedCallback*>(data);
+	(*callback)();
 }
 
-void Session::append(void *data, size_t length, unsigned int unit_size)
+void Session::set_stopped_callback(SessionStoppedCallback callback)
 {
-	check(sr_session_append(_structure, _save_filename.c_str(),
-		(uint8_t *) data, unit_size, length));
+	_stopped_callback = move(callback);
+	if (_stopped_callback)
+		check(sr_session_stopped_callback_set(_structure,
+				&session_stopped_callback, &_stopped_callback));
+	else
+		check(sr_session_stopped_callback_set(_structure,
+				nullptr, nullptr));
 }
 
 static void datafeed_callback(const struct sr_dev_inst *sdi,
@@ -1074,66 +1021,6 @@ void Session::remove_datafeed_callbacks(void)
 	_datafeed_callbacks.clear();
 }
 
-static int source_callback(int fd, int revents, void *cb_data)
-{
-	(void) fd;
-	auto callback = (SourceCallbackData *) cb_data;
-	return callback->run(revents);
-}
-
-void Session::add_source(shared_ptr<EventSource> source)
-{
-	if (_source_callbacks.count(source) == 1)
-		throw Error(SR_ERR_ARG);
-
-	auto cb_data = new SourceCallbackData(source);
-
-	switch (source->_type)
-	{
-		case EventSource::SOURCE_FD:
-			check(sr_session_source_add(_structure, source->_fd, source->_events,
-				source->_timeout, source_callback, cb_data));
-			break;
-		case EventSource::SOURCE_POLLFD:
-			check(sr_session_source_add_pollfd(_structure,
-				source->_pollfd.gobj(), source->_timeout, source_callback,
-				cb_data));
-			break;
-		case EventSource::SOURCE_IOCHANNEL:
-			check(sr_session_source_add_channel(_structure,
-				source->_channel->gobj(), source->_events, source->_timeout,
-				source_callback, cb_data));
-			break;
-	}
-
-	_source_callbacks[source] = cb_data;
-}
-
-void Session::remove_source(shared_ptr<EventSource> source)
-{
-	if (_source_callbacks.count(source) == 0)
-		throw Error(SR_ERR_ARG);
-
-	switch (source->_type)
-	{
-		case EventSource::SOURCE_FD:
-			check(sr_session_source_remove(_structure, source->_fd));
-			break;
-		case EventSource::SOURCE_POLLFD:
-			check(sr_session_source_remove_pollfd(_structure,
-				source->_pollfd.gobj()));
-			break;
-		case EventSource::SOURCE_IOCHANNEL:
-			check(sr_session_source_remove_channel(_structure,
-				source->_channel->gobj()));
-			break;
-	}
-
-	delete _source_callbacks[source];
-
-	_source_callbacks.erase(source);
-}
-
 shared_ptr<Trigger> Session::trigger()
 {
 	return _trigger;
@@ -1181,9 +1068,9 @@ Packet::Packet(shared_ptr<Device> device,
 				static_cast<const struct sr_datafeed_logic *>(
 					structure->payload));
 			break;
-		case SR_DF_ANALOG:
-			_payload = new Analog(
-				static_cast<const struct sr_datafeed_analog *>(
+		case SR_DF_ANALOG_OLD:
+			_payload = new AnalogOld(
+				static_cast<const struct sr_datafeed_analog_old *>(
 					structure->payload));
 			break;
 		default:
@@ -1305,33 +1192,33 @@ unsigned int Logic::unit_size()
 	return _structure->unitsize;
 }
 
-Analog::Analog(const struct sr_datafeed_analog *structure) :
+AnalogOld::AnalogOld(const struct sr_datafeed_analog_old *structure) :
 	ParentOwned(structure),
 	PacketPayload()
 {
 }
 
-Analog::~Analog()
+AnalogOld::~AnalogOld()
 {
 }
 
-shared_ptr<PacketPayload> Analog::get_shared_pointer(Packet *_parent)
+shared_ptr<PacketPayload> AnalogOld::get_shared_pointer(Packet *_parent)
 {
 	return static_pointer_cast<PacketPayload>(
 		ParentOwned::get_shared_pointer(_parent));
 }
 
-float *Analog::data_pointer()
+float *AnalogOld::data_pointer()
 {
 	return _structure->data;
 }
 
-unsigned int Analog::num_samples()
+unsigned int AnalogOld::num_samples()
 {
 	return _structure->num_samples;
 }
 
-vector<shared_ptr<Channel>> Analog::channels()
+vector<shared_ptr<Channel>> AnalogOld::channels()
 {
 	vector<shared_ptr<Channel>> result;
 	for (auto l = _structure->channels; l; l = l->next)
@@ -1340,17 +1227,17 @@ vector<shared_ptr<Channel>> Analog::channels()
 	return result;
 }
 
-const Quantity *Analog::mq()
+const Quantity *AnalogOld::mq()
 {
 	return Quantity::get(_structure->mq);
 }
 
-const Unit *Analog::unit()
+const Unit *AnalogOld::unit()
 {
 	return Unit::get(_structure->unit);
 }
 
-vector<const QuantityFlag *> Analog::mq_flags()
+vector<const QuantityFlag *> AnalogOld::mq_flags()
 {
 	return QuantityFlag::flags_from_mask(_structure->mqflags);
 }