X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=5fae925886155a900394cb64d6861e6e3fb37b82;hb=13e475e412663ee904b94a6510b5628bdb8b84fa;hp=018051df0fccc0182a92fb9ce6727aa9303863a0;hpb=4c60462b00cc329e61daedd1c2e66724077bd412;p=pulseview.git
diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 018051df..5fae9258 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -25,7 +24,7 @@
#include "decoder.hpp"
-#include
+#include
using std::set;
using std::map;
@@ -44,8 +43,8 @@ Decoder::Decoder(const srd_decoder *const dec) :
Decoder::~Decoder()
{
- for (auto i = options_.begin(); i != options_.end(); i++)
- g_variant_unref((*i).second);
+ for (auto& option : options_)
+ g_variant_unref(option.second);
}
const srd_decoder* Decoder::decoder() const
@@ -63,14 +62,14 @@ void Decoder::show(bool show)
shown_ = show;
}
-const map >&
+const map >&
Decoder::channels() const
{
return channels_;
}
void Decoder::set_channels(std::map > channels)
+ std::shared_ptr > channels)
{
channels_ = channels;
}
@@ -102,49 +101,46 @@ bool Decoder::have_required_channels() const
set< shared_ptr > Decoder::get_data()
{
set< shared_ptr > data;
- for(auto i = channels_.cbegin(); i != channels_.cend(); i++) {
- shared_ptr signal((*i).second);
- assert(signal);
- data.insert(signal->logic_data());
+ for (const auto& channel : channels_) {
+ shared_ptr b(channel.second);
+ assert(b);
+ data.insert(b->logic_data());
}
return data;
}
-srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session, int unit_size) const
+srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
{
GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for (auto i = options_.cbegin(); i != options_.cend(); i++)
- {
- GVariant *const value = (*i).second;
+ for (const auto& option : options_) {
+ GVariant *const value = option.second;
g_variant_ref(value);
g_hash_table_replace(opt_hash, (void*)g_strdup(
- (*i).first.c_str()), value);
+ option.first.c_str()), value);
}
srd_decoder_inst *const decoder_inst = srd_inst_new(
session, decoder_->id, opt_hash);
g_hash_table_destroy(opt_hash);
- if(!decoder_inst)
+ if (!decoder_inst)
return nullptr;
// Setup the channels
GHashTable *const channels = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for(auto i = channels_.cbegin(); i != channels_.cend(); i++)
- {
- shared_ptr signal((*i).second);
- GVariant *const gvar = g_variant_new_int32(
- signal->channel()->index());
+ for (const auto& channel : channels_) {
+ shared_ptr b(channel.second);
+ GVariant *const gvar = g_variant_new_int32(b->index());
g_variant_ref_sink(gvar);
- g_hash_table_insert(channels, (*i).first->id, gvar);
+ g_hash_table_insert(channels, channel.first->id, gvar);
}
- srd_inst_channel_set_all(decoder_inst, channels, unit_size);
+ srd_inst_channel_set_all(decoder_inst, channels);
return decoder_inst;
}