#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<view::decode::Annotation> DecoderStack::annotations() const
+const vector<decode::Annotation> DecoderStack::annotations() const
{
lock_guard<mutex> lock(_mutex);
return _annotations;
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);