X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=07405fe4ba79de4a0003c9d08070ed47406c23a0;hp=45c4e98790843dc67bef475a6be0594b265017b4;hb=3d79f521396c8e908fd237f5328153165099f5c3;hpb=bf9146988d2298e1750142dccdcf597ef13d6606

diff --git a/pv/session.cpp b/pv/session.cpp
index 45c4e987..07405fe4 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -18,6 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifdef _WIN32
+// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
+#define NOGDI
+#define NORESOURCE
+#endif
 #include <boost/thread/locks.hpp>
 #include <boost/thread/shared_mutex.hpp>
 
@@ -217,6 +222,25 @@ set< shared_ptr<data::SignalData> > Session::get_data() const
 	return data;
 }
 
+double Session::get_samplerate() const
+{
+	double samplerate = 0.0;
+
+	for (const shared_ptr<pv::data::SignalData> d : get_data()) {
+		assert(d);
+		const vector< shared_ptr<pv::data::Segment> > segments =
+			d->segments();
+		for (const shared_ptr<pv::data::Segment> &s : segments)
+			samplerate = std::max(samplerate, s->samplerate());
+	}
+
+	// If there is no sample rate given we use samples as unit
+	if (samplerate == 0.0)
+		samplerate = 1.0;
+
+	return samplerate;
+}
+
 const unordered_set< shared_ptr<view::Signal> > Session::signals() const
 {
 	shared_lock<shared_mutex> lock(signals_mutex_);
@@ -521,7 +545,7 @@ void Session::feed_in_analog(shared_ptr<Analog> analog)
 	const vector<shared_ptr<Channel>> channels = analog->channels();
 	const unsigned int channel_count = channels.size();
 	const size_t sample_count = analog->num_samples() / channel_count;
-	const float *data = analog->data_pointer();
+	const float *data = static_cast<const float *>(analog->data_pointer());
 	bool sweep_beginning = false;
 
 	for (auto channel : channels)