X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=5fae925886155a900394cb64d6861e6e3fb37b82;hb=8b2eb22ed4f467f5364e8e9824a12137e2433b7e;hp=374dd4d360c9bf8bca84f544eaf04892395c9888;hpb=da50281d69f15d125b56971a3009fd31cbbab58b;p=pulseview.git
diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 374dd4d..5fae925 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,7 +43,7 @@ Decoder::Decoder(const srd_decoder *const dec) :
Decoder::~Decoder()
{
- for (auto & option : options_)
+ for (auto& option : options_)
g_variant_unref(option.second);
}
@@ -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,10 +101,10 @@ bool Decoder::have_required_channels() const
set< shared_ptr > Decoder::get_data()
{
set< shared_ptr > data;
- for (const auto & channel : channels_) {
- shared_ptr signal(channel.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;
@@ -116,7 +115,7 @@ 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 (const auto & option : options_) {
+ for (const auto& option : options_) {
GVariant *const value = option.second;
g_variant_ref(value);
g_hash_table_replace(opt_hash, (void*)g_strdup(
@@ -134,10 +133,9 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
GHashTable *const channels = g_hash_table_new_full(g_str_hash,
g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
- for (const auto & channel : channels_) {
- shared_ptr signal(channel.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, channel.first->id, gvar);
}