X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flegacy_capture_device.cpp;h=2930ad5b70673a00f3f8e18ba39a5e2318436889;hb=9710a16a95584e51590c23bff9426f532ed7b98b;hp=1a2cfa81a9d81a43ee23b3b28f50b6f5a915a997;hpb=58e83724147843f817994488ca14e905b65f38e9;p=libsigrokflow.git diff --git a/src/legacy_capture_device.cpp b/src/legacy_capture_device.cpp index 1a2cfa8..2930ad5 100644 --- a/src/legacy_capture_device.cpp +++ b/src/legacy_capture_device.cpp @@ -80,7 +80,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 +90,7 @@ Gst::StateChangeReturn LegacyCaptureDevice::change_state_vfunc(Gst::StateChange } } -void LegacyCaptureDevice::datafeed_callback_( +void LegacyCaptureDevice::datafeed_callback( shared_ptr device, shared_ptr packet) { @@ -119,11 +119,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();