* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
#include <libsigrokdecode/libsigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#endif
#include <getopt.h>
-#include <QtGui/QApplication>
#include <QDebug>
#ifdef ENABLE_SIGNALS
#include "signalhandler.h"
#endif
+#include "pv/application.h"
#include "pv/devicemanager.h"
#include "pv/mainwindow.h"
+#ifdef ANDROID
+#include <libsigrokandroidutils/libsigrokandroidutils.h>
+#include "android/loghandler.h"
+#endif
#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,
struct sr_context *sr_ctx = NULL;
const char *open_file = NULL;
- QApplication a(argc, argv);
+ Application a(argc, argv);
- // Set some application metadata
- QApplication::setApplicationVersion(PV_VERSION_STRING);
- QApplication::setApplicationName("PulseView");
- QApplication::setOrganizationDomain("http://www.sigrok.org");
+#ifdef ANDROID
+ srau_init_environment();
+ pv::AndroidLogHandler::install_callbacks();
+#endif
// Parse arguments
while (1) {
const int loglevel = atoi(optarg);
sr_log_loglevel_set(loglevel);
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
srd_log_loglevel_set(loglevel);
#endif
do {
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
// Initialise libsigrokdecode
if (srd_init(NULL) != SRD_OK) {
qDebug() << "ERROR: libsigrokdecode init failed.";
qDebug() << e.what();
}
-#ifdef ENABLE_SIGROKDECODE
+#ifdef ENABLE_DECODE
// Destroy libsigrokdecode
srd_exit();
#endif