projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added pv::device::Device
[pulseview.git]
/
pv
/
sigsession.cpp
diff --git
a/pv/sigsession.cpp
b/pv/sigsession.cpp
index 622bf8d2c5b4dedf18143df7e5824282178c4995..4469a3eef367071c44a545d3c3a1a8ae746742cc 100644
(file)
--- a/
pv/sigsession.cpp
+++ b/
pv/sigsession.cpp
@@
-25,7
+25,7
@@
#include "sigsession.h"
#include "devicemanager.h"
#include "sigsession.h"
#include "devicemanager.h"
-#include "device/devi
nst
.h"
+#include "device/devi
ce
.h"
#include "data/analog.h"
#include "data/analogsnapshot.h"
#include "data/analog.h"
#include "data/analogsnapshot.h"
@@
-127,7
+127,7
@@
void SigSession::load_file(const string &name,
}
shared_ptr<device::DevInst> dev_inst(
}
shared_ptr<device::DevInst> dev_inst(
- new device::Dev
Inst
((sr_dev_inst*)devlist->data));
+ new device::Dev
ice
((sr_dev_inst*)devlist->data));
g_slist_free(devlist);
_decode_traces.clear();
g_slist_free(devlist);
_decode_traces.clear();
@@
-147,7
+147,7
@@
void SigSession::load_file(const string &name,
_decode_traces.clear();
update_signals(shared_ptr<device::DevInst>(
_decode_traces.clear();
update_signals(shared_ptr<device::DevInst>(
- new device::Dev
Inst
(in->sdi)));
+ new device::Dev
ice
(in->sdi)));
read_sample_rate(in->sdi);
_sampling_thread = boost::thread(
read_sample_rate(in->sdi);
_sampling_thread = boost::thread(