X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.hpp;h=105c6f744b0cf897df19e64d7237a06ddf50fb67;hb=f420385094dc7392e6bcec494d800f1d4b34f082;hp=3f0f462ba4412b30f0ade603bbc5e160d07969e9;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f;p=pulseview.git

diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index 3f0f462..105c6f7 100644
--- a/pv/data/decode/decoder.hpp
+++ b/pv/data/decode/decoder.hpp
@@ -34,20 +34,17 @@ struct srd_session;
 
 namespace pv {
 
-namespace view {
-class LogicSignal;
-}
-
 namespace data {
 
 class Logic;
+class SignalBase;
 
 namespace decode {
 
 class Decoder
 {
 public:
-	Decoder(const srd_decoder *const decoder);
+	Decoder(const srd_decoder *const dec);
 
 	virtual ~Decoder();
 
@@ -57,9 +54,9 @@ public:
 	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*,
-		std::shared_ptr<view::LogicSignal> > channels);
+		std::shared_ptr<data::SignalBase> > channels);
 
 	const std::map<std::string, GVariant*>& options() const;
 
@@ -68,7 +65,7 @@ public:
 	bool have_required_channels() const;
 
 	srd_decoder_inst* create_decoder_inst(
-		srd_session *session, int unit_size) const;
+		srd_session *session) const;
 
 	std::set< std::shared_ptr<pv::data::Logic> > get_data();
 
@@ -77,7 +74,7 @@ private:
 
 	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_;
 };