Random simplifications, cosmetics/whitespace/consistency fixes.

[pulseview.git] / pv / data / decoderstack.cpp

diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 11b2b70bebc65e7503abc2dca66bf78bac54342a..8fc3242392bd2642f36a2e093010d8a8c146df38 100644 (file)
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -34,19 +34,18 @@
 
 using std::lock_guard;
 using std::mutex;
-using boost::optional;
 using std::unique_lock;
 using std::deque;
 using std::make_pair;
 using std::max;
 using std::min;
 using std::list;
-using std::map;
-using std::pair;
 using std::shared_ptr;
 using std::make_shared;
 using std::vector;
 
+using boost::optional;
+
 using namespace pv::data::decode;
 
 namespace pv {
@@ -87,13 +86,12 @@ DecoderStack::~DecoderStack()
        }
 }
 
-const std::list< std::shared_ptr<decode::Decoder> >&
-DecoderStack::stack() const
+const list< shared_ptr<decode::Decoder> >& DecoderStack::stack() const
 {
        return stack_;
 }
 
-void DecoderStack::push(std::shared_ptr<decode::Decoder> decoder)
+void DecoderStack::push(shared_ptr<decode::Decoder> decoder)
 {
        assert(decoder);
        stack_.push_back(decoder);
@@ -129,7 +127,7 @@ int64_t DecoderStack::samples_decoded() const
        return samples_decoded_;
 }
 
-std::vector<Row> DecoderStack::get_visible_rows() const
+vector<Row> DecoderStack::get_visible_rows() const
 {
        lock_guard<mutex> lock(output_mutex_);
 
@@ -145,14 +143,14 @@ std::vector<Row> DecoderStack::get_visible_rows() const
 
                // Add a row for the decoder if it doesn't have a row list
                if (!decc->annotation_rows)
-                       rows.push_back(Row(decc));
+                       rows.emplace_back(decc);
 
                // Add the decoder rows
                for (const GSList *l = decc->annotation_rows; l; l = l->next) {
                        const srd_decoder_annotation_row *const ann_row =
                                (srd_decoder_annotation_row *)l->data;
                        assert(ann_row);
-                       rows.push_back(Row(decc, ann_row));
+                       rows.emplace_back(decc, ann_row);
                }
        }
 
@@ -160,7 +158,7 @@ std::vector<Row> DecoderStack::get_visible_rows() const
 }
 
 void DecoderStack::get_annotation_subset(
-       std::vector<pv::data::decode::Annotation> &dest,
+       vector<pv::data::decode::Annotation> &dest,
        const Row &row, uint64_t start_sample,
        uint64_t end_sample) const
 {
@@ -317,8 +315,10 @@ void DecoderStack::decode_data(
                if (srd_session_send(session, i, chunk_end, chunk,
                                (chunk_end - i) * unit_size, unit_size) != SRD_OK) {
                        error_message_ = tr("Decoder reported an error");
+                       delete[] chunk;
                        break;
                }
+               delete[] chunk;
 
                {
                        lock_guard<mutex> lock(output_mutex_);
@@ -416,14 +416,14 @@ void DecoderStack::annotation_callback(srd_proto_data *pdata, void *decoder)
                row_iter = d->rows_.find((*r).second);
        else {
                // Failing that, use the decoder as a key
-               row_iter = d->rows_.find(Row(decc));    
+               row_iter = d->rows_.find(Row(decc));
        }
 
        assert(row_iter != d->rows_.end());
        if (row_iter == d->rows_.end()) {
                qDebug() << "Unexpected annotation: decoder = " << decc <<
                        ", format = " << a.format();
-               assert(0);
+               assert(false);
                return;
        }