X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=07cfa2facfb9eefce062c243ad4f6d7ead0a417b;hp=b72fc70c46b38320b25179b593ef0b5afc05f762;hb=613d097c5af2d12ffd68e2dfab309b518edca1a6;hpb=d52d8455db515a779b4451c223ba7aaded70951a

diff --git a/main.cpp b/main.cpp
index b72fc70c..07cfa2fa 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifdef ENABLE_SIGROKDECODE
-#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
-#endif
+#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
@@ -30,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"
@@ -80,10 +82,7 @@ int main(int argc, char *argv[])
 		{
 			const int loglevel = atoi(optarg);
 			sr_log_loglevel_set(loglevel);
-
-#ifdef ENABLE_SIGROKDECODE
 			srd_log_loglevel_set(loglevel);
-#endif
 
 			break;
 		}
@@ -114,7 +113,6 @@ int main(int argc, char *argv[])
 
 	do {
 
-#ifdef ENABLE_SIGROKDECODE
 		// Initialise libsigrokdecode
 		if (srd_init(NULL) != SRD_OK) {
 			qDebug() << "ERROR: libsigrokdecode init failed.";
@@ -123,24 +121,16 @@ int main(int argc, char *argv[])
 
 		// Load the protocol decoders
 		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,15 +144,17 @@ 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
 		// Destroy libsigrokdecode
 		srd_exit();
-#endif
 
 	} while (0);