Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-05-12 11:42:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

Soundboard bugfix: shouldn't crash with long file names

Browse source
This commit is contained in:
furrtek 2017-02-01 23:31:16 +00:00
parent 394331ebd2
commit 15f66eb74e
7 changed files with 32 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

15
firmware/application/ui_soundboard.cpp
View file

@ -89,9 +89,8 @@ void SoundBoardView::prepare_audio() {
void SoundBoardView::focus() {
buttons[0].focus();
if (!max_sound) {
if (!max_sound)
nav_.display_modal("No files", "No files in /wav/ directory", ABORT, nullptr);
}
}
void SoundBoardView::on_tuning_frequency_changed(rf::Frequency f) {
@ -157,7 +156,7 @@ void SoundBoardView::refresh_buttons(uint16_t id) {
button.id = n_sound;
if (n_sound < max_sound) {
button.set_text(sounds[n_sound].path.stem().string());
button.set_text(sounds[n_sound].path.stem().string().substr(0, 8));
button.set_style(styles[sounds[n_sound].path.stem().string()[0] & 3]);
} else {
button.set_text("- - -");
@ -204,11 +203,11 @@ SoundBoardView::SoundBoardView(
reader = std::make_unique<WAVFileReader>();
file_list = scan_root_files(reinterpret_cast<const TCHAR*>("/wav"), ".WAV");
file_list = scan_root_files(u"wav", u"*.WAV");
c = 0;
for (auto& path : file_list) {
if (reader->open(path)) {
if (reader->open(u"wav/" + path.native())) {
if (reader->channels() == 1) {
sounds[c].size = reader->data_size();
sounds[c].sample_duration = reader->data_size() / (reader->bits_per_sample() / 8);
@ -234,7 +233,7 @@ SoundBoardView::SoundBoardView(
&field_frequency,
&number_bw,
&text_kHz,
&options_ctcss,
//&options_ctcss,
&text_page,
&text_duration,
&pbar,
@ -243,7 +242,7 @@ SoundBoardView::SoundBoardView(
&button_exit
});
ctcss_options.emplace_back(std::make_pair("None", 0));
/*ctcss_options.emplace_back(std::make_pair("None", 0));
for (c = 0; c < CTCSS_TONES_NB; c++)
ctcss_options.emplace_back(std::make_pair(ctcss_tones[c].PL_code, c));
@ -253,7 +252,7 @@ SoundBoardView::SoundBoardView(
options_ctcss.on_change = [this](size_t, OptionsField::value_t v) {
this->on_ctcss_changed(v);
};
options_ctcss.set_selected_index(0);
options_ctcss.set_selected_index(0);*/
const auto button_fn = [this](Button& button) {
tx_mode = NORMAL;