Fixed missing includes and formward declarations hidden by cotire.

[pulseview.git] / pv / data / decoderstack.cpp

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index f0bdd6bd4f6e3556a3777e7cabfea49d06b2acc6..5b58761f9c1c3464121299c3c6259a907015a10a 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -32,11 +32,16 @@
 #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;
+using boost::lock_guard;
+using boost::mutex;
+using boost::shared_ptr;
+using std::deque;
+using std::min;
+using std::list;
+using std::vector;
 
 namespace pv {
 namespace data {
@@ -94,8 +99,7 @@ int64_t DecoderStack::samples_decoded() const
        return _samples_decoded;
 }
 
-const vector< shared_ptr<view::decode::Annotation> >
-       DecoderStack::annotations() const
+const vector<decode::Annotation> DecoderStack::annotations() const
 {
        lock_guard<mutex> lock(_mutex);
        return _annotations;
@@ -133,7 +137,7 @@ void DecoderStack::begin_decode()
 
        // Get the samplerate and start time
        _start_time = data->get_start_time();
-       _samplerate = data->get_samplerate();
+       _samplerate = data->samplerate();
        if (_samplerate == 0.0)
                _samplerate = 1.0;
 
@@ -150,7 +154,7 @@ uint64_t DecoderStack::get_max_sample_count() const
 {
        if (_annotations.empty())
                return 0;
-       return _annotations.back()->end_sample();
+       return _annotations.back().end_sample();
 }
 
 void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
@@ -203,7 +207,8 @@ void DecoderStack::decode_proc(shared_ptr<data::Logic> data)
        srd_session_start(session);
 
        for (int64_t i = 0;
-               !this_thread::interruption_requested() && i < sample_count;
+               !boost::this_thread::interruption_requested() &&
+                       i < sample_count;
                i += DecodeChunkLength)
        {
                lock_guard<mutex> decode_lock(_global_decode_mutex);
@@ -230,16 +235,15 @@ 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);
 
        DecoderStack *const d = (DecoderStack*)decoder;
 
-       shared_ptr<Annotation> a(new Annotation(pdata));
        lock_guard<mutex> lock(d->_mutex);
-       d->_annotations.push_back(a);
+       d->_annotations.push_back(Annotation(pdata));
 
        d->new_decode_data();
 }