X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=715dc526c2f07fce90eb9d111cf253acf57dc09a;hp=3fcfcc776626130ab732b2dd23f2d6ba4d14babf;hb=140181a46034cf65739ba4bf0bf1260ab94ac736;hpb=7a255aa9c51ebb41bb629f6d327560dcfa18433f

diff --git a/main.cpp b/main.cpp
index 3fcfcc77..715dc526 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,7 +18,10 @@
  * 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 <stdint.h>
 #include <libsigrok/libsigrok.h>
 
@@ -27,7 +30,10 @@
 #include <QtGui/QApplication>
 #include <QDebug>
 
+#ifdef ENABLE_SIGNALS
 #include "signalhandler.h"
+#endif
+
 #include "pv/mainwindow.h"
 
 #include "config.h"
@@ -77,7 +83,11 @@ 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;
 		}
 
@@ -105,11 +115,18 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	// Initialise libsigrokdecode
-	if (srd_init(NULL) == SRD_OK) {
+	do {
+
+#ifdef ENABLE_SIGROKDECODE
+		// Initialise libsigrokdecode
+		if (srd_init(NULL) != SRD_OK) {
+			qDebug() << "ERROR: libsigrokdecode init failed.";
+			break;
+		}
 
 		// Load the protocol decoders
 		srd_decoder_load_all();
+#endif
 
 		// Initialize all libsigrok drivers
 		sr_dev_driver **const drivers = sr_driver_list();
@@ -127,31 +144,34 @@ int main(int argc, char *argv[])
 			pv::MainWindow w(open_file);
 			w.show();
 
-			if(SignalHandler::prepareSignals()) {
-				SignalHandler *const signalHandler =
+#ifdef ENABLE_SIGNALS
+			if(SignalHandler::prepare_signals()) {
+				SignalHandler *const handler =
 					new SignalHandler(&w);
-				QObject::connect(signalHandler,
-					SIGNAL(sigIntReceived()),
+				QObject::connect(handler,
+					SIGNAL(int_received()),
 					&w, SLOT(close()));
-				QObject::connect(signalHandler,
-					SIGNAL(sigTermReceived()),
+				QObject::connect(handler,
+					SIGNAL(term_received()),
 					&w, SLOT(close()));
     			} else {
 				qWarning() <<
 					"Could not prepare signal handler.";
 			}
+#endif
 
 			// Run the application
 			ret = a.exec();
 		}
 
-		// Destroy libsigrokdecode and libsigrok
+#ifdef ENABLE_SIGROKDECODE
+		// Destroy libsigrokdecode
 		srd_exit();
+#endif
 
-	} else {
-		qDebug() << "ERROR: libsigrokdecode init failed.";
-	}
+	} while (0);
 
+	// Destroy libsigrok
 	if (sr_ctx)
 		sr_exit(sr_ctx);