projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main window: Prefer the user specified device in new sessions
[pulseview.git]
/
pv
/
session.hpp
diff --git
a/pv/session.hpp
b/pv/session.hpp
index c27afcb15f1177ed2b7951fec816279fc69ad92a..c4f2bed83324779c0593b9d05635c9288c188f32 100644
(file)
--- a/
pv/session.hpp
+++ b/
pv/session.hpp
@@
-29,12
+29,6
@@
#include <unordered_set>
#include <vector>
#include <unordered_set>
#include <vector>
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
#include <QObject>
#include <QSettings>
#include <QString>
#include <QObject>
#include <QSettings>
#include <QString>
@@
-61,11
+55,14
@@
class Device;
class InputFormat;
class Logic;
class Meta;
class InputFormat;
class Logic;
class Meta;
+class Option;
class OutputFormat;
class Packet;
class Session;
} // namespace sigrok
class OutputFormat;
class Packet;
class Session;
} // namespace sigrok
+using sigrok::Option;
+
namespace pv {
class DeviceManager;
namespace pv {
class DeviceManager;
@@
-185,6
+182,10
@@
private:
shared_ptr<data::SignalBase> signalbase_from_channel(
shared_ptr<sigrok::Channel> channel) const;
shared_ptr<data::SignalBase> signalbase_from_channel(
shared_ptr<sigrok::Channel> channel) const;
+ static map<string, Glib::VariantBase> input_format_options(
+ vector<string> user_spec,
+ map<string, shared_ptr<Option>> fmt_opts);
+
private:
void sample_thread_proc(function<void (const QString)> error_handler);
private:
void sample_thread_proc(function<void (const QString)> error_handler);