#define LIBSIGROKCXX_HPP
#include <libsigrok/libsigrok.h>
+
+/* Suppress warnings due to glibmm's use of std::auto_ptr<> in a public
+ * header file. To be removed once glibmm is fixed. */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
#include <glibmm.h>
+G_GNUC_END_IGNORE_DEPRECATIONS
#include <stdexcept>
#include <memory>
shared_ptr<Packet> create_header_packet(Glib::TimeVal start_time);
/** Create a meta packet. */
shared_ptr<Packet> create_meta_packet(
- const map<const ConfigKey *, Glib::VariantBase> &config);
+ map<const ConfigKey *, Glib::VariantBase> config);
/** Create a logic packet. */
shared_ptr<Packet> create_logic_packet(
void *data_pointer, size_t data_length, unsigned int unit_size);
/** Create an analog packet. */
shared_ptr<Packet> create_analog_packet(
- const vector<shared_ptr<Channel> > &channels,
+ vector<shared_ptr<Channel> > channels,
float *data_pointer, unsigned int num_samples, const Quantity *mq,
- const Unit *unit, const vector<const QuantityFlag *> &mqflags);
+ const Unit *unit, vector<const QuantityFlag *> mqflags);
/** Load a saved session.
* @param filename File name string. */
shared_ptr<Session> load_session(string filename);
~Context();
friend class Session;
friend class Driver;
- friend class std::default_delete<Context>;
+ friend struct std::default_delete<Context>;
};
enum Capability {
* @param key ConfigKey to enumerate values for. */
Glib::VariantContainerBase config_list(const ConfigKey *key) const;
/** Enumerate available keys, according to a given index key. */
- map<const ConfigKey *, set<Capability> > config_keys(const ConfigKey *key);
+ map<const ConfigKey *, set<enum Capability> > config_keys(const ConfigKey *key);
/** Check for a key in the list from a given index key. */
bool config_check(const ConfigKey *key, const ConfigKey *index_key) const;
protected:
string long_name() const;
/** Scan for devices and return a list of devices found.
* @param options Mapping of (ConfigKey, value) pairs. */
- vector<shared_ptr<HardwareDevice> > scan(
- const map<const ConfigKey *, Glib::VariantBase> &options = {});
+ vector<shared_ptr<HardwareDevice> > scan(map<const ConfigKey *, Glib::VariantBase>
+ options = map<const ConfigKey *, Glib::VariantBase>());
private:
struct sr_dev_driver *_structure;
bool _initialized;
friend class Context;
friend class HardwareDevice;
friend class ChannelGroup;
- friend class std::default_delete<Driver>;
+ friend struct std::default_delete<Driver>;
};
/** A generic device, either hardware or virtual */
friend class ChannelGroup;
friend class Output;
friend class Analog;
- friend class std::default_delete<Device>;
+ friend struct std::default_delete<Device>;
};
/** A real hardware device, connected via a driver */
friend class Driver;
friend class ChannelGroup;
- friend class std::default_delete<HardwareDevice>;
+ friend struct std::default_delete<HardwareDevice>;
};
/** A virtual device, created by the user */
shared_ptr<Device> get_shared_from_this();
friend class Context;
- friend class std::default_delete<UserDevice>;
+ friend struct std::default_delete<UserDevice>;
};
/** A channel on a device */
friend class Session;
friend class TriggerStage;
friend class Context;
- friend class std::default_delete<Channel>;
+ friend struct std::default_delete<Channel>;
};
/** A group of channels on a device, which share some configuration */
~ChannelGroup();
vector<Channel *> _channels;
friend class Device;
- friend class std::default_delete<ChannelGroup>;
+ friend struct std::default_delete<ChannelGroup>;
};
/** A trigger configuration */
vector<unique_ptr<TriggerStage> > _stages;
friend class Context;
friend class Session;
- friend class std::default_delete<Trigger>;
+ friend struct std::default_delete<Trigger>;
};
/** A stage in a trigger configuration */
explicit TriggerStage(struct sr_trigger_stage *structure);
~TriggerStage();
friend class Trigger;
- friend class std::default_delete<TriggerStage>;
+ friend struct std::default_delete<TriggerStage>;
};
/** A match condition in a trigger configuration */
struct sr_trigger_match *_structure;
shared_ptr<Channel> _channel;
friend class TriggerStage;
- friend class std::default_delete<TriggerMatch>;
+ friend struct std::default_delete<TriggerMatch>;
};
/** Type of session stopped callback */
shared_ptr<Device> get_shared_from_this();
friend class Session;
- friend class std::default_delete<SessionDevice>;
+ friend struct std::default_delete<SessionDevice>;
};
/** A sigrok session */
friend class Context;
friend class DatafeedCallbackData;
friend class SessionDevice;
- friend class std::default_delete<Session>;
+ friend struct std::default_delete<Session>;
};
/** A packet on the session datafeed */
friend class Logic;
friend class Analog;
friend class Context;
- friend
class std::default_delete<Packet>;
+ friend
struct std::default_delete<Packet>;
};
/** Abstract base class for datafeed packet payloads */
friend class Packet;
friend class Output;
- friend
class std::default_delete<PacketPayload>;
+ friend
struct std::default_delete<PacketPayload>;
};
/** Payload of a datafeed header packet */
map<string, shared_ptr<Option> > options();
/** Create an input using this input format.
* @param options Mapping of (option name, value) pairs. */
- shared_ptr<Input> create_input(const map<string, Glib::VariantBase> &options = {});
+ shared_ptr<Input> create_input(map<string, Glib::VariantBase>
+ options = map<string, Glib::VariantBase>());
private:
explicit InputFormat(const struct sr_input_module *structure);
~InputFormat();
friend class Context;
friend class InputDevice;
- friend class std::default_delete<InputFormat>;
+ friend struct std::default_delete<InputFormat>;
};
/** An input instance (an input format applied to a file or stream) */
friend class Context;
friend class InputFormat;
- friend class std::default_delete<Input>;
+ friend struct std::default_delete<Input>;
};
/** A virtual device associated with an input */
shared_ptr<Device> get_shared_from_this();
shared_ptr<Input> _input;
friend class Input;
- friend class std::default_delete<InputDevice>;
+ friend struct std::default_delete<InputDevice>;
};
/** An option used by an output format */
friend class InputFormat;
friend class OutputFormat;
- friend class std::default_delete<Option>;
+ friend struct std::default_delete<Option>;
};
/** An output format supported by the library */
/** Create an output using this format.
* @param device Device to output for.
* @param options Mapping of (option name, value) pairs. */
- shared_ptr<Output> create_output(
- shared_ptr<Device> device,
- const map<string, Glib::VariantBase> &options = {});
+ shared_ptr<Output> create_output(shared_ptr<Device> device,
+ map<string, Glib::VariantBase> options = map<string, Glib::VariantBase>());
/** Create an output using this format.
* @param filename Name of destination file.
* @param device Device to output for.
* @param options Mapping of (option name, value) pairs. */
shared_ptr<Output> create_output(string filename,
shared_ptr<Device> device,
- const map<string, Glib::VariantBase> &options = {});
+ map<string, Glib::VariantBase> options = map<string, Glib::VariantBase>());
/**
* Checks whether a given flag is set.
* @param flag Flag to check
friend class Context;
friend class Output;
- friend class std::default_delete<OutputFormat>;
+ friend struct std::default_delete<OutputFormat>;
};
/** An output instance (an output format applied to a device) */
private:
Output(shared_ptr<OutputFormat> format, shared_ptr<Device> device);
Output(shared_ptr<OutputFormat> format,
- shared_ptr<Device> device, const map<string, Glib::VariantBase> &options);
+ shared_ptr<Device> device, map<string, Glib::VariantBase> options);
Output(string filename, shared_ptr<OutputFormat> format,
- shared_ptr<Device> device, const map<string, Glib::VariantBase> &options);
+ shared_ptr<Device> device, map<string, Glib::VariantBase> options);
~Output();
const struct sr_output *_structure;
const map<string, Glib::VariantBase> _options;
friend class OutputFormat;
- friend class std::default_delete<Output>;
+ friend struct std::default_delete<Output>;
};
/** Base class for objects which wrap an enumeration value from libsigrok */
const string _name;
};
-#include <libsigrokcxx/enums.hpp>
-
}
+#include <libsigrokcxx/enums.hpp>
+
#endif
projects / libsigrok.git / blobdiff