X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.hpp;h=19a060f2bccdaa37360982fe54677ceb7b7a8608;hb=00f6bae935837b38b0d03a5928ba8175d460413f;hp=e8aeed10f2b09da3db62e8fbc82c317c383ed536;hpb=2b81ae4682ade4109ffa442794de36ceb32045eb;p=pulseview.git
diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index e8aeed1..19a060f 100644
--- a/pv/data/decoderstack.hpp
+++ b/pv/data/decoderstack.hpp
@@ -14,12 +14,11 @@
* 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_H
-#define PULSEVIEW_PV_DATA_DECODERSTACK_H
+#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_HPP
+#define PULSEVIEW_PV_DATA_DECODERSTACK_HPP
#include "signaldata.hpp"
@@ -37,6 +36,7 @@
#include
#include
+#include
struct srd_decoder;
struct srd_decoder_annotation_row;
@@ -58,7 +58,7 @@ class LogicSignal;
namespace data {
-class LogicSnapshot;
+class LogicSegment;
namespace decode {
class Annotation;
@@ -67,7 +67,7 @@ class Decoder;
class Logic;
-class DecoderStack : public QObject, public SignalData
+class DecoderStack : public QObject
{
Q_OBJECT
@@ -78,8 +78,7 @@ private:
static const unsigned int DecodeNotifyPeriod;
public:
- DecoderStack(pv::Session &session_,
- const srd_decoder *const decoder);
+ DecoderStack(pv::Session &session, const srd_decoder *const dec);
virtual ~DecoderStack();
@@ -87,6 +86,10 @@ public:
void push(std::shared_ptr decoder);
void remove(int index);
+ double samplerate() const;
+
+ const pv::util::Timestamp& start_time() const;
+
int64_t samples_decoded() const;
std::vector get_visible_rows() const;
@@ -103,14 +106,14 @@ public:
void clear();
- uint64_t get_max_sample_count() const;
+ uint64_t max_sample_count() const;
void begin_decode();
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();
@@ -131,17 +134,20 @@ Q_SIGNALS:
private:
pv::Session &session_;
+ pv::util::Timestamp start_time_;
+ double samplerate_;
+
/**
- * This mutex prevents more than one decode operation occuring
- * concurrently.
+ * This mutex prevents more than one thread from accessing
+ * libsigrokdecode concurrently.
* @todo A proper solution should be implemented to allow multiple
- * decode operations.
+ * decode operations in parallel.
*/
- static std::mutex global_decode_mutex_;
+ static std::mutex global_srd_mutex_;
std::list< std::shared_ptr > stack_;
- std::shared_ptr snapshot_;
+ std::shared_ptr segment_;
mutable std::mutex input_mutex_;
mutable std::condition_variable input_cond_;
@@ -166,4 +172,4 @@ private:
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_DECODERSTACK_H
+#endif // PULSEVIEW_PV_DATA_DECODERSTACK_HPP