#include "signaldata.h"
+#include <atomic>
+#include <condition_variable>
#include <list>
+#include <map>
+#include <memory>
+#include <thread>
#include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
#include <QObject>
#include <QString>
struct srd_session;
namespace DecoderStackTest {
-class TwoDecoderStack;
+struct TwoDecoderStack;
}
namespace pv {
virtual ~DecoderStack();
- const std::list< boost::shared_ptr<decode::Decoder> >& stack() const;
- void push(boost::shared_ptr<decode::Decoder> decoder);
+ const std::list< std::shared_ptr<decode::Decoder> >& stack() const;
+ void push(std::shared_ptr<decode::Decoder> decoder);
void remove(int index);
int64_t samples_decoded() const;
static void annotation_callback(srd_proto_data *pdata,
void *decoder);
-private slots:
+private Q_SLOTS:
void on_new_frame();
void on_data_received();
void on_frame_ended();
-signals:
+Q_SIGNALS:
void new_decode_data();
private:
* @todo A proper solution should be implemented to allow multiple
* decode operations.
*/
- static boost::mutex _global_decode_mutex;
+ static std::mutex _global_decode_mutex;
- std::list< boost::shared_ptr<decode::Decoder> > _stack;
+ std::list< std::shared_ptr<decode::Decoder> > _stack;
- boost::shared_ptr<pv::data::LogicSnapshot> _snapshot;
+ std::shared_ptr<pv::data::LogicSnapshot> _snapshot;
- mutable boost::mutex _input_mutex;
- mutable boost::condition_variable _input_cond;
+ mutable std::mutex _input_mutex;
+ mutable std::condition_variable _input_cond;
int64_t _sample_count;
bool _frame_complete;
- mutable boost::mutex _output_mutex;
+ mutable std::mutex _output_mutex;
int64_t _samples_decoded;
std::map<const decode::Row, decode::RowData> _rows;
QString _error_message;
- boost::thread _decode_thread;
+ std::thread _decode_thread;
+ std::atomic<bool> _interrupt;
- friend class DecoderStackTest::TwoDecoderStack;
+ friend struct DecoderStackTest::TwoDecoderStack;
};
} // namespace data