projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Tidied class declarations
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index 556f54e5d5c938454a49486a7aac011bf561c26a..8f1860dc466b4622a5fc4e9e35891b445e5947a5 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-38,13
+38,13
@@
struct srd_decoder;
struct srd_channel;
namespace sigrok {
struct srd_channel;
namespace sigrok {
-
class Analog;
-
class Channel;
-
class Device;
-
class Logic;
-
class Meta;
-
class Packet;
-
class Session;
+class Analog;
+class Channel;
+class Device;
+class Logic;
+class Meta;
+class Packet;
+class Session;
}
namespace pv {
}
namespace pv {
@@
-53,9
+53,9
@@
class DeviceManager;
namespace data {
class Analog;
namespace data {
class Analog;
-class AnalogS
napsho
t;
+class AnalogS
egmen
t;
class Logic;
class Logic;
-class LogicS
napsho
t;
+class LogicS
egmen
t;
class SignalData;
}
class SignalData;
}
@@
-94,7
+94,11
@@
public:
*/
void set_device(std::shared_ptr<sigrok::Device> device);
*/
void set_device(std::shared_ptr<sigrok::Device> device);
- void set_file(const std::string &name);
+ /**
+ * Sets a sigrok session file as the capture device.
+ * @param name the path to the file.
+ */
+ void set_session_file(const std::string &name);
void set_default_device();
void set_default_device();
@@
-167,9
+171,9
@@
private:
mutable std::mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;
mutable std::mutex data_mutex_;
std::shared_ptr<data::Logic> logic_data_;
uint64_t cur_samplerate_;
- std::shared_ptr<data::LogicS
napshot> cur_logic_snapsho
t_;
- std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogS
napsho
t> >
- cur_analog_s
napsho
ts_;
+ std::shared_ptr<data::LogicS
egment> cur_logic_segmen
t_;
+ std::map< std::shared_ptr<sigrok::Channel>, std::shared_ptr<data::AnalogS
egmen
t> >
+ cur_analog_s
egmen
ts_;
std::thread sampling_thread_;
std::thread sampling_thread_;