#include "sigsession.h"
#include "devicemanager.h"
+
#include "data/analog.h"
#include "data/analogsnapshot.h"
+#include "data/decoder.h"
#include "data/logic.h"
#include "data/logicsnapshot.h"
+
#include "view/analogsignal.h"
+#include "view/decodesignal.h"
#include "view/logicsignal.h"
#include <assert.h>
{
stop_capture();
- if (_sampling_thread.get())
- _sampling_thread->join();
- _sampling_thread.reset();
+ _sampling_thread.join();
if (_sdi)
_device_manager.release_device(_sdi);
if (sdi)
_device_manager.use_device(sdi, this);
_sdi = sdi;
- update_signals();
+ update_signals(sdi);
}
void SigSession::release_device(struct sr_dev_inst *sdi)
assert(_capture_state == Stopped);
_sdi = NULL;
- update_signals();
+ update_signals(NULL);
}
void SigSession::load_file(const string &name,
function<void (const QString)> error_handler)
{
stop_capture();
- _sampling_thread.reset(new boost::thread(
- &SigSession::load_thread_proc, this, name,
- error_handler));
+
+ if (sr_session_load(name.c_str()) == SR_OK) {
+ GSList *devlist = NULL;
+ sr_session_dev_list(&devlist);
+
+ if (!devlist || !devlist->data ||
+ sr_session_start() != SR_OK) {
+ error_handler(tr("Failed to start session."));
+ return;
+ }
+
+ sr_dev_inst *const sdi = (sr_dev_inst*)devlist->data;
+ g_slist_free(devlist);
+
+ update_signals(sdi);
+ read_sample_rate(sdi);
+
+ _sampling_thread = boost::thread(
+ &SigSession::load_session_thread_proc, this,
+ error_handler);
+
+ } else {
+ sr_input *in = NULL;
+
+ if (!(in = load_input_file_format(name.c_str(),
+ error_handler)))
+ return;
+
+ update_signals(in->sdi);
+ read_sample_rate(in->sdi);
+
+ _sampling_thread = boost::thread(
+ &SigSession::load_input_thread_proc, this,
+ 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()
+vector< shared_ptr<view::Signal> > SigSession::get_signals() const
{
lock_guard<mutex> lock(_signals_mutex);
return _signals;
return _logic_data;
}
+void SigSession::add_decoder(srd_decoder *const dec,
+ std::map<const srd_probe*,
+ boost::shared_ptr<view::Signal> > probes)
+{
+ {
+ lock_guard<mutex> lock(_signals_mutex);
+ shared_ptr<data::Decoder> decoder(
+ new data::Decoder(dec, probes));
+ shared_ptr<view::DecodeSignal> d(
+ new view::DecodeSignal(*this, decoder));
+ _decode_traces.push_back(d);
+ }
+ signals_changed();
+}
+
+vector< shared_ptr<view::DecodeSignal> > SigSession::get_decode_signals() const
+{
+ lock_guard<mutex> lock(_signals_mutex);
+ return _decode_traces;
+}
+
void SigSession::set_capture_state(capture_state state)
{
lock_guard<mutex> lock(_sampling_mutex);
return in;
}
-void SigSession::update_signals()
+void SigSession::update_signals(const sr_dev_inst *const sdi)
{
assert(_capture_state == Stopped);
unsigned int logic_probe_count = 0;
unsigned int analog_probe_count = 0;
+ // Clear the decode traces
+ _decode_traces.clear();
+
// Detect what data types we will receive
- if(_sdi) {
- for (const GSList *l = _sdi->probes; l; l = l->next) {
+ if(sdi) {
+ for (const GSList *l = sdi->probes; l; l = l->next) {
const sr_probe *const probe = (const sr_probe *)l->data;
if (!probe->enabled)
continue;
_signals.clear();
- if(_sdi) {
- for (const GSList *l = _sdi->probes; l; l = l->next) {
+ if(sdi) {
+ for (const GSList *l = sdi->probes; l; l = l->next) {
const sr_probe *const probe =
(const sr_probe *)l->data;
assert(probe);
return false;
}
-void SigSession::load_thread_proc(const string name,
- function<void (const QString)> error_handler)
+void SigSession::read_sample_rate(const sr_dev_inst *const sdi)
{
- sr_input *in = NULL;
+ GVariant *gvar;
+ uint64_t sample_rate = 0;
- if (sr_session_load(name.c_str()) == SR_OK) {
- if (sr_session_start() != SR_OK) {
- error_handler(tr("Failed to start session."));
+ // Read out the sample rate
+ if(sdi->driver)
+ {
+ const int ret = sr_config_get(sdi->driver,
+ SR_CONF_SAMPLERATE, &gvar, sdi);
+ if (ret != SR_OK) {
+ qDebug("Failed to get samplerate\n");
return;
}
+
+ sample_rate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
}
- else if(!(in = load_input_file_format(name.c_str(), error_handler)))
- return;
+
+ if(_analog_data)
+ _analog_data->set_samplerate(sample_rate);
+ if(_logic_data)
+ _logic_data->set_samplerate(sample_rate);
+}
+
+void SigSession::load_session_thread_proc(
+ function<void (const QString)> error_handler)
+{
+ (void)error_handler;
+
+ sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
+
+ set_capture_state(Running);
+
+ sr_session_run();
+
+ sr_session_destroy();
+ set_capture_state(Stopped);
+
+ // Confirm that SR_DF_END was received
+ assert(!_cur_logic_snapshot);
+ assert(!_cur_analog_snapshot);
+}
+
+void SigSession::load_input_thread_proc(const string name,
+ sr_input *in, function<void (const QString)> error_handler)
+{
+ (void)error_handler;
+
+ assert(in);
+ assert(in->format);
sr_session_datafeed_callback_add(data_feed_in_proc, NULL);
set_capture_state(Running);
- if(in) {
- assert(in->format);
- in->format->loadfile(in, name.c_str());
- } else
- sr_session_run();
+ in->format->loadfile(in, name.c_str());
sr_session_destroy();
set_capture_state(Stopped);
void SigSession::feed_in_header(const sr_dev_inst *sdi)
{
- GVariant *gvar;
- uint64_t sample_rate = 0;
-
- // Read out the sample rate
- if(sdi->driver)
- {
- const int ret = sr_config_get(sdi->driver,
- SR_CONF_SAMPLERATE, &gvar, sdi);
- if (ret != SR_OK) {
- qDebug("Failed to get samplerate\n");
- return;
- }
-
- sample_rate = g_variant_get_uint64(gvar);
- g_variant_unref(gvar);
- }
-
- if(_analog_data)
- _analog_data->set_samplerate(sample_rate);
- if(_logic_data)
- _logic_data->set_samplerate(sample_rate);
+ read_sample_rate(sdi);
}
void SigSession::feed_in_meta(const sr_dev_inst *sdi,
break;
}
}
+
+ signals_changed();
}
void SigSession::feed_in_logic(const sr_datafeed_logic &logic)
projects / pulseview.git / blobdiff