X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.hpp;fp=pv%2Fdata%2Fdecoderstack.hpp;h=0000000000000000000000000000000000000000;hp=37e4888f4ee28767d675b0161f081344fe972c0b;hb=477472187338948c83bea5d790ead66034008296;hpb=0c5fe73e5b66bf31d2dcfa2b2846a86cd2fdf0c4

diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
deleted file mode 100644
index 37e4888..0000000
--- a/pv/data/decoderstack.hpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * This file is part of the PulseView project.
- *
- * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_HPP
-#define PULSEVIEW_PV_DATA_DECODERSTACK_HPP
-
-#include "signaldata.hpp"
-
-#include <atomic>
-#include <condition_variable>
-#include <list>
-#include <map>
-#include <memory>
-#include <thread>
-
-#include <boost/optional.hpp>
-
-#include <QObject>
-#include <QString>
-
-#include <pv/data/decode/row.hpp>
-#include <pv/data/decode/rowdata.hpp>
-#include <pv/util.hpp>
-
-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;
-struct srd_proto_data;
-struct srd_session;
-
-namespace DecoderStackTest {
-struct TwoDecoderStack;
-}
-
-namespace pv {
-
-class Session;
-
-namespace view {
-class LogicSignal;
-}
-
-namespace data {
-
-class LogicSegment;
-
-namespace decode {
-class Annotation;
-class Decoder;
-}
-
-class Logic;
-
-class DecoderStack : public QObject
-{
-	Q_OBJECT
-
-private:
-	static const double DecodeMargin;
-	static const double DecodeThreshold;
-	static const int64_t DecodeChunkLength;
-	static const unsigned int DecodeNotifyPeriod;
-
-public:
-	DecoderStack(pv::Session &session, const srd_decoder *const dec);
-
-	virtual ~DecoderStack();
-
-	const list< shared_ptr<decode::Decoder> >& stack() const;
-	void push(shared_ptr<decode::Decoder> decoder);
-	void remove(int index);
-
-	double samplerate() const;
-
-	const pv::util::Timestamp& start_time() const;
-
-	int64_t samples_decoded() const;
-
-	vector<decode::Row> get_visible_rows() const;
-
-	/**
-	 * Helper function for static annotation_callback(),
-	 * must be public so the function can access it.
-	 * Don't use from outside this class.
-	 */
-	uint64_t inc_annotation_count();
-
-	/**
-	 * Extracts sorted annotations between two period into a vector.
-	 */
-	void get_annotation_subset(
-		vector<pv::data::decode::Annotation> &dest,
-		const decode::Row &row, uint64_t start_sample,
-		uint64_t end_sample) const;
-
-	QString error_message();
-
-	void clear();
-
-	uint64_t max_sample_count() const;
-
-	void begin_decode();
-
-private:
-	boost::optional<int64_t> wait_for_data() const;
-
-	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_stack);
-
-private Q_SLOTS:
-	void on_new_frame();
-
-	void on_data_received();
-
-	void on_frame_ended();
-
-Q_SIGNALS:
-	void new_annotations();
-
-private:
-	pv::Session &session_;
-
-	pv::util::Timestamp start_time_;
-	double samplerate_;
-
-	/**
-	 * This mutex prevents more than one thread from accessing
-	 * libsigrokdecode concurrently.
-	 * @todo A proper solution should be implemented to allow multiple
-	 * decode operations in parallel.
-	 */
-	static mutex global_srd_mutex_;
-
-	list< shared_ptr<decode::Decoder> > stack_;
-
-	shared_ptr<pv::data::LogicSegment> segment_;
-
-	mutable mutex input_mutex_;
-	mutable condition_variable input_cond_;
-	int64_t sample_count_, annotation_count_;
-	bool frame_complete_;
-
-	mutable mutex output_mutex_;
-	int64_t	samples_decoded_;
-
-	map<const decode::Row, decode::RowData> rows_;
-
-	map<pair<const srd_decoder*, int>, decode::Row> class_rows_;
-
-	QString error_message_;
-
-	std::thread decode_thread_;
-	atomic<bool> interrupt_;
-
-	friend struct DecoderStackTest::TwoDecoderStack;
-};
-
-} // namespace data
-} // namespace pv
-
-#endif // PULSEVIEW_PV_DATA_DECODERSTACK_HPP