diff --git a/assets/A_LA.ogg b/assets/A_LA.ogg new file mode 100644 index 0000000..957c76b Binary files /dev/null and b/assets/A_LA.ogg differ diff --git a/assets/B_SI.ogg b/assets/B_SI.ogg new file mode 100644 index 0000000..7d99af2 Binary files /dev/null and b/assets/B_SI.ogg differ diff --git a/assets/C_DO.ogg b/assets/C_DO.ogg new file mode 100644 index 0000000..a713e6b Binary files /dev/null and b/assets/C_DO.ogg differ diff --git a/assets/D_RE.ogg b/assets/D_RE.ogg new file mode 100644 index 0000000..bd36d9a Binary files /dev/null and b/assets/D_RE.ogg differ diff --git a/assets/E_MI.ogg b/assets/E_MI.ogg new file mode 100644 index 0000000..aad55e2 Binary files /dev/null and b/assets/E_MI.ogg differ diff --git a/assets/F_FA.ogg b/assets/F_FA.ogg new file mode 100644 index 0000000..7e4c5c6 Binary files /dev/null and b/assets/F_FA.ogg differ diff --git a/assets/G_SOL.ogg b/assets/G_SOL.ogg new file mode 100644 index 0000000..d25ddff Binary files /dev/null and b/assets/G_SOL.ogg differ diff --git a/assets/ah.ogg b/assets/Z_ah.ogg similarity index 100% rename from assets/ah.ogg rename to assets/Z_ah.ogg diff --git a/src/main.rs b/src/main.rs index f33fac5..1b441ac 100644 --- a/src/main.rs +++ b/src/main.rs @@ -172,7 +172,8 @@ impl MyApp { } Message::ChangeSound(i, s) => { self.poly_frame.polygons[i].sound = - StaticSoundData::from_file(&s).expect("Fail to load audio"); + StaticSoundData::from_file(format!("./assets/{}", s)) + .expect("Fail to load audio"); self.poly_frame.polygons[i].sound_name = s; } } @@ -190,11 +191,12 @@ impl MyApp { .map(|polygon| { let current_index = i; i += 1; - let entries = fs::read_dir("./assets/") + let mut entries: Vec = fs::read_dir("./assets") .unwrap() - .map(|res| res.map(|e| e.path().to_str().unwrap().to_string())) - .collect::, io::Error>>() - .unwrap(); + .filter_map(|res| res.ok()) + .map(|e| e.path().file_name().unwrap().to_str().unwrap().to_string()) + .collect(); + entries.sort(); row![ text(&polygon.name),