Initial class hierarchy.

diff --git a/include/libsigrokflow/libsigrokflow.hpp b/include/libsigrokflow/libsigrokflow.hpp
index 381c46bbbf4783aefa64efa290eb1c5c31776fe1..a5fc25314c57c3d518852a3fa6d40f55793ff254 100644 (file)
--- a/include/libsigrokflow/libsigrokflow.hpp
+++ b/include/libsigrokflow/libsigrokflow.hpp
@@ -20,11 +20,54 @@
 #ifndef LIBSIGROKFLOW_LIBSIGROKFLOW_HPP
 #define LIBSIGROKFLOW_LIBSIGROKFLOW_HPP
 
+#include <gstreamermm.h>
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
 namespace Srf
 {
 
+using namespace std;
+
 void init();
 
-}
+class Block
+{
+        /* Config API etc goes here */
+};
+
+class GstBlock :
+        public Gst::Element
+{
+        /* Operations specific to sigrok GStreamer blocks go here. */
+};
+
+class Device :
+        public GstBlock
+{
+        /* Operations specific to hardware devices go here */
+};
 
+class CaptureDevice :
+        public Device
+{
+        /* Operations specific to capture (source) devices go here */
+protected :
+        CaptureDevice();
+};
+
+class LegacyCaptureDevice :
+        public CaptureDevice
+{
+public:
+        /* Construct from libsigrok device object */
+        LegacyCaptureDevice(shared_ptr<sigrok::Device>);
+
+        /* Retrieve libsigrok device object */
+        shared_ptr<sigrok::Device> libsigrok_device();
+private:
+        shared_ptr<sigrok::Device> _device;
+};
+
+
+}
 #endif

diff --git a/src/main.cpp b/src/main.cpp
index 96d720e235a9d62228e50d7c620cfada076dd8b5..7f0c8ab4ba1b3a0fbb2f825f742e5a56529f599f 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,11 +20,25 @@
 #include <config.h>
 #include <libsigrokflow/libsigrokflow.hpp>
 
+#include <iostream>
+
 namespace Srf
 {
 
+using namespace std;
+
 void init()
 {
 }
 
+LegacyCaptureDevice::LegacyCaptureDevice(shared_ptr<sigrok::Device> device) :
+       _device(device)
+{
+}
+
+shared_ptr<sigrok::Device> LegacyCaptureDevice::libsigrok_device()
+{
+       return _device;
+}
+
 }