Fix implementation of LegacyInput.

[libsigrokflow.git] / include / libsigrokflow / libsigrokflow.hpp

diff --git a/include/libsigrokflow/libsigrokflow.hpp b/include/libsigrokflow/libsigrokflow.hpp
index baa41f2af54c971830234bd0fcfea671eb727141..8f188248749e6bcf6693d22b5409650349e872c9 100644 (file)
--- a/include/libsigrokflow/libsigrokflow.hpp
+++ b/include/libsigrokflow/libsigrokflow.hpp
@@ -85,7 +85,7 @@ public:
        shared_ptr<sigrok::HardwareDevice> libsigrok_device();
 
        /* Override state change. */
-       Gst::StateChangeReturn change_state_vfunc(Gst::StateChange transition);
+       Gst::StateChangeReturn change_state_vfunc(Gst::StateChange transition) override;
 
        /* Gst class init. */
        static void class_init(Gst::ElementClass<LegacyCaptureDevice> *klass);
@@ -103,9 +103,9 @@ private:
        Glib::RefPtr<Gst::Task> task_;
        shared_ptr<sigrok::Session> session_;
 
-       void datafeed_callback_(shared_ptr<sigrok::Device> device,
+       void datafeed_callback(shared_ptr<sigrok::Device> device,
                        shared_ptr<sigrok::Packet> packet);
-       void run_();
+       void run();
 };
 
 class LegacyInput :
@@ -117,15 +117,13 @@ public:
                shared_ptr<sigrok::InputFormat> format,
                map<string, Glib::VariantBase> options = map<string, Glib::VariantBase>());
 
-       /* Override start. */
-       bool start_vfunc();
-
-       /* Chain function. */
+       /* Chain function (not an override). */
        Gst::FlowReturn chain(const Glib::RefPtr<Gst::Pad> &pad,
                        const Glib::RefPtr<Gst::Buffer> &buf);
 
-       /* Override stop. */
-       bool stop_vfunc();
+       /* Event function (not an override). */
+       bool event(const Glib::RefPtr<Gst::Pad> &pad,
+                       Glib::RefPtr<Gst::Event> &event);
 
        /* Gst class init. */
        static void class_init(Gst::ElementClass<LegacyInput> *klass);
@@ -144,7 +142,7 @@ private:
        Glib::RefPtr<Gst::Pad> sink_pad_;
        Glib::RefPtr<Gst::Pad> src_pad_;
 
-       void datafeed_callback_(shared_ptr<sigrok::Device> device,
+       void datafeed_callback(shared_ptr<sigrok::Device> device,
                        shared_ptr<sigrok::Packet> packet);
 };
 
@@ -155,17 +153,16 @@ public:
        /* Create from libsigrok output object. */
        static Glib::RefPtr<LegacyOutput> create(
                shared_ptr<sigrok::OutputFormat> libsigrok_output_format,
-               shared_ptr<sigrok::Device> libsigrok_device,
                map<string, Glib::VariantBase> options = map<string, Glib::VariantBase>());
 
        /* Override start. */
-       bool start_vfunc();
+       bool start_vfunc() override;
 
        /* Override render. */
-       Gst::FlowReturn render_vfunc(const Glib::RefPtr<Gst::Buffer> &buffer);
+       Gst::FlowReturn render_vfunc(const Glib::RefPtr<Gst::Buffer> &buffer) override;
 
        /* Override stop. */
-       bool stop_vfunc();
+       bool stop_vfunc() override;
 
        /* Gst class init. */
        static void class_init(Gst::ElementClass<LegacyOutput> *klass);
@@ -196,13 +193,13 @@ public:
        struct srd_session *libsigrokdecode_session();
 
        /* Override start. */
-       bool start_vfunc();
+       bool start_vfunc() override;
 
        /* Override render. */
-       Gst::FlowReturn render_vfunc(const Glib::RefPtr<Gst::Buffer> &buffer);
+       Gst::FlowReturn render_vfunc(const Glib::RefPtr<Gst::Buffer> &buffer) override;
 
        /* Override stop. */
-       bool stop_vfunc();
+       bool stop_vfunc() override;
 
        /* Gst class init. */
        static void class_init(Gst::ElementClass<LegacyDecoder> *klass);