Factor out legacy_capture_device.hpp.

[libsigrokflow.git] / src / legacy_capture_device.cpp

diff --git a/src/legacy_capture_device.cpp b/src/legacy_capture_device.cpp
index 1a2cfa81a9d81a43ee23b3b28f50b6f5a915a997..09b7bbdec05ccb8053378f111799278cbde2c866 100644 (file)
--- a/src/legacy_capture_device.cpp
+++ b/src/legacy_capture_device.cpp
@@ -19,7 +19,8 @@
  */
 
 #include <config.h>
-#include <libsigrokflow/libsigrokflow.hpp>
+#include <libsigrokflow/legacy_capture_device.hpp>
+#include <gstreamermm/private/element_p.h>
 
 namespace Srf
 {
@@ -80,7 +81,7 @@ 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:
-               task_ = Gst::Task::create(std::bind(&LegacyCaptureDevice::run_, this));
+               task_ = Gst::Task::create(std::bind(&LegacyCaptureDevice::run, this));
                task_->set_lock(mutex_);
                src_pad_->set_active(true);
                task_->start();
@@ -90,7 +91,7 @@ Gst::StateChangeReturn LegacyCaptureDevice::change_state_vfunc(Gst::StateChange
        }
 }
 
-void LegacyCaptureDevice::datafeed_callback_(
+void LegacyCaptureDevice::datafeed_callback(
        shared_ptr<sigrok::Device> device,
        shared_ptr<sigrok::Packet> packet)
 {
@@ -119,11 +120,11 @@ void LegacyCaptureDevice::datafeed_callback_(
        }
 }
 
-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_->add_datafeed_callback(bind(&LegacyCaptureDevice::datafeed_callback, this, _1, _2));
        session_->start();
        session_->run();
        task_->stop();