X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=pv%2Fdata%2Fdecoderstack.hpp;h=19a060f2bccdaa37360982fe54677ceb7b7a8608;hb=1887da2169397774c9563e9bf44c51ed7efc3646;hp=383109905c03ae5e23912d186c6214b58b4a70bf;hpb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b;p=pulseview.git
diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index 38310990..19a060f2 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;
@@ -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();
@@ -89,7 +88,7 @@ public:
double samplerate() const;
- double start_time() const;
+ const pv::util::Timestamp& start_time() const;
int64_t samples_decoded() const;
@@ -107,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();
@@ -135,16 +134,16 @@ Q_SIGNALS:
private:
pv::Session &session_;
- double start_time_;
+ 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_;
@@ -173,4 +172,4 @@ private:
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_DECODERSTACK_H
+#endif // PULSEVIEW_PV_DATA_DECODERSTACK_HPP