extern "C" {
#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#include <signal.h>
#include <stdint.h>
#include <libsigrok/libsigrok.h>
}
#include "config.h"
+// Global pointer to our QApplication
+QApplication *g_app = NULL;
+
void usage()
{
fprintf(stderr,
"\n", PV_BIN_NAME, PV_DESCRIPTION);
}
+/*
+ * SIGINT handler (likely received Ctrl-C from terminal)
+ */
+void sigint_handler(int param)
+{
+ (void)param;
+
+ qDebug("Received SIGINT.");
+
+ if (g_app)
+ g_app->quit();
+}
+
int main(int argc, char *argv[])
{
int ret = 0;
+ struct sr_context *sr_ctx = NULL;
+
+ // Register a SIGINT handler
+ signal(SIGINT, sigint_handler);
+
QApplication a(argc, argv);
+ // Now we have an application to populate our global pointer
+ g_app = &a;
// Set some application metadata
QApplication::setApplicationVersion(PV_VERSION_STRING);
// Parse arguments
while (1) {
static const struct option long_options[] = {
- {"version", no_argument, 0, 'V'},
- {"help", no_argument, 0, 'h'},
+ {"version", no_argument, 0, 'V'},
+ {"help", no_argument, 0, 'h'},
{0, 0, 0, 0}
};
}
// Initialise libsigrok
- if (sr_init() != SR_OK) {
+ if (sr_init(&sr_ctx) != SR_OK) {
qDebug() << "ERROR: libsigrok init failed.";
return 1;
}
// 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) {
+ if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
qDebug("Failed to initialize driver %s",
(*driver)->name);
ret = 1;
}
}
- if(ret == 0) {
+ if (ret == 0) {
// Initialise the main window
pv::MainWindow w;
w.show();
qDebug() << "ERROR: libsigrokdecode init failed.";
}
- sr_exit();
+ if (sr_ctx)
+ sr_exit(sr_ctx);
return ret;
}