Update to recent API change.

The sr_driver_init() API call now takes a struct sr_context pointer.

diff --git a/main.cpp b/main.cpp
index d100617319250a2f1309a4b1f879b2bef5842747..eee203b70cd6bc4a9f374062500ebc7a84617eb2 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -40,6 +40,7 @@ int main(int argc, char *argv[])
        QApplication a(argc, argv);
        QTranslator translator;
        struct sr_context *sr_ctx;
+       sr_dev_driver **drivers;
        int ret;
 
        translator.load(QString("locale/sigrok-qt_") + locale);
@@ -61,6 +62,16 @@ int main(int argc, char *argv[])
        }
        qDebug() << "libsigrok initialized successfully.";
 
+       /* Initialize all libsigrok drivers. */
+       drivers = sr_driver_list();
+       for (int i = 0; drivers[i]; ++i) {
+               if (sr_driver_init(sr_ctx, drivers[i]) != SR_OK) {
+                       qDebug("Failed to initialize driver '%s'.",
+                              drivers[i]->name);
+                       return 1;
+               }
+       }
+
        if (srd_init(NULL) != SRD_OK) {
                qDebug() << "ERROR: libsigrokdecode init failed.";
                return 1;

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 59b1f7b46d1ba5c31ce32c33173f0559914f45dc..96a1c09cf1d5aefbd137836e924d297f3d5b8970 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -78,7 +78,6 @@ static int logger(void *cb_data, int loglevel, const char *format, va_list args)
 MainWindow::MainWindow(QWidget *parent)
        : QMainWindow(parent), ui(new Ui::MainWindow)
 {
-       struct sr_dev_driver **drivers;
        int i;
 
        devices = NULL;
@@ -101,15 +100,6 @@ MainWindow::MainWindow(QWidget *parent)
        }
        qDebug() << "srd_log_handler_set() call successful.";
 
-       /* Initialize all libsigrok drivers. */
-       drivers = sr_driver_list();
-       for (i = 0; drivers[i]; i++) {
-               if (sr_driver_init(drivers[i]) != SR_OK) {
-                       qDebug("Failed to initialize driver %s", drivers[i]->name);
-                       return;
-               }
-       }
-
        // this->setDockOptions(QMainWindow::AllowNestedDocks);
 }