X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.hpp;h=5216006ef4b5567a543fe36b4afa46721ea535de;hb=e0ddc2a408e3b667ca8e15d8482ecdcb03d46d30;hp=7be7308bdda98ec8bd68edcb83ec02c44f573012;hpb=520362f8c4082820193f09e43b27a8c7df2ef011;p=pulseview.git
diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index 7be7308..5216006 100644
--- a/pv/data/decoderstack.hpp
+++ b/pv/data/decoderstack.hpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_HPP
@@ -39,6 +38,15 @@
#include
#include
+using std::atomic;
+using std::condition_variable;
+using std::list;
+using std::map;
+using std::mutex;
+using std::pair;
+using std::shared_ptr;
+using std::vector;
+
struct srd_decoder;
struct srd_decoder_annotation_row;
struct srd_channel;
@@ -83,8 +91,8 @@ public:
virtual ~DecoderStack();
- const std::list< std::shared_ptr >& stack() const;
- void push(std::shared_ptr decoder);
+ const list< shared_ptr >& stack() const;
+ void push(shared_ptr decoder);
void remove(int index);
double samplerate() const;
@@ -93,13 +101,13 @@ public:
int64_t samples_decoded() const;
- std::vector get_visible_rows() const;
+ vector get_visible_rows() const;
/**
* Extracts sorted annotations between two period into a vector.
*/
void get_annotation_subset(
- std::vector &dest,
+ vector &dest,
const decode::Row &row, uint64_t start_sample,
uint64_t end_sample) const;
@@ -114,13 +122,12 @@ public:
private:
boost::optional wait_for_data() const;
- void decode_data(const int64_t sample_count,
+ void decode_data(const int64_t abs_start_samplenum, const int64_t sample_count,
const unsigned int unit_size, srd_session *const session);
void decode_proc();
- static void annotation_callback(srd_proto_data *pdata,
- void *decoder);
+ static void annotation_callback(srd_proto_data *pdata, void *decoder);
private Q_SLOTS:
void on_new_frame();
@@ -144,28 +151,28 @@ private:
* @todo A proper solution should be implemented to allow multiple
* decode operations in parallel.
*/
- static std::mutex global_srd_mutex_;
+ static mutex global_srd_mutex_;
- std::list< std::shared_ptr > stack_;
+ list< shared_ptr > stack_;
- std::shared_ptr segment_;
+ shared_ptr segment_;
- mutable std::mutex input_mutex_;
- mutable std::condition_variable input_cond_;
+ mutable mutex input_mutex_;
+ mutable condition_variable input_cond_;
int64_t sample_count_;
bool frame_complete_;
- mutable std::mutex output_mutex_;
+ mutable mutex output_mutex_;
int64_t samples_decoded_;
- std::map rows_;
+ map rows_;
- std::map, decode::Row> class_rows_;
+ map, decode::Row> class_rows_;
QString error_message_;
std::thread decode_thread_;
- std::atomic interrupt_;
+ atomic interrupt_;
friend struct DecoderStackTest::TwoDecoderStack;
};