+ return NULL;
+ }
+
+ return in;
+}
+
+void SigSession::update_signals()
+{
+ assert(_capture_state == Stopped);
+
+ shared_ptr<view::Signal> signal;
+ unsigned int logic_probe_count = 0;
+ unsigned int analog_probe_count = 0;
+
+ // Detect what data types we will receive
+ 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;
+
+ switch(probe->type) {
+ case SR_PROBE_LOGIC:
+ logic_probe_count++;
+ break;
+
+ case SR_PROBE_ANALOG:
+ analog_probe_count++;
+ break;
+ }
+ }
+ }
+
+ // Create data containers for the data snapshots
+ {
+ lock_guard<mutex> data_lock(_data_mutex);
+
+ _logic_data.reset();
+ if (logic_probe_count != 0) {
+ _logic_data.reset(new data::Logic(
+ logic_probe_count));
+ assert(_logic_data);
+ }
+
+ _analog_data.reset();
+ if (analog_probe_count != 0) {
+ _analog_data.reset(new data::Analog());
+ assert(_analog_data);
+ }
+ }
+
+ // Make the Signals list
+ {
+ lock_guard<mutex> lock(_signals_mutex);
+
+ _signals.clear();
+
+ if(_sdi) {
+ for (const GSList *l = _sdi->probes; l; l = l->next) {
+ const sr_probe *const probe =
+ (const sr_probe *)l->data;
+ assert(probe);
+
+ switch(probe->type) {
+ case SR_PROBE_LOGIC:
+ signal = shared_ptr<view::Signal>(
+ new view::LogicSignal(probe,
+ _logic_data));
+ break;
+
+ case SR_PROBE_ANALOG:
+ signal = shared_ptr<view::Signal>(
+ new view::AnalogSignal(probe,
+ _analog_data));
+ break;
+ }
+
+ _signals.push_back(signal);
+ }
+ }