projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Segment: Catch by reference
[pulseview.git]
/
pv
/
devices
/
inputfile.hpp
diff --git
a/pv/devices/inputfile.hpp
b/pv/devices/inputfile.hpp
index 41698e6d6be45638b7d00f24cb139deb9f2c6f6a..e08832f608d6247e9febce369f32c3b8aea843e5 100644
(file)
--- a/
pv/devices/inputfile.hpp
+++ b/
pv/devices/inputfile.hpp
@@
-26,6
+26,8
@@
#include "file.hpp"
#include "file.hpp"
+#include <QSettings>
+
using std::atomic;
using std::ifstream;
using std::map;
using std::atomic;
using std::ifstream;
using std::map;
@@
-47,6
+49,15
@@
public:
shared_ptr<sigrok::InputFormat> format,
const map<string, Glib::VariantBase> &options);
shared_ptr<sigrok::InputFormat> format,
const map<string, Glib::VariantBase> &options);
+ /**
+ * Constructor that loads a file using the metadata saved by
+ * save_meta_to_settings() before.
+ */
+ InputFile(const shared_ptr<sigrok::Context> &context,
+ QSettings &settings);
+
+ void save_meta_to_settings(QSettings &settings);
+
void open();
void close();
void open();
void close();
@@
-59,8
+70,8
@@
public:
private:
const shared_ptr<sigrok::Context> context_;
private:
const shared_ptr<sigrok::Context> context_;
-
const
shared_ptr<sigrok::InputFormat> format_;
-
const
map<string, Glib::VariantBase> options_;
+ shared_ptr<sigrok::InputFormat> format_;
+ map<string, Glib::VariantBase> options_;
shared_ptr<sigrok::Input> input_;
ifstream *f;
shared_ptr<sigrok::Input> input_;
ifstream *f;