Sampling bar now commits the sample rate into the device instance

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index 56b4dd5f1a4ed12c08bf2037061a48ad9ac7264d..43c8cb8e965c1c22bb947d3be71d7d3bf39d2613 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -18,11 +18,10 @@
  * 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 <signal.h>
 #include <stdint.h>
 #include <libsigrok/libsigrok.h>
-}
 
 #include <getopt.h>
 
@@ -33,11 +32,14 @@ extern "C" {
 
 #include "config.h"
 
+// Global pointer to our QApplication
+QApplication *g_app = NULL;
+
 void usage()
 {
-       fprintf(stderr,
+       fprintf(stdout,
                "Usage:\n"
-               "  %s — %s\n"
+               "  %s [OPTION…] [FILE] — %s\n"
                "\n"
                "Help Options:\n"
                "  -V, --version                   Show release version\n"
@@ -45,10 +47,31 @@ void usage()
                "\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;
+       const char *open_file = 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);
@@ -58,8 +81,8 @@ int main(int argc, char *argv[])
        // 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}
                };
 
@@ -71,7 +94,7 @@ int main(int argc, char *argv[])
                switch (c) {
                case 'V':
                        // Print version info
-                       fprintf(stderr, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+                       fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
                        return 0;
 
                case 'h':
@@ -81,8 +104,14 @@ int main(int argc, char *argv[])
                }
        }
 
+       if (argc - optind > 1) {
+               fprintf(stderr, "Only one file can be openened.\n");
+               return 1;
+       } else if (argc - optind == 1)
+               open_file = argv[argc - 1];
+
        // Initialise libsigrok
-       if (sr_init() != SR_OK) {
+       if (sr_init(&sr_ctx) != SR_OK) {
                qDebug() << "ERROR: libsigrok init failed.";
                return 1;
        }
@@ -96,7 +125,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++) {
-                       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;
@@ -104,9 +133,9 @@ int main(int argc, char *argv[])
                        }
                }
 
-               if(ret == 0) {
+               if (ret == 0) {
                        // Initialise the main window
-                       pv::MainWindow w;
+                       pv::MainWindow w(open_file);
                        w.show();
 
                        // Run the application
@@ -120,7 +149,8 @@ int main(int argc, char *argv[])
                qDebug() << "ERROR: libsigrokdecode init failed.";
        }
 
-       sr_exit();
+       if (sr_ctx)
+               sr_exit(sr_ctx);
 
        return ret;
 }