From 309ff462d17c5cdd8446da9d06f0e50a2b5da724 Mon Sep 17 00:00:00 2001 From: John Glover Date: Tue, 11 Sep 2012 16:20:14 +0200 Subject: [base] Add warning for potential data loss when the max peaks/partials in a frame is changed. --- src/simpl/base.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp index ac4d120..c2289ba 100644 --- a/src/simpl/base.cpp +++ b/src/simpl/base.cpp @@ -127,8 +127,10 @@ int Frame::max_peaks() { void Frame::max_peaks(int new_max_peaks) { _max_peaks = new_max_peaks; - // TODO: potentially losing data here, should prevent or complain - if((int)_peaks.size() > _max_peaks) { + if(_num_peaks > _max_peaks) { + // losing data here, allow but warn + printf("Warning: max peaks changed to less than current number " + "of peaks, some existing data was lost.\n"); _peaks.resize(_max_peaks); } } @@ -164,8 +166,10 @@ int Frame::max_partials() { void Frame::max_partials(int new_max_partials) { _max_partials = new_max_partials; - // TODO: potentially losing data here, should prevent or complain - if((int)_partials.size() > _max_partials) { + if(_num_partials > _max_partials) { + // losing data here, allow but warn + printf("Warning: max partials changed to less than current number" + " of partials, some existing data was lost.\n"); _partials.resize(_max_partials); } } -- cgit v1.2.3