projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use Qt-defined keywords, they can cause problems with other headers.
[pulseview.git]
/
pv
/
device
/
devinst.h
diff --git
a/pv/device/devinst.h
b/pv/device/devinst.h
index 073813f2f7d1d03f418c05b07952ecc63fe784c4..4f0b6dec3137fedf5f679b4b015f27cacee02703 100644
(file)
--- a/
pv/device/devinst.h
+++ b/
pv/device/devinst.h
@@
-21,10
+21,9
@@
#ifndef PULSEVIEW_PV_DEVICE_DEVINST_H
#define PULSEVIEW_PV_DEVICE_DEVINST_H
#ifndef PULSEVIEW_PV_DEVICE_DEVINST_H
#define PULSEVIEW_PV_DEVICE_DEVINST_H
+#include <memory>
#include <string>
#include <string>
-#include <boost/shared_ptr.hpp>
-
#include <QObject>
#include <glib.h>
#include <QObject>
#include <glib.h>
@@
-32,30
+31,40
@@
#include <stdint.h>
struct sr_dev_inst;
#include <stdint.h>
struct sr_dev_inst;
-struct sr_probe;
-struct sr_probe_group;
+struct sr_channel;
+struct sr_channel_group;
+
+#include <pv/sigsession.h>
namespace pv {
namespace pv {
+
namespace device {
class DevInst : public QObject
{
Q_OBJECT
namespace device {
class DevInst : public QObject
{
Q_OBJECT
+protected:
+ DevInst();
+
public:
public:
- DevInst(sr_dev_inst *sdi);
+ virtual sr_dev_inst* dev_inst() const = 0;
+
+ virtual void use(SigSession *owner) throw(QString);
-
sr_dev_inst* dev_inst() const
;
+
virtual void release()
;
-
std::string format_device_title
() const;
+
SigSession* owner
() const;
-
GVariant* get_config(const sr_probe_group *group, int key)
;
+
virtual std::string format_device_title() const = 0
;
-
bool set_config(const sr_probe_group *group, int key, GVariant *data
);
+
GVariant* get_config(const sr_channel_group *group, int key
);
-
GVariant* list_config(const sr_probe_group *group, int key
);
+
bool set_config(const sr_channel_group *group, int key, GVariant *data
);
- void enable_probe(const sr_probe *probe, bool enable = true);
+ GVariant* list_config(const sr_channel_group *group, int key);
+
+ void enable_probe(const sr_channel *probe, bool enable = true);
/**
* @brief Gets the sample limit from the driver.
/**
* @brief Gets the sample limit from the driver.
@@
-65,11
+74,18
@@
public:
*/
uint64_t get_sample_limit();
*/
uint64_t get_sample_limit();
-signals:
+ virtual bool is_trigger_enabled() const;
+
+public:
+ virtual void start();
+
+ virtual void run();
+
+Q_SIGNALS:
void config_changed();
void config_changed();
-pr
ivate
:
-
sr_dev_inst *const _sdi
;
+pr
otected
:
+
SigSession *_owner
;
};
} // device
};
} // device