contrib: Add pulseview.desktop file

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index b72fc70c46b38320b25179b593ef0b5afc05f762..5257b791b9e9e15c93b2b93365d29f5a6cec1f7e 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -19,7 +19,7 @@
  */
 
 #ifdef ENABLE_SIGROKDECODE
-#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #endif
 
 #include <stdint.h>
@@ -30,7 +30,11 @@
 #include <QtGui/QApplication>
 #include <QDebug>
 
+#ifdef ENABLE_SIGNALS
 #include "signalhandler.h"
+#endif
+
+#include "pv/devicemanager.h"
 #include "pv/mainwindow.h"
 
 #include "config.h"
@@ -125,22 +129,15 @@ int main(int argc, char *argv[])
                srd_decoder_load_all();
 #endif
 
-               // Initialize all libsigrok drivers
-               sr_dev_driver **const drivers = sr_driver_list();
-               for (sr_dev_driver **driver = drivers; *driver; driver++) {
-                       if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
-                               qDebug("Failed to initialize driver %s",
-                                       (*driver)->name);
-                               ret = 1;
-                               break;
-                       }
-               }
+               try {
+                       // Create the device manager, initialise the drivers
+                       pv::DeviceManager device_manager(sr_ctx);
 
-               if (ret == 0) {
                        // Initialise the main window
-                       pv::MainWindow w(open_file);
+                       pv::MainWindow w(device_manager, open_file);
                        w.show();
 
+#ifdef ENABLE_SIGNALS
                        if(SignalHandler::prepare_signals()) {
                                SignalHandler *const handler =
                                        new SignalHandler(&w);
@@ -154,9 +151,13 @@ int main(int argc, char *argv[])
                                qWarning() <<
                                        "Could not prepare signal handler.";
                        }
+#endif
 
                        // Run the application
                        ret = a.exec();
+
+               } catch(std::exception e) {
+                       qDebug() << e.what();
                }
 
 #ifdef ENABLE_SIGROKDECODE