projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add initial NSIS file for building a win installer.
[pulseview.git]
/
sigsession.h
diff --git
a/sigsession.h
b/sigsession.h
index f91a2b927c1d75c611ee03ef46652dc0c4dc6899..f7ec3853e9df05003cf7eb5f04076cf0e72df044 100644
(file)
--- a/
sigsession.h
+++ b/
sigsession.h
@@
-1,5
+1,5
@@
/*
/*
- * This file is part of the
sigrok
project.
+ * This file is part of the
PulseView
project.
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
@@
-23,9
+23,8
@@
#include <boost/shared_ptr.hpp>
#include <boost/shared_ptr.hpp>
-#include <list>
-#include <map>
#include <string>
#include <string>
+#include <vector>
#include <QObject>
#include <QObject>
@@
-46,28
+45,36
@@
public:
~SigSession();
~SigSession();
- void loadFile(const std::string &name);
+ void load_file(const std::string &name);
+
+ void start_capture(struct sr_dev_inst* sdi, uint64_t record_length,
+ uint64_t sample_rate);
+
+ std::vector< boost::shared_ptr<Signal> >&
+ get_signals();
+
+ boost::shared_ptr<LogicData> get_data();
private:
private:
- void data
FeedI
n(const struct sr_dev_inst *sdi,
+ void data
_feed_i
n(const struct sr_dev_inst *sdi,
struct sr_datafeed_packet *packet);
struct sr_datafeed_packet *packet);
- static void data
FeedInP
roc(const struct sr_dev_inst *sdi,
+ static void data
_feed_in_p
roc(const struct sr_dev_inst *sdi,
struct sr_datafeed_packet *packet);
private:
struct sr_datafeed_packet *packet);
private:
- std::
list
< boost::shared_ptr<Signal> > _signals;
+ std::
vector
< boost::shared_ptr<Signal> > _signals;
boost::shared_ptr<LogicData> _logic_data;
boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
signals:
boost::shared_ptr<LogicData> _logic_data;
boost::shared_ptr<LogicDataSnapshot> _cur_logic_snapshot;
signals:
- void data
U
pdated();
+ void data
_u
pdated();
private:
// TODO: This should not be necessary. Multiple concurrent
// sessions should should be supported and it should be
// possible to associate a pointer with a sr_session.
private:
// TODO: This should not be necessary. Multiple concurrent
// sessions should should be supported and it should be
// possible to associate a pointer with a sr_session.
- static SigSession *session;
+ static SigSession *
_
session;
};
#endif // SIGSESSION_H
};
#endif // SIGSESSION_H