cxx: Implement more of EnumValue in template.

[libsigrok.git] / bindings / cxx / include / libsigrok / libsigrok.hpp

diff --git a/bindings/cxx/include/libsigrok/libsigrok.hpp b/bindings/cxx/include/libsigrok/libsigrok.hpp
index 0bf19015b22bee0d0068983d7fcfacd0d9b86504..3582646fee28954fb772e41986cd7adebe378a9c 100644 (file)
--- a/bindings/cxx/include/libsigrok/libsigrok.hpp
+++ b/bindings/cxx/include/libsigrok/libsigrok.hpp
@@ -149,6 +149,12 @@ protected:
        weak_ptr<Class> _weak_this;
 
 public:
+       /* Get parent object that owns this object. */
+       shared_ptr<Parent> parent()
+       {
+               return _parent;
+       }
+
        /* Note, this implementation will create a new smart_ptr if none exists. */
        shared_ptr<Class> shared_from_this()
        {
@@ -346,8 +352,6 @@ protected:
 class SR_API Device : public Configurable
 {
 public:
-       /** Description identifying this device. */
-       string description();
        /** Vendor name for this device. */
        string vendor();
        /** Model name for this device. */
@@ -664,6 +668,8 @@ public:
        /** Set trigger setting.
         * @param trigger Trigger object to use. */
        void set_trigger(shared_ptr<Trigger> trigger);
+       /** Get filename this session was loaded from. */
+       string filename();
 protected:
        Session(shared_ptr<Context> context);
        Session(shared_ptr<Context> context, string filename);
@@ -674,6 +680,7 @@ protected:
        map<const struct sr_dev_inst *, shared_ptr<Device> > _other_devices;
        vector<DatafeedCallbackData *> _datafeed_callbacks;
        map<shared_ptr<EventSource>, SourceCallbackData *> _source_callbacks;
+       string _filename;
        bool _saving;
        bool _save_initialized;
        string _save_filename;
@@ -682,6 +689,7 @@ protected:
        friend class Deleter;
        friend class Context;
        friend class DatafeedCallbackData;
+       friend class SessionDevice;
 };
 
 /** A packet on the session datafeed */
@@ -927,17 +935,44 @@ protected:
 };
 
 /** Base class for objects which wrap an enumeration value from libsigrok */
-template <typename T> class SR_API EnumValue
+template <class Class, typename Enum> class SR_API EnumValue
 {
 public:
-       /** The enum constant associated with this value. */
-       T id() const { return _id; }
+       /** The integer constant associated with this value. */
+       int id() const
+       {
+               return static_cast<int>(_id);
+       }
        /** The name associated with this value. */
-       string name() const { return _name; }
+       string name() const
+       {
+               return _name;
+       }
+       /** Get value associated with a given integer constant. */
+       static const Class *get(int id)
+       {
+               auto key = static_cast<Enum>(id);
+               if (_values.find(key) == _values.end())
+                       throw Error(SR_ERR_ARG);
+               return _values.at(key);
+       }
+       /** Get possible values. */
+       static std::vector<const Class *> values()
+       {
+               std::vector<const Class *> result;
+               for (auto entry : _values)
+                       result.push_back(entry.second);
+               return result;
+       }
 protected:
-       EnumValue(T id, const char name[]) : _id(id), _name(name) {}
-       ~EnumValue() {}
-       const T _id;
+       EnumValue(Enum id, const char name[]) : _id(id), _name(name)
+       {
+       }
+       ~EnumValue()
+       {
+       }
+       static const std::map<const Enum, const Class * const> _values;
+       const Enum _id;
        const string _name;
 };