main: Use only the domain, not the whole URL.

[pulseview.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index b72fc70c46b38320b25179b593ef0b5afc05f762..5ff61d98918ba2ee40c05818e2d7e9665b6a3aa6 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -18,8 +18,8 @@
  * 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. */
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
 #endif
 
 #include <stdint.h>
@@ -30,11 +30,21 @@
 #include <QtGui/QApplication>
 #include <QDebug>
 
+#ifdef ENABLE_SIGNALS
 #include "signalhandler.h"
+#endif
+
+#include "pv/devicemanager.h"
 #include "pv/mainwindow.h"
 
 #include "config.h"
 
+#ifdef _WIN32
+// The static qsvg lib is required for SVG graphics/icons (on Windows).
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qsvg)
+#endif
+
 void usage()
 {
        fprintf(stdout,
@@ -59,7 +69,7 @@ int main(int argc, char *argv[])
        // Set some application metadata
        QApplication::setApplicationVersion(PV_VERSION_STRING);
        QApplication::setApplicationName("PulseView");
-       QApplication::setOrganizationDomain("http://www.sigrok.org");
+       QApplication::setOrganizationDomain("sigrok.org");
 
        // Parse arguments
        while (1) {
@@ -81,7 +91,7 @@ int main(int argc, char *argv[])
                        const int loglevel = atoi(optarg);
                        sr_log_loglevel_set(loglevel);
 
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
                        srd_log_loglevel_set(loglevel);
 #endif
 
@@ -114,7 +124,7 @@ int main(int argc, char *argv[])
 
        do {
 
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
                // Initialise libsigrokdecode
                if (srd_init(NULL) != SRD_OK) {
                        qDebug() << "ERROR: libsigrokdecode init failed.";
@@ -125,22 +135,15 @@ int main(int argc, char *argv[])
                srd_decoder_load_all();
 #endif
 
-               // Initialize all libsigrok drivers
-               sr_dev_driver **const drivers = sr_driver_list();
-               for (sr_dev_driver **driver = drivers; *driver; driver++) {
-                       if (sr_driver_init(sr_ctx, *driver) != SR_OK) {
-                               qDebug("Failed to initialize driver %s",
-                                       (*driver)->name);
-                               ret = 1;
-                               break;
-                       }
-               }
+               try {
+                       // Create the device manager, initialise the drivers
+                       pv::DeviceManager device_manager(sr_ctx);
 
-               if (ret == 0) {
                        // Initialise the main window
-                       pv::MainWindow w(open_file);
+                       pv::MainWindow w(device_manager, open_file);
                        w.show();
 
+#ifdef ENABLE_SIGNALS
                        if(SignalHandler::prepare_signals()) {
                                SignalHandler *const handler =
                                        new SignalHandler(&w);
@@ -154,12 +157,16 @@ int main(int argc, char *argv[])
                                qWarning() <<
                                        "Could not prepare signal handler.";
                        }
+#endif
 
                        // Run the application
                        ret = a.exec();
+
+               } catch(std::exception e) {
+                       qDebug() << e.what();
                }
 
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
                // Destroy libsigrokdecode
                srd_exit();
 #endif