acquisition: drive a DataSource from the registry; --source and --source-opt
This commit is contained in:
1 parent
46076312cc
commit
504bc193ea
8 files changed
+156
-164
No files matched your search
+3
-3
@@ -2494,7 +2494,7 @@ void on_about_clicked(GtkButton*, gpointer user) {
|
||||
App* app = static_cast<App*>(user);
|
||||
close_overflow_menu(*app);
|
||||
show_about(GTK_WINDOW(app->window),
|
||||
layout_path(app->model->config().server, app->model->config().port));
|
||||
layout_path(app->model->config().session_host(), app->model->config().session_port()));
|
||||
}
|
||||
|
||||
void on_help_clicked(GtkButton*, gpointer user) {
|
||||
@@ -5914,8 +5914,8 @@ int run_ui(int argc, char** argv, const Config& cfg, ScopeModel& model, Acquisit
|
||||
// both overrode the arrangement the file was opened with and could clobber a real session. With no
|
||||
// port, `save_layout_now()` refuses and the first-CONFIG layout load never runs, which is exactly
|
||||
// a source-less run.
|
||||
app.source_host = cfg.open_waveform.empty() ? cfg.server : std::string();
|
||||
app.source_port = cfg.open_waveform.empty() ? cfg.port : 0;
|
||||
app.source_host = cfg.open_waveform.empty() ? cfg.session_host() : std::string();
|
||||
app.source_port = cfg.open_waveform.empty() ? cfg.session_port() : 0;
|
||||
app.source_multicast = cfg.open_waveform.empty() ? cfg.multicast : std::string();
|
||||
app.source_interface = cfg.interface_addr;
|
||||
// The event cache is keyed on the source, like the packet capture. A waveform has no source, so a
|
||||
|
||||
Reference in new issue
Block a user