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

Merge pull request #120 from eried/WAV-viewer-bug-when-wav-file-format-is-wrong

Browse Source 
Update ui_view_wav.cpp
This commit is contained in:
Erwin Ried 2020-08-15 15:53:27 +02:00 committed by GitHub
commit 1fc9a1c6e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
firmware/application/apps/ui_view_wav.cpp
View File

@ -81,15 +81,6 @@ void ViewWavView::load_wav(std::filesystem::path file_path) {
int16_t sample; int16_t sample;
uint32_t average; uint32_t average;
if (!wav_reader->open(file_path)) {
nav_.display_modal("Error", "Couldn't open file.", INFO, nullptr);
return;
}
if ((wav_reader->channels() != 1) || (wav_reader->bits_per_sample() != 16)) {
nav_.display_modal("Error", "Wrong format.\nWav viewer only accepts\n16-bit mono files.", INFO, nullptr);
return;
}
text_filename.set(file_path.filename().string()); text_filename.set(file_path.filename().string());
auto ms_duration = wav_reader->ms_duration(); auto ms_duration = wav_reader->ms_duration();
@ -148,10 +139,18 @@ ViewWavView::ViewWavView(
&field_cursor_b, &field_cursor_b,
&text_delta &text_delta
}); });
reset_controls();
button_open.on_select = [this, &nav](Button&) { button_open.on_select = [this, &nav](Button&) {
auto open_view = nav.push<FileLoadView>(".WAV"); auto open_view = nav.push<FileLoadView>(".WAV");
open_view->on_changed = [this](std::filesystem::path file_path) { open_view->on_changed = [this](std::filesystem::path file_path) {
if (!wav_reader->open(file_path)) {
nav_.display_modal("Error", "Couldn't open file.", INFO, nullptr);
return;
}
if ((wav_reader->channels() != 1) || (wav_reader->bits_per_sample() != 16)) {
nav_.display_modal("Error", "Wrong format.\nWav viewer only accepts\n16-bit mono files.", INFO, nullptr);
return;
}
load_wav(file_path); load_wav(file_path);
field_pos_seconds.focus(); field_pos_seconds.focus();
}; };
@ -176,7 +175,6 @@ ViewWavView::ViewWavView(
refresh_measurements(); refresh_measurements();
}; };
reset_controls();
} }
void ViewWavView::focus() { void ViewWavView::focus() {