projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SelectableItem: Fix documentation
[pulseview.git]
/
pv
/
data
/
decoderstack.h
diff --git
a/pv/data/decoderstack.h
b/pv/data/decoderstack.h
index 1badc6b9b34988aafb41265b54d9b5681be64852..35f76874bc77bfbc40230aa51d956b7380bed7a5 100644
(file)
--- a/
pv/data/decoderstack.h
+++ b/
pv/data/decoderstack.h
@@
-23,11
+23,14
@@
#include "signaldata.h"
#include "signaldata.h"
+#include <atomic>
+#include <condition_variable>
#include <list>
#include <list>
+#include <map>
#include <memory>
#include <memory>
+#include <thread>
#include <boost/optional.hpp>
#include <boost/optional.hpp>
-#include <boost/thread.hpp>
#include <QObject>
#include <QString>
#include <QObject>
#include <QString>
@@
-42,7
+45,7
@@
struct srd_proto_data;
struct srd_session;
namespace DecoderStackTest {
struct srd_session;
namespace DecoderStackTest {
-
class
TwoDecoderStack;
+
struct
TwoDecoderStack;
}
namespace pv {
}
namespace pv {
@@
-115,14
+118,14
@@
private:
static void annotation_callback(srd_proto_data *pdata,
void *decoder);
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();
void on_new_frame();
void on_data_received();
void on_frame_ended();
-
signals
:
+
Q_SIGNALS
:
void new_decode_data();
private:
void new_decode_data();
private:
@@
-134,18
+137,18
@@
private:
* @todo A proper solution should be implemented to allow multiple
* decode operations.
*/
* @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< std::shared_ptr<decode::Decoder> > _stack;
std::shared_ptr<pv::data::LogicSnapshot> _snapshot;
std::list< std::shared_ptr<decode::Decoder> > _stack;
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;
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;
int64_t _samples_decoded;
std::map<const decode::Row, decode::RowData> _rows;
@@
-154,9
+157,10
@@
private:
QString _error_message;
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
};
} // namespace data