X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=e63c87d75194599a9d1c7a89529f733b6745c896;hp=80b9ec93d5a37967b310a70bbbf4907c0d54ebb6;hb=a6c0e655185fa533061fb82edde4b20684fc2083;hpb=640e55655b7b0bd473e0e42046c681df5785f9ee

diff --git a/main.cpp b/main.cpp
index 80b9ec93..e63c87d7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,19 +18,60 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+extern "C" {
+#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include <stdint.h>
+#include <libsigrok/libsigrok.h>
+}
+
 #include <QtGui/QApplication>
+#include <QDebug>
 #include "mainwindow.h"
 
 int main(int argc, char *argv[])
 {
 	QApplication a(argc, argv);
-	MainWindow w;
-	w.show();
 
 	/* Set some application metadata. */
 	QApplication::setApplicationVersion(APP_VERSION);
-	QApplication::setApplicationName("sigrok-qt");
+	QApplication::setApplicationName("PulseView");
 	QApplication::setOrganizationDomain("http://www.sigrok.org");
 
-	return a.exec();
+	/* Initialise libsigrok */
+	if (sr_init() != SR_OK) {
+		qDebug() << "ERROR: libsigrok init failed.";
+		return 1;
+	}
+
+	/* Initialise libsigrokdecode */
+	if (srd_init(NULL) != SRD_OK) {
+		qDebug() << "ERROR: libsigrokdecode init failed.";
+		return 1;
+	}
+
+	/* 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(*driver) != SR_OK) {
+			qDebug("Failed to initialize driver %s",
+				(*driver)->name);
+			return 1;
+		}
+	}
+
+	/* Initialise the main window */
+	MainWindow w;
+	w.show();
+
+	/* Run the application */
+	const int ret = a.exec();
+
+	/* Destroy libsigrokdecode and libsigrok */
+	srd_exit();
+	sr_exit();
+
+	return ret;
 }