#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 {
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;
// 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;
{
if (_annotations.empty())
return 0;
- return _annotations.back()->end_sample();
+ return _annotations.back().end_sample();
}
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);
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();
}