projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only show sampling points when zoomed in far enough.
[pulseview.git]
/
pv
/
data
/
decoderstack.hpp
diff --git
a/pv/data/decoderstack.hpp
b/pv/data/decoderstack.hpp
index cd380dfbec22a97e3ebfc737a1fe762adff10fc2..19a060f2bccdaa37360982fe54677ceb7b7a8608 100644
(file)
--- 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
* 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 <http://www.gnu.org/licenses/>.
*/
#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_HPP
*/
#ifndef PULSEVIEW_PV_DATA_DECODERSTACK_HPP
@@
-37,6
+36,7
@@
#include <pv/data/decode/row.hpp>
#include <pv/data/decode/rowdata.hpp>
#include <pv/data/decode/row.hpp>
#include <pv/data/decode/rowdata.hpp>
+#include <pv/util.hpp>
struct srd_decoder;
struct srd_decoder_annotation_row;
struct srd_decoder;
struct srd_decoder_annotation_row;
@@
-78,8
+78,7
@@
private:
static const unsigned int DecodeNotifyPeriod;
public:
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();
virtual ~DecoderStack();
@@
-89,7
+88,7
@@
public:
double samplerate() const;
double samplerate() const;
-
double
start_time() const;
+
const pv::util::Timestamp&
start_time() const;
int64_t samples_decoded() const;
int64_t samples_decoded() const;
@@
-107,14
+106,14
@@
public:
void clear();
void clear();
- uint64_t
get_
max_sample_count() const;
+ uint64_t max_sample_count() const;
void begin_decode();
private:
boost::optional<int64_t> wait_for_data() const;
void begin_decode();
private:
boost::optional<int64_t> 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();
const unsigned int unit_size, srd_session *const session);
void decode_proc();
@@
-135,16
+134,16
@@
Q_SIGNALS:
private:
pv::Session &session_;
private:
pv::Session &session_;
-
double
start_time_;
+
pv::util::Timestamp
start_time_;
double samplerate_;
/**
double samplerate_;
/**
- * This mutex prevents more than one
decode operation occur
ing
- * concurrently.
+ * This mutex prevents more than one
thread from access
ing
+ *
libsigrokdecode
concurrently.
* @todo A proper solution should be implemented to allow multiple
* @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<decode::Decoder> > stack_;
std::list< std::shared_ptr<decode::Decoder> > stack_;