projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use SignalBase instead of LogicSignal for decoders
[pulseview.git]
/
pv
/
data
/
decode
/
decoder.hpp
diff --git
a/pv/data/decode/decoder.hpp
b/pv/data/decode/decoder.hpp
index 2d9fcc639591a5226101f40eb8ded32911447dbf..105c6f744b0cf897df19e64d7237a06ddf50fb67 100644
(file)
--- a/
pv/data/decode/decoder.hpp
+++ b/
pv/data/decode/decoder.hpp
@@
-34,13
+34,10
@@
struct srd_session;
namespace pv {
namespace pv {
-namespace view {
-class LogicSignal;
-}
-
namespace data {
class Logic;
namespace data {
class Logic;
+class SignalBase;
namespace decode {
namespace decode {
@@
-57,9
+54,9
@@
public:
void show(bool show = true);
const std::map<const srd_channel*,
void show(bool show = true);
const std::map<const srd_channel*,
- std::shared_ptr<
view::LogicSignal
> >& channels() const;
+ std::shared_ptr<
data::SignalBase
> >& channels() const;
void set_channels(std::map<const srd_channel*,
void set_channels(std::map<const srd_channel*,
- std::shared_ptr<
view::LogicSignal
> > channels);
+ std::shared_ptr<
data::SignalBase
> > channels);
const std::map<std::string, GVariant*>& options() const;
const std::map<std::string, GVariant*>& options() const;
@@
-77,7
+74,7
@@
private:
bool shown_;
bool shown_;
- std::map<const srd_channel*, std::shared_ptr<pv::
view::LogicSignal
> >
+ std::map<const srd_channel*, std::shared_ptr<pv::
data::SignalBase
> >
channels_;
std::map<std::string, GVariant*> options_;
};
channels_;
std::map<std::string, GVariant*> options_;
};