Move device open and config_set calls to client.

[libsigrokflow.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index c611157a46cfbbb97fa4943ca29b1761cd70dc88..1601d868528f143f459d125228c06523d7c43996 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -34,7 +34,22 @@ void init()
                        "sigrok_legacy_capture_device",
                        "Wrapper for capture devices using legacy libsigrok APIs",
                        sigc::ptr_fun(&LegacyCaptureDevice::register_element),
-                       "0.01", "GPLv3+", "sigrok", "libsigrokflow", "http://sigrok.org");
+                       "0.01", "GPL", "sigrok", "libsigrokflow", "http://sigrok.org");
+}
+
+GstBlock::GstBlock(GstElement *gobj) :
+       Gst::Element(gobj)
+{
+}
+
+Device::Device(GstElement *gobj) :
+       GstBlock(gobj)
+{
+}
+
+CaptureDevice::CaptureDevice(GstElement *gobj) :
+       Device(gobj)
+{
 }
 
 void LegacyCaptureDevice::class_init(Gst::ElementClass<LegacyCaptureDevice> *klass)
@@ -88,9 +103,6 @@ Gst::StateChangeReturn LegacyCaptureDevice::change_state_vfunc(Gst::StateChange
                case Gst::STATE_CHANGE_READY_TO_PAUSED:
                        return Gst::StateChangeReturn::STATE_CHANGE_NO_PREROLL;
                case Gst::STATE_CHANGE_PAUSED_TO_PLAYING:
-                       _libsigrok_device->open();
-                       _libsigrok_device->config_set(sigrok::ConfigKey::LIMIT_SAMPLES,
-                                       Glib::Variant<int>::create(10));
                        _task = Gst::Task::create(std::bind(&LegacyCaptureDevice::_run, this));
                        _task->set_lock(_mutex);
                        _src_pad->set_active(true);