main window: Prefer the user specified device in new sessions

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index d0ca64a2483a85fb7cdac23c5a7170c1c3f02d34..f7c722b1aec63a6e47d440a565bb23824fadd461 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -58,7 +58,7 @@ void usage()
 {
        fprintf(stdout,
                "Usage:\n"
-               "  %s [OPTION…] — %s\n"
+               "  %s [OPTIONS] [FILE]\n"
                "\n"
                "Help Options:\n"
                "  -h, -?, --help                  Show help option\n"
@@ -66,16 +66,19 @@ void usage()
                "Application Options:\n"
                "  -V, --version                   Show release version\n"
                "  -l, --loglevel                  Set libsigrok/libsigrokdecode loglevel\n"
+               "  -d, --driver                    Specify the device driver to use\n"
                "  -i, --input-file                Load input from file\n"
                "  -I, --input-format              Input format\n"
-               "\n", PV_BIN_NAME, PV_DESCRIPTION);
+               "  -c, --clean                     Don't restore previous sessions on startup\n"
+               "\n", PV_BIN_NAME);
 }
 
 int main(int argc, char *argv[])
 {
        int ret = 0;
        shared_ptr<sigrok::Context> context;
-       string open_file, open_file_format;
+       string open_file, open_file_format, driver;
+       bool restore_sessions = true;
 
        Application a(argc, argv);
 
@@ -91,13 +94,15 @@ int main(int argc, char *argv[])
                        {"help", no_argument, nullptr, 'h'},
                        {"version", no_argument, nullptr, 'V'},
                        {"loglevel", required_argument, nullptr, 'l'},
+                       {"driver", required_argument, nullptr, 'd'},
                        {"input-file", required_argument, nullptr, 'i'},
                        {"input-format", required_argument, nullptr, 'I'},
+                       {"clean", no_argument, nullptr, 'c'},
                        {nullptr, 0, nullptr, 0}
                };
 
                const int c = getopt_long(argc, argv,
-                       "l:Vh?i:I:", long_options, nullptr);
+                       "l:Vhc?d:i:I:", long_options, nullptr);
                if (c == -1)
                        break;
 
@@ -129,6 +134,10 @@ int main(int argc, char *argv[])
                        break;
                }
 
+               case 'd':
+                       driver = optarg;
+                       break;
+
                case 'i':
                        open_file = optarg;
                        break;
@@ -136,6 +145,10 @@ int main(int argc, char *argv[])
                case 'I':
                        open_file_format = optarg;
                        break;
+
+               case 'c':
+                       restore_sessions = false;
+                       break;
                }
        }
 
@@ -167,13 +180,20 @@ int main(int argc, char *argv[])
 
                try {
                        // Create the device manager, initialise the drivers
-                       pv::DeviceManager device_manager(context);
+                       pv::DeviceManager device_manager(context, driver);
 
                        // Initialise the main window
-                       pv::MainWindow w(device_manager,
-                               open_file, open_file_format);
+                       pv::MainWindow w(device_manager);
                        w.show();
 
+                       if (restore_sessions)
+                               w.restore_sessions();
+
+                       if (!open_file.empty())
+                               w.add_session_with_file(open_file, open_file_format);
+                       else
+                               w.add_default_session();
+
 #ifdef ENABLE_SIGNALS
                        if (SignalHandler::prepare_signals()) {
                                SignalHandler *const handler =