projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Installer: Update icon cache also after uninstallation
[pulseview.git]
/
pv
/
session.cpp
diff --git
a/pv/session.cpp
b/pv/session.cpp
index f65b05a1588cad8ea001d31fdcdd3df7e6e94eca..eec1a051b5a8838ba3f81b58c0759adbadb024a9 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-17,30
+17,25
@@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
#include <QFileInfo>
#include <cassert>
#include <QFileInfo>
#include <cassert>
+#include <memory>
#include <mutex>
#include <stdexcept>
#include <sys/stat.h>
#include <mutex>
#include <stdexcept>
#include <sys/stat.h>
-#include "session.hpp"
#include "devicemanager.hpp"
#include "devicemanager.hpp"
+#include "session.hpp"
#include "data/analog.hpp"
#include "data/analogsegment.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/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"
#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::runtime_error;
using std::shared_ptr;
using std::string;
+using std::unique_ptr;
using std::unordered_set;
using std::vector;
using std::unordered_set;
using std::vector;
@@
-981,12
+977,15
@@
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 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 = static_cast<const float *>(analog->data_pointer());
bool sweep_beginning = false;
bool sweep_beginning = false;
+ unique_ptr<float> data(new float[analog->num_samples()]);
+ analog->get_data_as_float(data.get());
+
if (signalbases_.empty())
update_signals();
if (signalbases_.empty())
update_signals();
+ float *channel_data = data.get();
for (auto channel : channels) {
shared_ptr<data::AnalogSegment> segment;
for (auto channel : channels) {
shared_ptr<data::AnalogSegment> segment;
@@
-1020,7
+1019,7
@@
void Session::feed_in_analog(shared_ptr<Analog> analog)
assert(segment);
// Append the samples in the segment
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);
}
channel_count);
}
@@
-1035,7
+1034,7
@@
void Session::feed_in_analog(shared_ptr<Analog> analog)
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
shared_ptr<Packet> packet)
{
void Session::data_feed_in(shared_ptr<sigrok::Device> device,
shared_ptr<Packet> packet)
{
- static bool frame_began
=
false;
+ static bool frame_began
=
false;
(void)device;
(void)device;