projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
session: add support to auto detect input format (for init file)
[pulseview.git]
/
pv
/
session.cpp
diff --git
a/pv/session.cpp
b/pv/session.cpp
index 80dad66ee929ef36974da0573cb982f3843b4e06..50e89e567041c2ec186e47e0d387457808f452a3 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-483,6
+483,7
@@
void Session::load_init_file(const string &file_name, const string &format)
map<string, Glib::VariantBase> input_opts;
if (!format.empty()) {
map<string, Glib::VariantBase> input_opts;
if (!format.empty()) {
+ // Got a user provided input format spec.
const map<string, shared_ptr<InputFormat> > formats =
device_manager_.context()->input_formats();
auto user_opts = pv::util::split_string(format, ":");
const map<string, shared_ptr<InputFormat> > formats =
device_manager_.context()->input_formats();
auto user_opts = pv::util::split_string(format, ":");
@@
-499,6
+500,11
@@
void Session::load_init_file(const string &file_name, const string &format)
input_format = (*iter).second;
input_opts = input_format_options(user_opts,
input_format->options());
input_format = (*iter).second;
input_opts = input_format_options(user_opts,
input_format->options());
+ } else {
+ // (Try to) auto detect the input format. Lookup failure
+ // is not fatal, when no input module claimed responsibility,
+ // then a session file gets loaded.
+ input_format = device_manager_.context()->input_format_match(file_name);
}
load_file(QString::fromStdString(file_name), input_format, input_opts);
}
load_file(QString::fromStdString(file_name), input_format, input_opts);