*/
#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>
#include <QtGui/QApplication>
#include <QDebug>
+#ifdef ENABLE_SIGNALS
#include "signalhandler.h"
+#endif
+
+#include "pv/devicemanager.h"
#include "pv/mainwindow.h"
#include "config.h"
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);
qWarning() <<
"Could not prepare signal handler.";
}
+#endif
// Run the application
ret = a.exec();
+
+ } catch(std::exception e) {
+ qDebug() << e.what();
}
#ifdef ENABLE_SIGROKDECODE