X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.cpp;h=c2ae9116856161a94826db1adeadcfe9366d647b;hp=e588ad6b9bf173be8791b5ee392b6c2f574659d4;hb=06e810f29b6e9e3fe8ba8aba5d3823375da9bbb2;hpb=db62bbfda512aeddca5b9d7b5960e9cf24b8859c

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index e588ad6..c2ae911 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -32,8 +32,8 @@
 #include <pv/data/logic.h>
 #include <pv/data/logicsnapshot.h>
 #include <pv/data/decode/decoder.h>
+#include <pv/data/decode/annotation.h>
 #include <pv/view/logicsignal.h>
-#include <pv/view/decode/annotation.h>
 
 using namespace boost;
 using namespace std;
@@ -94,7 +94,7 @@ int64_t DecoderStack::samples_decoded() const
 	return _samples_decoded;
 }
 
-const vector<view::decode::Annotation> DecoderStack::annotations() const
+const vector<decode::Annotation> DecoderStack::annotations() const
 {
 	lock_guard<mutex> lock(_mutex);
 	return _annotations;
@@ -229,7 +229,7 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
 
 void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
 {
-	using namespace pv::view::decode;
+	using pv::data::decode::Annotation;
 
 	assert(pdata);
 	assert(decoder);