X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fabout.cpp;h=05daff8a2698c99b11c1e88c7dcb61292a9a5775;hp=fc206551238bbfd7ab6b73896725bf73cb1aa22e;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hpb=0ec7aba5edea629f9b5b87c18b6511dfd6479470

diff --git a/pv/dialogs/about.cpp b/pv/dialogs/about.cpp
index fc20655..05daff8 100644
--- a/pv/dialogs/about.cpp
+++ b/pv/dialogs/about.cpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifdef ENABLE_SIGROKDECODE
-#include <sigrokdecode.h>
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
 #include <QTextDocument>
@@ -27,24 +27,19 @@
 #include "about.h"
 #include <ui_about.h>
 
-/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
-#define __STDC_FORMAT_MACROS
-#include <glib.h>
-#include <libsigrok/libsigrok.h>
+#include <libsigrok/libsigrok.hpp>
 
+using std::shared_ptr;
+using sigrok::Context;
 
 namespace pv {
 namespace dialogs {
 
-About::About(QWidget *parent) :
+About::About(shared_ptr<Context> context, QWidget *parent) :
 	QDialog(parent),
 	ui(new Ui::About)
 {
-	struct sr_dev_driver **drivers;
-	struct sr_input_format **inputs;
-	struct sr_output_format **outputs;
-
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
 	struct srd_decoder *dec;
 #endif
 
@@ -66,42 +61,30 @@ About::About(QWidget *parent) :
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported hardware drivers:") +
 		"</b></td></tr>");
-	drivers = sr_driver_list();
-	for (int i = 0; drivers[i]; ++i) {
+	for (auto entry : context->drivers()) {
 		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
-			 .arg(QString(drivers[i]->name))
-			 .arg(QString(drivers[i]->longname)));
+			 .arg(QString::fromUtf8(entry.first.c_str()))
+			 .arg(QString::fromUtf8(entry.second->long_name().c_str())));
 	}
 
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported input formats:") +
 		"</b></td></tr>");
-	inputs = sr_input_list();
-	for (int i = 0; inputs[i]; ++i) {
-		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
-			 .arg(QString(inputs[i]->id))
-			 .arg(QString(inputs[i]->description)));
-	}
-
-	s.append("<tr><td colspan=\"2\"><b>" +
-		tr("Supported output formats:") +
-		"</b></td></tr>");
-	outputs = sr_output_list();
-	for (int i = 0; outputs[i]; ++i) {
+	for (auto entry : context->input_formats()) {
 		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
-			.arg(QString(outputs[i]->id))
-			.arg(QString(outputs[i]->description)));
+			 .arg(QString::fromUtf8(entry.first.c_str()))
+			 .arg(QString::fromUtf8(entry.second->description().c_str())));
 	}
 
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
 	s.append("<tr><td colspan=\"2\"><b>" +
 		tr("Supported protocol decoders:") +
 		"</b></td></tr>");
 	for (const GSList *l = srd_decoder_list(); l; l = l->next) {
 		dec = (struct srd_decoder *)l->data;
 		s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
-			 .arg(QString(dec->id))
-			 .arg(QString(dec->longname)));
+			 .arg(QString::fromUtf8(dec->id))
+			 .arg(QString::fromUtf8(dec->longname)));
 	}
 #endif