X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=4889d16acd4bc1ba75878cfe132e2d07b1202193;hp=8b60c36688dcf6f1665ae8c4c7745bb4b60bcc90;hb=472a80c58cfdbd37cb00b5ba2ef4bcd923f9b54b;hpb=15a69e5484a26428d7540cf644300cd707a31104

diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index 8b60c36..4889d16 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -32,7 +32,6 @@ using std::shared_ptr;
 
 namespace sigrok {
 class Channel;
-class ChannelType;
 }
 
 namespace pv {
@@ -47,11 +46,20 @@ class SignalBase : public QObject
 {
 	Q_OBJECT
 
+public:
+	enum ChannelType {
+		AnalogChannel = 1,
+		LogicChannel,
+		DecodeChannel,
+		A2LChannel,  // Analog converted to logic, joint representation
+		MathChannel
+	};
+
 private:
 	static const int ColourBGAlpha;
 
 public:
-	SignalBase(shared_ptr<sigrok::Channel> channel);
+	SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_type);
 	virtual ~SignalBase() {}
 
 public:
@@ -74,7 +82,7 @@ public:
 	/**
 	 * Gets the type of this channel.
 	 */
-	const sigrok::ChannelType *type() const;
+	ChannelType type() const;
 
 	/**
 	 * Gets the index number of this channel.
@@ -147,6 +155,7 @@ Q_SIGNALS:
 
 private:
 	shared_ptr<sigrok::Channel> channel_;
+	ChannelType channel_type_;
 	shared_ptr<pv::data::SignalData> data_;
 
 #ifdef ENABLE_DECODE