projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused "using" declarations.
[pulseview.git]
/
pv
/
storesession.cpp
diff --git
a/pv/storesession.cpp
b/pv/storesession.cpp
index 52a6be34c490fe27cb9bcfb3cf263c5a47b530df..8916cb8cd154e078837cef5174813e8e4bd38d1c 100644
(file)
--- a/
pv/storesession.cpp
+++ b/
pv/storesession.cpp
@@
-24,8
+24,6
@@
#define NOGDI
#define NORESOURCE
#endif
#define NOGDI
#define NORESOURCE
#endif
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
#include "storesession.hpp"
#include "storesession.hpp"
@@
-40,11
+38,7
@@
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
-using boost::shared_lock;
-using boost::shared_mutex;
-
using std::deque;
using std::deque;
-using std::dynamic_pointer_cast;
using std::ios_base;
using std::lock_guard;
using std::make_pair;
using std::ios_base;
using std::lock_guard;
using std::make_pair;
@@
-52,16
+46,13
@@
using std::map;
using std::min;
using std::mutex;
using std::pair;
using std::min;
using std::mutex;
using std::pair;
-using std::set;
using std::shared_ptr;
using std::string;
using std::shared_ptr;
using std::string;
-using std::thread;
using std::unordered_set;
using std::vector;
using Glib::VariantBase;
using std::unordered_set;
using std::vector;
using Glib::VariantBase;
-using sigrok::ChannelType;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
@@
-71,10
+62,10
@@
namespace pv {
const size_t StoreSession::BlockSize = 10 * 1024 * 1024;
const size_t StoreSession::BlockSize = 10 * 1024 * 1024;
-StoreSession::StoreSession(const st
d::st
ring &file_name,
+StoreSession::StoreSession(const string &file_name,
const shared_ptr<OutputFormat> &output_format,
const map<string, VariantBase> &options,
const shared_ptr<OutputFormat> &output_format,
const map<string, VariantBase> &options,
- const
std::
pair<uint64_t, uint64_t> sample_range,
+ const pair<uint64_t, uint64_t> sample_range,
const Session &session) :
file_name_(file_name),
output_format_(output_format),
const Session &session) :
file_name_(file_name),
output_format_(output_format),
@@
-116,7
+107,7
@@
bool StoreSession::start()
if (!signal->enabled())
continue;
if (!signal->enabled())
continue;
- if (signal->type() ==
ChannelType::LOGIC
) {
+ if (signal->type() ==
data::SignalBase::LogicChannel
) {
// All logic channels share the same data segments
shared_ptr<data::Logic> ldata = signal->logic_data();
// All logic channels share the same data segments
shared_ptr<data::Logic> ldata = signal->logic_data();
@@
-132,7
+123,7
@@
bool StoreSession::start()
any_segment = lsegment;
}
any_segment = lsegment;
}
- if (signal->type() ==
ChannelType::ANALOG
) {
+ if (signal->type() ==
data::SignalBase::AnalogChannel
) {
// Each analog channel has its own segments
shared_ptr<data::Analog> adata = signal->analog_data();
// Each analog channel has its own segments
shared_ptr<data::Analog> adata = signal->analog_data();
@@
-240,13
+231,13
@@
void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
unit_count_ = sample_count_ >> progress_scale;
const unsigned int samples_per_block =
unit_count_ = sample_count_ >> progress_scale;
const unsigned int samples_per_block =
-
std::
min(asamples_per_block, lsamples_per_block);
+ min(asamples_per_block, lsamples_per_block);
while (!interrupt_ && sample_count_) {
progress_updated();
const uint64_t packet_len =
while (!interrupt_ && sample_count_) {
progress_updated();
const uint64_t packet_len =
-
std::
min((uint64_t)samples_per_block, sample_count_);
+ min((uint64_t)samples_per_block, sample_count_);
try {
const auto context = session_.device_manager().context();
try {
const auto context = session_.device_manager().context();