Added decoder stack item deletion

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 42e4a7c17062f863e987a4d68d81c313663d062f..07cfa2facfb9eefce062c243ad4f6d7ead0a417b 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#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. */
+
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
 
@@ -27,7 +28,11 @@
 #include <QtGui/QApplication>
 #include <QDebug>
 
+#ifdef ENABLE_SIGNALS
 #include "signalhandler.h"
+#endif
+
+#include "pv/devicemanager.h"
 #include "pv/mainwindow.h"
 
 #include "config.h"
@@ -78,6 +83,7 @@ int main(int argc, char *argv[])
                        const int loglevel = atoi(optarg);
                        sr_log_loglevel_set(loglevel);
                        srd_log_loglevel_set(loglevel);
+
                        break;
                }
 
@@ -105,28 +111,26 @@ int main(int argc, char *argv[])
                return 1;
        }
 
-       // Initialise libsigrokdecode
-       if (srd_init(NULL) == SRD_OK) {
+       do {
+
+               // Initialise libsigrokdecode
+               if (srd_init(NULL) != SRD_OK) {
+                       qDebug() << "ERROR: libsigrokdecode init failed.";
+                       break;
+               }
 
                // Load the protocol decoders
                srd_decoder_load_all();
 
-               // 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);
@@ -140,18 +144,21 @@ 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();
                }
 
-               // Destroy libsigrokdecode and libsigrok
+               // Destroy libsigrokdecode
                srd_exit();
 
-       } else {
-               qDebug() << "ERROR: libsigrokdecode init failed.";
-       }
+       } while (0);
 
+       // Destroy libsigrok
        if (sr_ctx)
                sr_exit(sr_ctx);