projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pulseview_cross.nsi.in: Bump Python version to 3.6.
[pulseview.git]
/
pv
/
data
/
segment.hpp
diff --git
a/pv/data/segment.hpp
b/pv/data/segment.hpp
index a754eab2604eb4918a1b20c2efb1ac2700f462a9..db34b7687cdd098179b55a483be5ecab7c7c9650 100644
(file)
--- a/
pv/data/segment.hpp
+++ b/
pv/data/segment.hpp
@@
-14,12
+14,13
@@
* 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_SNAPSHOT_H
-#define PULSEVIEW_PV_DATA_SNAPSHOT_H
+#ifndef PULSEVIEW_PV_DATA_SEGMENT_HPP
+#define PULSEVIEW_PV_DATA_SEGMENT_HPP
+
+#include "pv/util.hpp"
#include <thread>
#include <mutex>
#include <thread>
#include <mutex>
@@
-37,7
+38,7
@@
public:
uint64_t get_sample_count() const;
uint64_t get_sample_count() const;
-
double
start_time() const;
+
const pv::util::Timestamp&
start_time() const;
double samplerate() const;
void set_samplerate(double samplerate);
double samplerate() const;
void set_samplerate(double samplerate);
@@
-78,7
+79,7
@@
protected:
mutable std::recursive_mutex mutex_;
std::vector<uint8_t> data_;
uint64_t sample_count_;
mutable std::recursive_mutex mutex_;
std::vector<uint8_t> data_;
uint64_t sample_count_;
-
double
start_time_;
+
pv::util::Timestamp
start_time_;
double samplerate_;
uint64_t capacity_;
unsigned int unit_size_;
double samplerate_;
uint64_t capacity_;
unsigned int unit_size_;
@@
-87,4
+88,4
@@
protected:
} // namespace data
} // namespace pv
} // namespace data
} // namespace pv
-#endif // PULSEVIEW_PV_DATA_S
NAPSHOT_H
+#endif // PULSEVIEW_PV_DATA_S
EGMENT_HPP