X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.hpp;h=3d3e01d4787df95cbce69d9f1dd5471eaed8cbed;hp=fbe59059cf6190167d8cc0333c27e01008e094eb;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329

diff --git a/pv/data/decode/decoder.hpp b/pv/data/decode/decoder.hpp
index fbe5905..3d3e01d 100644
--- a/pv/data/decode/decoder.hpp
+++ b/pv/data/decode/decoder.hpp
@@ -14,12 +14,11 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_DATA_DECODE_DECODER_H
-#define PULSEVIEW_PV_DATA_DECODE_DECODER_H
+#ifndef PULSEVIEW_PV_DATA_DECODE_DECODER_HPP
+#define PULSEVIEW_PV_DATA_DECODE_DECODER_HPP
 
 #include <map>
 #include <memory>
@@ -34,20 +33,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 +53,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,16 +64,16 @@ 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();	
+	std::set< std::shared_ptr<pv::data::Logic> > get_data();
 
 private:
 	const srd_decoder *const decoder_;
 
 	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_;
 };
@@ -86,4 +82,4 @@ private:
 } // namespace data
 } // namespace pv
 
-#endif // PULSEVIEW_PV_DATA_DECODE_DECODER_H
+#endif // PULSEVIEW_PV_DATA_DECODE_DECODER_HPP