X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fstoresession.cpp;h=55b199a3380bfee054f1152000c7c87c380b55c9;hb=038a14278afb24e10cd59991c2cafd97264fd3a5;hp=16665369be2b9a2bf7b6d53d5ef66a6ef5c617c0;hpb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace;p=pulseview.git
diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 1666536..55b199a 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.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
@@ -218,10 +217,6 @@ void StoreSession::store_proc(vector< shared_ptr > achannel_li
{
unsigned progress_scale = 0;
- /// TODO: Wrap this in a std::unique_ptr when we transition to C++11
- uint8_t *const ldata = new uint8_t[BlockSize];
- assert(ldata);
-
int aunit_size = 0;
int lunit_size = 0;
unsigned int lsamples_per_block = INT_MAX;
@@ -279,14 +274,17 @@ void StoreSession::store_proc(vector< shared_ptr > achannel_li
}
if (lsegment) {
- lsegment->get_samples(ldata, start_sample_, start_sample_ + packet_len);
+ const uint8_t* ldata =
+ lsegment->get_samples(start_sample_, start_sample_ + packet_len);
const size_t length = packet_len * lunit_size;
- auto logic = context->create_logic_packet(ldata, length, lunit_size);
+ auto logic = context->create_logic_packet((void*)ldata, length, lunit_size);
const string ldata_str = output_->receive(logic);
if (output_stream_.is_open())
output_stream_ << ldata_str;
+
+ delete[] ldata;
}
} catch (Error error) {
error_ = tr("Error while saving: ") + error.what();
@@ -301,12 +299,11 @@ void StoreSession::store_proc(vector< shared_ptr > achannel_li
// Zeroing the progress variables indicates completion
units_stored_ = unit_count_ = 0;
+ store_successful();
progress_updated();
output_.reset();
output_stream_.close();
-
- delete[] ldata;
}
} // pv