* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <cassert>
+
#include <libsigrok/libsigrok.h>
#include <libsigrokdecode/libsigrokdecode.h>
#include <pv/view/logicsignal.h>
-using boost::shared_ptr;
+using std::set;
using std::map;
+using std::shared_ptr;
using std::string;
namespace pv {
Decoder::~Decoder()
{
- for (map<string, GVariant*>::const_iterator i = _options.begin();
- i != _options.end(); i++)
+ for (auto i = _options.begin(); i != _options.end(); i++)
g_variant_unref((*i).second);
}
_shown = show;
}
-const map<const srd_probe*, shared_ptr<view::LogicSignal> >&
-Decoder::probes() const
+const map<const srd_channel*, shared_ptr<view::LogicSignal> >&
+Decoder::channels() const
{
return _probes;
}
-void Decoder::set_probes(std::map<const srd_probe*,
- boost::shared_ptr<view::LogicSignal> > probes)
+void Decoder::set_probes(std::map<const srd_channel*,
+ std::shared_ptr<view::LogicSignal> > probes)
{
_probes = probes;
}
bool Decoder::have_required_probes() const
{
- for (GSList *p = _decoder->probes; p; p = p->next) {
- const srd_probe *const probe = (const srd_probe*)p->data;
- assert(probe);
- if (_probes.find(probe) == _probes.end())
+ for (GSList *l = _decoder->channels; l; l = l->next) {
+ const srd_channel *const pdch = (const srd_channel*)l->data;
+ assert(pdch);
+ if (_probes.find(pdch) == _probes.end())
return false;
}
return true;
}
+set< shared_ptr<pv::data::Logic> > Decoder::get_data()
+{
+ set< shared_ptr<pv::data::Logic> > data;
+ for(auto i = _probes.cbegin(); i != _probes.cend(); i++) {
+ shared_ptr<view::LogicSignal> signal((*i).second);
+ assert(signal);
+ data.insert(signal->logic_data());
+ }
+
+ return data;
+}
+
srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_size) const
{
GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for (map<string, GVariant*>::const_iterator i = _options.begin();
- i != _options.end(); i++)
+ for (auto i = _options.cbegin(); i != _options.cend(); i++)
{
GVariant *const value = (*i).second;
g_variant_ref(value);
GHashTable *const probes = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for(map<const srd_probe*, shared_ptr<view::LogicSignal> >::
- const_iterator i = _probes.begin();
- i != _probes.end(); i++)
+ for(auto i = _probes.cbegin(); i != _probes.cend(); i++)
{
shared_ptr<view::LogicSignal> signal((*i).second);
GVariant *const gvar = g_variant_new_int32(
g_hash_table_insert(probes, (*i).first->id, gvar);
}
- srd_inst_probe_set_all(decoder_inst, probes, unit_size);
+ srd_inst_channel_set_all(decoder_inst, probes, unit_size);
return decoder_inst;
}