X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=eec1a051b5a8838ba3f81b58c0759adbadb024a9;hb=c1a6513b912e90ebcca2dba4453aa03fbddcfb58;hp=d00ff97a0bbe78ae7a9e55a82e2913b36c602807;hpb=c063290ac7189bdd15221450f598504f43286b43;p=pulseview.git
diff --git a/pv/session.cpp b/pv/session.cpp
index d00ff97..eec1a05 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -17,30 +17,25 @@
* along with this program; if not, see .
*/
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
#include
#include
+#include
#include
#include
#include
-#include "session.hpp"
#include "devicemanager.hpp"
+#include "session.hpp"
#include "data/analog.hpp"
#include "data/analogsegment.hpp"
+#include "data/decode/decoder.hpp"
#include "data/decoderstack.hpp"
#include "data/logic.hpp"
#include "data/logicsegment.hpp"
#include "data/signalbase.hpp"
-#include "data/decode/decoder.hpp"
#include "devices/hardwaredevice.hpp"
#include "devices/inputfile.hpp"
@@ -77,6 +72,7 @@ using std::recursive_mutex;
using std::runtime_error;
using std::shared_ptr;
using std::string;
+using std::unique_ptr;
using std::unordered_set;
using std::vector;
@@ -981,12 +977,15 @@ void Session::feed_in_analog(shared_ptr analog)
const vector> channels = analog->channels();
const unsigned int channel_count = channels.size();
const size_t sample_count = analog->num_samples() / channel_count;
- const float *data = static_cast(analog->data_pointer());
bool sweep_beginning = false;
+ unique_ptr data(new float[analog->num_samples()]);
+ analog->get_data_as_float(data.get());
+
if (signalbases_.empty())
update_signals();
+ float *channel_data = data.get();
for (auto channel : channels) {
shared_ptr segment;
@@ -1020,7 +1019,7 @@ void Session::feed_in_analog(shared_ptr analog)
assert(segment);
// Append the samples in the segment
- segment->append_interleaved_samples(data++, sample_count,
+ segment->append_interleaved_samples(channel_data++, sample_count,
channel_count);
}