#include "view/decodetrace.h"
#include "view/logicsignal.h"
-#include <assert.h>
-
+#include <cassert>
+#include <mutex>
#include <stdexcept>
#include <sys/stat.h>
#include <QDebug>
-using boost::dynamic_pointer_cast;
-using boost::function;
-using boost::lock_guard;
-using boost::mutex;
-using boost::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::function;
+using std::lock_guard;
+using std::mutex;
using std::list;
using std::map;
using std::set;
+using std::shared_ptr;
using std::string;
using std::vector;
{
using pv::device::Device;
+ // Stop and join to the thread
stop_capture();
- if (_sampling_thread.joinable())
- _sampling_thread.join();
-
_dev_inst->release();
// TODO: This should not be necessary
}
// Begin the session
- _sampling_thread = boost::thread(
+ _sampling_thread = std::thread(
&SigSession::sample_thread_proc, this, _dev_inst,
error_handler);
}
void SigSession::stop_capture()
{
- if (get_capture_state() == Stopped)
- return;
-
- sr_session_stop();
+ if (get_capture_state() != Stopped)
+ sr_session_stop();
// Check that sampling stopped
if (_sampling_thread.joinable())
return;
}
- set_capture_state(dev_inst->is_trigger_enabled() ?
+ set_capture_state(sr_session_trigger_get() ?
AwaitingTrigger : Running);
dev_inst->run();