projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed an uneeded include
[pulseview.git]
/
pv
/
sigsession.h
diff --git
a/pv/sigsession.h
b/pv/sigsession.h
index b8647db808f3ea7ea11f24456f22a6c196e98160..b2dc467612655e59e1e189f78e813832f9b6bac4 100644
(file)
--- a/
pv/sigsession.h
+++ b/
pv/sigsession.h
@@
-21,6
+21,7
@@
#ifndef PULSEVIEW_PV_SIGSESSION_H
#define PULSEVIEW_PV_SIGSESSION_H
#ifndef PULSEVIEW_PV_SIGSESSION_H
#define PULSEVIEW_PV_SIGSESSION_H
+#include <boost/function.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
@@
-29,10
+30,9
@@
#include <vector>
#include <QObject>
#include <vector>
#include <QObject>
+#include <QString>
-extern "C" {
#include <libsigrok/libsigrok.h>
#include <libsigrok/libsigrok.h>
-}
namespace pv {
namespace pv {
@@
-62,12
+62,14
@@
public:
~SigSession();
~SigSession();
- void load_file(const std::string &name);
+ void load_file(const std::string &name,
+ boost::function<void (const QString)> error_handler);
capture_state get_capture_state() const;
capture_state get_capture_state() const;
- void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
- uint64_t sample_rate);
+ void start_capture(struct sr_dev_inst* sdi,
+ uint64_t record_length,
+ boost::function<void (const QString)> error_handler);
void stop_capture();
void stop_capture();
@@
-80,10
+82,12
@@
private:
void set_capture_state(capture_state state);
private:
void set_capture_state(capture_state state);
private:
- void load_thread_proc(const std::string name);
+ void load_thread_proc(const std::string name,
+ boost::function<void (const QString)> error_handler);
void sample_thread_proc(struct sr_dev_inst *sdi,
void sample_thread_proc(struct sr_dev_inst *sdi,
- uint64_t record_length, uint64_t sample_rate);
+ uint64_t record_length,
+ boost::function<void (const QString)> error_handler);
void feed_in_header(const sr_dev_inst *sdi);
void feed_in_header(const sr_dev_inst *sdi);