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 fb0b7dfbb89f1ce3d96366952f8198d3bac2fed3..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,12
+31,12
@@
#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;
-namespace pv {
+#include <pv/sigsession.h>
-class SigSession;
+namespace pv {
namespace device {
namespace device {
@@
-51,21
+50,21
@@
protected:
public:
virtual sr_dev_inst* dev_inst() const = 0;
public:
virtual sr_dev_inst* dev_inst() const = 0;
- v
oid use(SigSession *owner
);
+ v
irtual void use(SigSession *owner) throw(QString
);
- void release();
+ v
irtual v
oid release();
SigSession* owner() const;
virtual std::string format_device_title() const = 0;
SigSession* owner() const;
virtual std::string format_device_title() const = 0;
- GVariant* get_config(const sr_
probe
_group *group, int key);
+ GVariant* get_config(const sr_
channel
_group *group, int key);
- bool set_config(const sr_
probe
_group *group, int key, GVariant *data);
+ bool set_config(const sr_
channel
_group *group, int key, GVariant *data);
- GVariant* list_config(const sr_
probe
_group *group, int key);
+ GVariant* list_config(const sr_
channel
_group *group, int key);
- void enable_probe(const sr_
probe
*probe, bool enable = true);
+ 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.
@@
-75,7
+74,14
@@
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();
protected:
void config_changed();
protected: