X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fmain.cpp;h=1b1193f04915b5d6219cc5f2d0e901aa7b5ed078;hb=fc5450cb62d7dc06f7928e5dfb587ccc908547d4;hp=b80d203c804e77853dbe0da7cb19a0cfda5d880a;hpb=b1322000ef157ecc1a2716a3b89e967a1e0ce97a;p=libsigrokflow.git

diff --git a/src/main.cpp b/src/main.cpp
index b80d203..1b1193f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,7 @@
 /*
  * This file is part of the libsigrokflow project.
  *
+ * Copyright (C) 2018 Martin Ling <martin-sigrok@earth.li>
  * Copyright (C) 2018 Uwe Hermann <uwe@hermann-uwe.de>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -18,11 +19,8 @@
  */
 
 #include <config.h>
-#include <libsigrokflow/libsigrokflow.hpp>
-
-#include <libsigrokdecode/libsigrokdecode.h>
-
 #include <iostream>
+#include <libsigrokflow/libsigrokflow.hpp>
 
 namespace Srf
 {
@@ -30,25 +28,6 @@ namespace Srf
 using namespace std;
 using namespace std::placeholders;
 
-void init()
-{
-	Gst::Plugin::register_static(GST_VERSION_MAJOR, GST_VERSION_MINOR,
-			"sigrok_legacy_capture_device",
-			"Wrapper for capture devices using legacy libsigrok APIs",
-			sigc::ptr_fun(&LegacyCaptureDevice::register_element),
-			"0.01", "GPL", "sigrok", "libsigrokflow", "http://sigrok.org");
-	Gst::Plugin::register_static(GST_VERSION_MAJOR, GST_VERSION_MINOR,
-			"sigrok_legacy_output",
-			"Wrapper for outputs using legacy libsigrok APIs",
-			sigc::ptr_fun(&LegacyOutput::register_element),
-			"0.01", "GPL", "sigrok", "libsigrokflow", "http://sigrok.org");
-	Gst::Plugin::register_static(GST_VERSION_MAJOR, GST_VERSION_MINOR,
-			"sigrok_legacy_decoder",
-			"Wrapper for protocol decoders using legacy libsigrokdecode APIs",
-			sigc::ptr_fun(&LegacyDecoder::register_element),
-			"0.01", "GPL", "sigrok", "libsigrokflow", "http://sigrok.org");
-}
-
 Sink::Sink(GstBaseSink *gobj) :
 	Gst::BaseSink(gobj)
 {
@@ -64,6 +43,7 @@ CaptureDevice::CaptureDevice(GstElement *gobj) :
 {
 }
 
+#ifdef HAVE_LIBSIGROKCXX
 void LegacyCaptureDevice::class_init(Gst::ElementClass<LegacyCaptureDevice> *klass)
 {
 	klass->set_metadata("sigrok legacy capture device",
@@ -82,6 +62,7 @@ bool LegacyCaptureDevice::register_element(Glib::RefPtr<Gst::Plugin> plugin)
 	Gst::ElementFactory::register_element(plugin, "sigrok_legacy_capture_device",
 			0, Gst::register_mm_type<LegacyCaptureDevice>(
 				"sigrok_legacy_capture_device"));
+
 	return true;
 }
 
@@ -89,7 +70,7 @@ LegacyCaptureDevice::LegacyCaptureDevice(GstElement *gobj) :
 	Glib::ObjectBase(typeid(LegacyCaptureDevice)),
 	CaptureDevice(gobj)
 {
-	add_pad(_src_pad = Gst::Pad::create(get_pad_template("src"), "src"));
+	add_pad(src_pad_ = Gst::Pad::create(get_pad_template("src"), "src"));
 }
 
 Glib::RefPtr<LegacyCaptureDevice>LegacyCaptureDevice::create(
@@ -99,69 +80,179 @@ Glib::RefPtr<LegacyCaptureDevice>LegacyCaptureDevice::create(
 	if (!element)
 		throw runtime_error("Failed to create element - plugin not registered?");
 	auto device = Glib::RefPtr<LegacyCaptureDevice>::cast_static(element);
-	device->_libsigrok_device = libsigrok_device;
+	device->libsigrok_device_ = libsigrok_device;
+
 	return device;
 }
 
 shared_ptr<sigrok::HardwareDevice> LegacyCaptureDevice::libsigrok_device()
 {
-	return _libsigrok_device;
+	return libsigrok_device_;
 }
 
 Gst::StateChangeReturn LegacyCaptureDevice::change_state_vfunc(Gst::StateChange transition)
 {
-	switch (transition)
-	{
-		case Gst::STATE_CHANGE_READY_TO_PAUSED:
-			return Gst::StateChangeReturn::STATE_CHANGE_NO_PREROLL;
-		case Gst::STATE_CHANGE_PAUSED_TO_PLAYING:
-			_task = Gst::Task::create(std::bind(&LegacyCaptureDevice::_run, this));
-			_task->set_lock(_mutex);
-			_src_pad->set_active(true);
-			_task->start();
-			return Gst::STATE_CHANGE_SUCCESS;
-		default:
-			return Gst::STATE_CHANGE_SUCCESS;
+	switch (transition) {
+	case Gst::STATE_CHANGE_READY_TO_PAUSED:
+		return Gst::StateChangeReturn::STATE_CHANGE_NO_PREROLL;
+	case Gst::STATE_CHANGE_PAUSED_TO_PLAYING:
+		task_ = Gst::Task::create(std::bind(&LegacyCaptureDevice::run_, this));
+		task_->set_lock(mutex_);
+		src_pad_->set_active(true);
+		task_->start();
+		return Gst::STATE_CHANGE_SUCCESS;
+	default:
+		return Gst::STATE_CHANGE_SUCCESS;
 	}
 }
 
-void LegacyCaptureDevice::_datafeed_callback(
+void LegacyCaptureDevice::datafeed_callback_(
 	shared_ptr<sigrok::Device> device,
 	shared_ptr<sigrok::Packet> packet)
 {
-	(void) device;
+	(void)device;
+
 	switch (packet->type()->id()) {
-		case SR_DF_LOGIC:
-		{
-			auto logic = static_pointer_cast<sigrok::Logic>(packet->payload());
-			auto mem = Gst::Memory::create(
-					Gst::MEMORY_FLAG_READONLY,
-					logic->data_pointer(),
-					logic->data_length(),
-					0,
-					logic->data_length());
-			auto buf = Gst::Buffer::create();
-			buf->append_memory(move(mem));
-			_src_pad->push(move(buf));
-			break;
-		}
-		case SR_DF_END:
-			_session->stop();
-			_src_pad->push_event(Gst::EventEos::create());
-			break;
-		default:
-			break;
+	case SR_DF_LOGIC: {
+		auto logic = static_pointer_cast<sigrok::Logic>(packet->payload());
+		auto mem = Gst::Memory::create(
+				Gst::MEMORY_FLAG_READONLY,
+				logic->data_pointer(),
+				logic->data_length(),
+				0,
+				logic->data_length());
+		auto buf = Gst::Buffer::create();
+		buf->append_memory(move(mem));
+		src_pad_->push(move(buf));
+		break;
+	}
+	case SR_DF_END:
+		session_->stop();
+		src_pad_->push_event(Gst::EventEos::create());
+		break;
+	default:
+		break;
 	}
 }
 
-void LegacyCaptureDevice::_run()
+void LegacyCaptureDevice::run_()
 {
-	_session = _libsigrok_device->driver()->parent()->create_session();
-	_session->add_device(_libsigrok_device);
-	_session->add_datafeed_callback(bind(&LegacyCaptureDevice::_datafeed_callback, this, _1, _2));
-	_session->start();
-	_session->run();
-	_task->stop();
+	session_ = libsigrok_device_->driver()->parent()->create_session();
+	session_->add_device(libsigrok_device_);
+	session_->add_datafeed_callback(bind(&LegacyCaptureDevice::datafeed_callback_, this, _1, _2));
+	session_->start();
+	session_->run();
+	task_->stop();
+}
+
+void LegacyInput::class_init(Gst::ElementClass<LegacyInput> *klass)
+{
+	klass->set_metadata("sigrok legacy input",
+			"Transform", "Wrapper for inputs using legacy libsigrok APIs",
+			"Martin Ling");
+
+	klass->add_pad_template(Gst::PadTemplate::create(
+			"sink",
+			Gst::PAD_SINK,
+			Gst::PAD_ALWAYS,
+			Gst::Caps::create_any()));
+
+	klass->add_pad_template(Gst::PadTemplate::create(
+			"src",
+			Gst::PAD_SRC,
+			Gst::PAD_ALWAYS,
+			Gst::Caps::create_any()));
+}
+
+bool LegacyInput::register_element(Glib::RefPtr<Gst::Plugin> plugin)
+{
+	Gst::ElementFactory::register_element(plugin, "sigrok_legacy_input",
+			0, Gst::register_mm_type<LegacyInput>(
+				"sigrok_legacy_input"));
+
+	return true;
+}
+
+LegacyInput::LegacyInput(GstElement *gobj) :
+	Glib::ObjectBase(typeid(LegacyInput)),
+	Gst::Element(gobj)
+{
+	add_pad(sink_pad_ = Gst::Pad::create(get_pad_template("sink"), "sink"));
+	add_pad(src_pad_ = Gst::Pad::create(get_pad_template("src"), "src"));
+	sink_pad_->set_chain_function(sigc::mem_fun(*this, &LegacyInput::chain));
+}
+
+Glib::RefPtr<LegacyInput> LegacyInput::create(
+	shared_ptr<sigrok::InputFormat> libsigrok_input_format,
+	map<string, Glib::VariantBase> options)
+{
+	auto element = Gst::ElementFactory::create_element("sigrok_legacy_input");
+	if (!element)
+		throw runtime_error("Failed to create element - plugin not registered?");
+	auto input = Glib::RefPtr<LegacyInput>::cast_static(element);
+	input->libsigrok_input_format_ = libsigrok_input_format;
+	input->options_ = options;
+
+	return input;
+}
+
+bool LegacyInput::start_vfunc()
+{
+	libsigrok_input_ = libsigrok_input_format_->create_input(options_);
+	auto context = libsigrok_input_format_->parent();
+	session_ = context->create_session();
+	session_->add_device(libsigrok_input_->device());
+	session_->add_datafeed_callback(bind(&LegacyInput::datafeed_callback_, this, _1, _2));
+	session_->start();
+
+	return true;
+}
+
+void LegacyInput::datafeed_callback_(
+	shared_ptr<sigrok::Device> device,
+	shared_ptr<sigrok::Packet> packet)
+{
+	(void)device;
+
+	switch (packet->type()->id()) {
+	case SR_DF_LOGIC: {
+		auto logic = static_pointer_cast<sigrok::Logic>(packet->payload());
+		auto mem = Gst::Memory::create(
+				Gst::MEMORY_FLAG_READONLY,
+				logic->data_pointer(),
+				logic->data_length(),
+				0,
+				logic->data_length());
+		auto buf = Gst::Buffer::create();
+		buf->append_memory(move(mem));
+		src_pad_->push(move(buf));
+		break;
+	}
+	case SR_DF_END:
+		session_->stop();
+		src_pad_->push_event(Gst::EventEos::create());
+		break;
+	default:
+		break;
+	}
+}
+
+Gst::FlowReturn LegacyInput::chain(const Glib::RefPtr<Gst::Pad> &,
+	const Glib::RefPtr<Gst::Buffer> &buf)
+{
+	Gst::MapInfo info;
+	buf->map(info, Gst::MAP_READ);
+	libsigrok_input_->send(info.get_data(), info.get_size());
+	buf->unmap(info);
+
+	return Gst::FLOW_OK;
+}
+
+bool LegacyInput::stop_vfunc()
+{
+	libsigrok_input_->end();
+
+	return true;
 }
 
 void LegacyOutput::class_init(Gst::ElementClass<LegacyOutput> *klass)
@@ -182,6 +273,7 @@ bool LegacyOutput::register_element(Glib::RefPtr<Gst::Plugin> plugin)
 	Gst::ElementFactory::register_element(plugin, "sigrok_legacy_output",
 			0, Gst::register_mm_type<LegacyOutput>(
 				"sigrok_legacy_output"));
+
 	return true;
 }
 
@@ -200,16 +292,18 @@ Glib::RefPtr<LegacyOutput>LegacyOutput::create(
 	if (!element)
 		throw runtime_error("Failed to create element - plugin not registered?");
 	auto output = Glib::RefPtr<LegacyOutput>::cast_static(element);
-	output->_libsigrok_output_format = libsigrok_output_format;
-	output->_libsigrok_device = libsigrok_device;
-	output->_options = options;
+	output->libsigrok_output_format_ = libsigrok_output_format;
+	output->libsigrok_device_ = libsigrok_device;
+	output->options_ = options;
+
 	return output;
 }
 
 bool LegacyOutput::start_vfunc()
 {
-	_libsigrok_output = _libsigrok_output_format->create_output(
-			_libsigrok_device, _options);
+	libsigrok_output_ = libsigrok_output_format_->create_output(
+			libsigrok_device_, options_);
+
 	return true;
 }
 
@@ -217,24 +311,28 @@ Gst::FlowReturn LegacyOutput::render_vfunc(const Glib::RefPtr<Gst::Buffer> &buff
 {
 	Gst::MapInfo info;
 	buffer->map(info, Gst::MAP_READ);
-	auto context = _libsigrok_output_format->parent();
+	auto context = libsigrok_output_format_->parent();
 	auto packet = context->create_logic_packet(
 			info.get_data(), info.get_size(), 2);
-	auto result = _libsigrok_output->receive(packet);
+	auto result = libsigrok_output_->receive(packet);
 	cout << result;
 	buffer->unmap(info);
+
 	return Gst::FLOW_OK;
 }
 
 bool LegacyOutput::stop_vfunc()
 {
-	auto context = _libsigrok_output_format->parent();
+	auto context = libsigrok_output_format_->parent();
 	auto end_packet = context->create_end_packet();
-	auto result = _libsigrok_output->receive(end_packet);
+	auto result = libsigrok_output_->receive(end_packet);
 	cout << result;
+
 	return true;
 }
+#endif
 
+#ifdef HAVE_LIBSIGROKDECODE
 void LegacyDecoder::class_init(Gst::ElementClass<LegacyDecoder> *klass)
 {
 	klass->set_metadata("sigrok legacy decoder",
@@ -253,6 +351,7 @@ bool LegacyDecoder::register_element(Glib::RefPtr<Gst::Plugin> plugin)
 	Gst::ElementFactory::register_element(plugin, "sigrok_legacy_decoder",
 			0, Gst::register_mm_type<LegacyDecoder>(
 				"sigrok_legacy_decoder"));
+
 	return true;
 }
 
@@ -269,39 +368,44 @@ Glib::RefPtr<LegacyDecoder>LegacyDecoder::create(
 	if (!element)
 		throw runtime_error("Failed to create element - plugin not registered?");
 	auto decoder = Glib::RefPtr<LegacyDecoder>::cast_static(element);
-	decoder->_session = libsigrokdecode_session;
-	decoder->_unitsize = unitsize;
+	decoder->session_ = libsigrokdecode_session;
+	decoder->unitsite_ = unitsize;
+
 	return decoder;
 }
 
 struct srd_session *LegacyDecoder::libsigrokdecode_session()
 {
-	return _session;
+	return session_;
 }
 
 Gst::FlowReturn LegacyDecoder::render_vfunc(const Glib::RefPtr<Gst::Buffer> &buffer)
 {
 	Gst::MapInfo info;
 	buffer->map(info, Gst::MAP_READ);
-	uint64_t num_samples = info.get_size() / _unitsize;
-	srd_session_send(_session, _abs_ss, _abs_ss + num_samples,
-		info.get_data(), info.get_size(), _unitsize);
-	_abs_ss += num_samples;
+	uint64_t num_samples = info.get_size() / unitsite_;
+	srd_session_send(session_, abs_ss_, abs_ss_ + num_samples,
+		info.get_data(), info.get_size(), unitsite_);
+	abs_ss_ += num_samples;
 	buffer->unmap(info);
+
 	return Gst::FLOW_OK;
 }
 
 bool LegacyDecoder::start_vfunc()
 {
-	_abs_ss = 0;
-	srd_session_start(_session);
+	abs_ss_ = 0;
+	srd_session_start(session_);
+
 	return true;
 }
 
 bool LegacyDecoder::stop_vfunc()
 {
-	srd_session_terminate_reset(_session);
+	srd_session_terminate_reset(session_);
+
 	return true;
 }
+#endif
 
 }