projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Print --help/--version output to stdout (not stderr).
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 56b4dd5f1a4ed12c08bf2037061a48ad9ac7264d..e98506fcc0ea19d2d0dc2572252d3ab85748eca4 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-20,6
+20,7
@@
extern "C" {
#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
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 <stdint.h>
#include <libsigrok/libsigrok.h>
}
@@
-33,9
+34,12
@@
extern "C" {
#include "config.h"
#include "config.h"
+// Global pointer to our QApplication
+QApplication *g_app = NULL;
+
void usage()
{
void usage()
{
- fprintf(std
err
,
+ fprintf(std
out
,
"Usage:\n"
" %s — %s\n"
"\n"
"Usage:\n"
" %s — %s\n"
"\n"
@@
-45,10
+49,30
@@
void usage()
"\n", PV_BIN_NAME, PV_DESCRIPTION);
}
"\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;
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);
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);
// Set some application metadata
QApplication::setApplicationVersion(PV_VERSION_STRING);
@@
-58,8
+82,8
@@
int main(int argc, char *argv[])
// Parse arguments
while (1) {
static const struct option long_options[] = {
// 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}
};
{0, 0, 0, 0}
};
@@
-71,7
+95,7
@@
int main(int argc, char *argv[])
switch (c) {
case 'V':
// Print version info
switch (c) {
case 'V':
// Print version info
- fprintf(std
err
, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+ fprintf(std
out
, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
return 0;
case 'h':
return 0;
case 'h':
@@
-82,7
+106,7
@@
int main(int argc, char *argv[])
}
// Initialise libsigrok
}
// Initialise libsigrok
- if (sr_init() != SR_OK) {
+ if (sr_init(
&sr_ctx
) != SR_OK) {
qDebug() << "ERROR: libsigrok init failed.";
return 1;
}
qDebug() << "ERROR: libsigrok init failed.";
return 1;
}
@@
-96,7
+120,7
@@
int main(int argc, char *argv[])
// Initialize all libsigrok drivers
sr_dev_driver **const drivers = sr_driver_list();
for (sr_dev_driver **driver = drivers; *driver; driver++) {
// 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;
qDebug("Failed to initialize driver %s",
(*driver)->name);
ret = 1;
@@
-104,7
+128,7
@@
int main(int argc, char *argv[])
}
}
}
}
- if(ret == 0) {
+ if
(ret == 0) {
// Initialise the main window
pv::MainWindow w;
w.show();
// Initialise the main window
pv::MainWindow w;
w.show();
@@
-120,7
+144,8
@@
int main(int argc, char *argv[])
qDebug() << "ERROR: libsigrokdecode init failed.";
}
qDebug() << "ERROR: libsigrokdecode init failed.";
}
- sr_exit();
+ if (sr_ctx)
+ sr_exit(sr_ctx);
return ret;
}
return ret;
}