projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Improve signal handling during device selection
[pulseview.git]
/
pv
/
devices
/
sessionfile.cpp
diff --git
a/pv/devices/sessionfile.cpp
b/pv/devices/sessionfile.cpp
index d45b9fa492832bc147c7ea7aadcc8e06c446d263..8a583eeba0ffb08b8015da6fd5f6890d77488c7f 100644
(file)
--- a/
pv/devices/sessionfile.cpp
+++ b/
pv/devices/sessionfile.cpp
@@
-30,13
+30,24
@@
namespace devices {
SessionFile::SessionFile(const std::shared_ptr<sigrok::Context> context,
const std::string &file_name) :
File(file_name),
SessionFile::SessionFile(const std::shared_ptr<sigrok::Context> context,
const std::string &file_name) :
File(file_name),
- context_(context) {
+ context_(context)
+{
}
}
-void SessionFile::create() {
+void SessionFile::open()
+{
+ if (session_)
+ close();
+
session_ = context_->load_session(file_name_);
device_ = session_->devices()[0];
}
session_ = context_->load_session(file_name_);
device_ = session_->devices()[0];
}
+void SessionFile::close()
+{
+ if (session_)
+ session_->remove_devices();
+}
+
} // namespace devices
} // namespace pv
} // namespace devices
} // namespace pv