X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecoderstack.hpp;h=37f7ca886cecfe8a23dda75663021f01db51ee70;hp=99df3887ce422a5a88f718d5c223c108023f65e3;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=e45b13b536666034c9b6fe52a9321d749dae3c02

diff --git a/pv/data/decoderstack.hpp b/pv/data/decoderstack.hpp
index 99df388..37f7ca8 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 <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_DATA_DECODERSTACK_HPP
@@ -37,6 +36,7 @@
 
 #include <pv/data/decode/row.hpp>
 #include <pv/data/decode/rowdata.hpp>
+#include <pv/util.hpp>
 
 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;
 
@@ -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<decode::Decoder> > stack_;