projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
StoreSession: Added an OutputFormat parameter
[pulseview.git]
/
pv
/
storesession.hpp
diff --git
a/pv/storesession.hpp
b/pv/storesession.hpp
index 8eaddaa60f50ebb3138870a6463d5937973d5e54..ce737f34e3c9bba0ba079589e15daf27f81bf8ea 100644
(file)
--- a/
pv/storesession.hpp
+++ b/
pv/storesession.hpp
@@
-24,6
+24,7
@@
#include <stdint.h>
#include <atomic>
#include <stdint.h>
#include <atomic>
+#include <memory>
#include <mutex>
#include <string>
#include <thread>
#include <mutex>
#include <string>
#include <thread>
@@
-32,14
+33,15
@@
namespace sigrok {
class Output;
namespace sigrok {
class Output;
+class OutputFormat;
}
namespace pv {
}
namespace pv {
-class S
igS
ession;
+class Session;
namespace data {
namespace data {
-class LogicS
napsho
t;
+class LogicS
egmen
t;
}
class StoreSession : public QObject
}
class StoreSession : public QObject
@@
-51,7
+53,8
@@
private:
public:
StoreSession(const std::string &file_name,
public:
StoreSession(const std::string &file_name,
- const SigSession &session);
+ const std::shared_ptr<sigrok::OutputFormat> &output_format,
+ const Session &session);
~StoreSession();
~StoreSession();
@@
-66,14
+69,15
@@
public:
void cancel();
private:
void cancel();
private:
- void store_proc(std::shared_ptr<pv::data::LogicS
napshot> snapsho
t);
+ void store_proc(std::shared_ptr<pv::data::LogicS
egment> segmen
t);
Q_SIGNALS:
void progress_updated();
private:
const std::string file_name_;
Q_SIGNALS:
void progress_updated();
private:
const std::string file_name_;
- const SigSession &session_;
+ const std::shared_ptr<sigrok::OutputFormat> output_format_;
+ const Session &session_;
std::shared_ptr<sigrok::Output> output_;
std::shared_ptr<sigrok::Output> output_;