Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove raw new/delete from Recon (#1203)

Browse Source
This commit is contained in:
Kyle Reed 2023-06-28 10:14:30 -07:00 committed by GitHub
parent 5c1f5a7d2e
commit 3d59de55f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
firmware/application/apps/ui_recon.cpp
View File

@ -30,8 +30,6 @@ using portapack::memory::map::backup_ram;
namespace ui {
static RecordView* record_view = NULL;
void ReconView::set_loop_config(bool v) {
continuous = v;
button_loop_config.set_style(v ? &Styles::green : &Styles::white);
@ -365,7 +363,6 @@ void ReconView::focus() {
ReconView::~ReconView() {
recon_stop_recording();
delete record_view;
recon_save_config_to_sd();
if (field_mode.selected_index_value() != SPEC_MODULATION)
audio::output::stop();
@ -377,7 +374,9 @@ ReconView::~ReconView() {
ReconView::ReconView(NavigationView& nav)
: nav_{nav} {
chrono_start = chTimeNow();
record_view = new RecordView({0, 0, 30 * 8, 1 * 16}, u"AUTO_AUDIO_", u"AUDIO", RecordView::FileType::WAV, 4096, 4);
record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
u"AUTO_AUDIO_", u"AUDIO",
RecordView::FileType::WAV, 4096, 4);
add_children({&labels,
&field_lna,
&field_vga,
@ -414,7 +413,7 @@ ReconView::ReconView(NavigationView& nav)
&button_restart,
&button_mic_app,
&button_remove,
record_view});
record_view.get()});
record_view->hidden(true);
record_view->set_filename_date_frequency(true);
@ -1339,25 +1338,26 @@ size_t ReconView::change_mode(freqman_index_t new_mod) {
field_mode.on_change = [this](size_t, OptionsField::value_t) {};
field_bw.on_change = [this](size_t, OptionsField::value_t) {};
recon_stop_recording();
if (new_mod != SPEC_MODULATION) {
remove_children({record_view});
delete record_view;
record_view = new RecordView({0, 0, 30 * 8, 1 * 16}, u"AUTO_AUDIO_", u"AUDIO", RecordView::FileType::WAV, 4096, 4);
record_view->set_filename_date_frequency(true);
add_children({record_view});
}
remove_child(record_view.get());
if (new_mod == SPEC_MODULATION) {
audio::output::stop();
remove_children({record_view});
delete record_view;
record_view = new RecordView({0, 0, 30 * 8, 1 * 16}, u"AUTO_RAW_", u"CAPTURES", RecordView::FileType::RawS16, 16384, 3);
record_view->set_filename_date_frequency(true);
add_children({record_view});
record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
u"AUTO_RAW_", u"CAPTURES",
RecordView::FileType::RawS16, 16384, 3);
} else {
record_view = std::make_unique<RecordView>(Rect{0, 0, 30 * 8, 1 * 16},
u"AUTO_AUDIO_", u"AUDIO",
RecordView::FileType::WAV, 4096, 4);
}
record_view->hidden(true);
record_view->set_filename_date_frequency(true);
record_view->on_error = [this](std::string message) {
nav_.display_modal("Error", message);
};
add_child(record_view.get());
receiver_model.disable();
baseband::shutdown();
size_t recording_sampling_rate = 0;

2
firmware/application/apps/ui_recon.hpp
View File

@ -145,6 +145,8 @@ class ReconView : public View {
systime_t chrono_start{};
systime_t chrono_end{};
std::unique_ptr<RecordView> record_view{};
Labels labels{
{{0 * 8, 0 * 16}, "LNA: VGA: AMP: VOL: ", Color::light_grey()},
{{3 * 8, 8 * 16}, "START END", Color::light_grey()},