projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #1182 by only considering enabled channels
[pulseview.git]
/
pv
/
devices
/
hardwaredevice.hpp
diff --git
a/pv/devices/hardwaredevice.hpp
b/pv/devices/hardwaredevice.hpp
index df11ed25783caa8221fb269a6b0b60fff3554eec..32f5b644172cca873c51b04c0102cc3a9911e6c6 100644
(file)
--- a/
pv/devices/hardwaredevice.hpp
+++ b/
pv/devices/hardwaredevice.hpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PULSEVIEW_PV_DEVICES_HARDWAREDEVICE_HPP
*/
#ifndef PULSEVIEW_PV_DEVICES_HARDWAREDEVICE_HPP
@@
-23,6
+22,9
@@
#include "device.hpp"
#include "device.hpp"
+using std::shared_ptr;
+using std::string;
+
namespace sigrok {
class Context;
class HardwareDevice;
namespace sigrok {
class Context;
class HardwareDevice;
@@
-34,29
+36,31
@@
namespace devices {
class HardwareDevice final : public Device
{
public:
class HardwareDevice final : public Device
{
public:
- HardwareDevice(const s
td::s
hared_ptr<sigrok::Context> &context,
- s
td::s
hared_ptr<sigrok::HardwareDevice> device);
+ HardwareDevice(const shared_ptr<sigrok::Context> &context,
+ shared_ptr<sigrok::HardwareDevice> device);
~HardwareDevice();
~HardwareDevice();
- s
td::s
hared_ptr<sigrok::HardwareDevice> hardware_device() const;
+ shared_ptr<sigrok::HardwareDevice> hardware_device() const;
/**
* Builds the full name. It only contains all the fields.
*/
/**
* Builds the full name. It only contains all the fields.
*/
- st
d::st
ring full_name() const;
+ string full_name() const;
/**
* Builds the display name. It only contains fields as required.
* @param device_manager a reference to the device manager is needed
* so that other similarly titled devices can be detected.
*/
/**
* Builds the display name. It only contains fields as required.
* @param device_manager a reference to the device manager is needed
* so that other similarly titled devices can be detected.
*/
- std::string display_name(const DeviceManager &device_manager) const;
+ string display_name(const DeviceManager &device_manager) const;
+
+ void open();
- void c
reat
e();
+ void c
los
e();
private:
private:
- const s
td::s
hared_ptr<sigrok::Context> context_;
+ const shared_ptr<sigrok::Context> context_;
bool device_open_;
};
bool device_open_;
};