projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add serial_num/connection_id handling and save/restore last device
[pulseview.git]
/
main.cpp
diff --git
a/main.cpp
b/main.cpp
index 1761df6e77190bef639c0c527d24e891fb7fb417..5c3e5b25818ffc70d1ac28a347e9b33cb91bda47 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifdef ENABLE_
SIGROK
DECODE
-#include <sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
+#ifdef ENABLE_DECODE
+#include <
libsigrokdecode/lib
sigrokdecode.h> /* First, so we avoid a _POSIX_C_SOURCE warning. */
#endif
#include <stdint.h>
#endif
#include <stdint.h>
@@
-27,18
+27,28
@@
#include <getopt.h>
#include <getopt.h>
-#include <QtGui/QApplication>
#include <QDebug>
#ifdef ENABLE_SIGNALS
#include "signalhandler.h"
#endif
#include <QDebug>
#ifdef ENABLE_SIGNALS
#include "signalhandler.h"
#endif
+#include "pv/application.h"
#include "pv/devicemanager.h"
#include "pv/mainwindow.h"
#include "pv/devicemanager.h"
#include "pv/mainwindow.h"
+#ifdef ANDROID
+#include <libsigrokandroidutils/libsigrokandroidutils.h>
+#include "android/loghandler.h"
+#endif
#include "config.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,
void usage()
{
fprintf(stdout,
@@
-58,12
+68,12
@@
int main(int argc, char *argv[])
struct sr_context *sr_ctx = NULL;
const char *open_file = NULL;
struct sr_context *sr_ctx = NULL;
const char *open_file = NULL;
-
Q
Application 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) {
// Parse arguments
while (1) {
@@
-85,7
+95,7
@@
int main(int argc, char *argv[])
const int loglevel = atoi(optarg);
sr_log_loglevel_set(loglevel);
const int loglevel = atoi(optarg);
sr_log_loglevel_set(loglevel);
-#ifdef ENABLE_
SIGROK
DECODE
+#ifdef ENABLE_DECODE
srd_log_loglevel_set(loglevel);
#endif
srd_log_loglevel_set(loglevel);
#endif
@@
-118,7
+128,7
@@
int main(int argc, char *argv[])
do {
do {
-#ifdef ENABLE_
SIGROK
DECODE
+#ifdef ENABLE_DECODE
// Initialise libsigrokdecode
if (srd_init(NULL) != SRD_OK) {
qDebug() << "ERROR: libsigrokdecode init failed.";
// Initialise libsigrokdecode
if (srd_init(NULL) != SRD_OK) {
qDebug() << "ERROR: libsigrokdecode init failed.";
@@
-160,7
+170,7
@@
int main(int argc, char *argv[])
qDebug() << e.what();
}
qDebug() << e.what();
}
-#ifdef ENABLE_
SIGROK
DECODE
+#ifdef ENABLE_DECODE
// Destroy libsigrokdecode
srd_exit();
#endif
// Destroy libsigrokdecode
srd_exit();
#endif