{
stop_capture();
- if (_sampling_thread.get())
- _sampling_thread->join();
- _sampling_thread.reset();
+ _sampling_thread.join();
if (_sdi)
_device_manager.release_device(_sdi);
update_signals(sdi);
read_sample_rate(sdi);
- _sampling_thread.reset(new boost::thread(
+ _sampling_thread = boost::thread(
&SigSession::load_session_thread_proc, this,
- error_handler));
+ error_handler);
} else {
sr_input *in = NULL;
update_signals(in->sdi);
read_sample_rate(in->sdi);
- _sampling_thread.reset(new boost::thread(
+ _sampling_thread = boost::thread(
&SigSession::load_input_thread_proc, this,
- name, in, error_handler));
+ name, in, error_handler);
}
-
}
SigSession::capture_state SigSession::get_capture_state() const
}
// Begin the session
- _sampling_thread.reset(new boost::thread(
+ _sampling_thread = boost::thread(
&SigSession::sample_thread_proc, this, _sdi,
- record_length, error_handler));
+ record_length, error_handler);
}
void SigSession::stop_capture()
sr_session_stop();
// Check that sampling stopped
- if (_sampling_thread.get())
- _sampling_thread->join();
- _sampling_thread.reset();
+ _sampling_thread.join();
}
vector< shared_ptr<view::Signal> > SigSession::get_signals() const
{
{
lock_guard<mutex> lock(_signals_mutex);
+
+ if (!_decode_traces.empty()) {
+ qDebug("Currently only one decode trace can be added "
+ "at once");
+ _decode_traces.clear();
+ }
+
shared_ptr<data::Decoder> decoder(
new data::Decoder(dec, probes));
shared_ptr<view::DecodeSignal> d(
- new view::DecodeSignal(*this, decoder));
+ new view::DecodeSignal(*this, decoder,
+ _decode_traces.size()));
_decode_traces.push_back(d);
}
signals_changed();