Use getter for the conversion type instead of a local copy

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index e5472c2a0b14e9eacf32d380223019dd007947a7..8f495419fee7467de77c4074c32927ce658de919 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -36,6 +36,7 @@
 #include "pv/application.hpp"
 #include "pv/devicemanager.hpp"
 #include "pv/mainwindow.hpp"
+#include "pv/session.hpp"
 #ifdef ANDROID
 #include <libsigrokandroidutils/libsigrokandroidutils.h>
 #include "android/assetreader.hpp"
@@ -66,6 +67,7 @@ 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"
                "  -c, --clean                     Don't restore previous sessions on startup\n"
@@ -76,7 +78,7 @@ 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);
@@ -93,6 +95,7 @@ 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'},
@@ -100,7 +103,7 @@ int main(int argc, char *argv[])
                };
 
                const int c = getopt_long(argc, argv,
-                       "l:Vhc?i:I:", long_options, nullptr);
+                       "l:Vhc?d:i:I:", long_options, nullptr);
                if (c == -1)
                        break;
 
@@ -132,6 +135,10 @@ int main(int argc, char *argv[])
                        break;
                }
 
+               case 'd':
+                       driver = optarg;
+                       break;
+
                case 'i':
                        open_file = optarg;
                        break;
@@ -156,6 +163,8 @@ int main(int argc, char *argv[])
 
        // Initialise libsigrok
        context = sigrok::Context::create();
+       pv::Session::sr_context = context;
+
 #ifdef ANDROID
        context->set_resource_reader(&asset_reader);
 #endif
@@ -174,13 +183,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,
-                               restore_sessions);
+                       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 =