Add midi player

Converts to wav form and sends to sound-daemon

doom lvl 1 midi file provided.

Makefile

@@ -85,7 +85,7 @@ endif
 debug: $(disk)
 	#qemu-system-x86_64 -drive format=raw,file=$(iso) -serial stdio -no-reboot -s -S -smp cpus=4 -no-shutdown -netdev tap,helper=/usr/lib/qemu/qemu-bridge-helper,id=ck_net0 -device e1000,netdev=ck_net0,id=ck_nic0
 	#qemu-system-x86_64 -serial stdio -no-reboot -s -S -m 5811 -smp cpus=4 -no-shutdown -netdev user,id=mynet0,net=192.168.1.0/24,dhcpstart=192.168.1.128,hostfwd=tcp::4444-:80 -device e1000e,netdev=mynet0,id=ck_nic0 -drive format=raw,file=disk.img,if=none,id=test-img -device ich9-ahci,id=ahci -device ide-hd,drive=test-img,bus=ahci.0 -monitor /dev/stdout
-	qemu-system-x86_64 -serial stdio -no-reboot -s -S -m 5811 -smp cpus=4 -no-shutdown -netdev tap,helper=/usr/lib/qemu/qemu-bridge-helper,id=hn0 -device e1000,netdev=hn0,id=nic1 -drive format=raw,file=disk.img,if=none,id=test-img -device ich9-ahci,id=ahci -device ide-hd,drive=test-img,bus=ahci.0 -audio driver=pipewire,model=hda -monitor /dev/stdout -enable-kvm
+	qemu-system-x86_64 -serial stdio -no-reboot -s -S -m 5811 -smp cpus=4 -no-shutdown -netdev tap,helper=/usr/lib/qemu/qemu-bridge-helper,id=hn0 -device e1000,netdev=hn0,id=nic1 -drive format=raw,file=disk.img,if=none,id=test-img -device ich9-ahci,id=ahci -device ide-hd,drive=test-img,bus=ahci.0 -audio driver=pipewire,model=hda -monitor /dev/stdout
 
 gdb:
 	@rust-gdb "$(kernel)" -ex "target remote :1234"

disk-scripts/install_os.sh

@@ -32,7 +32,7 @@ fi
 sudo umount mnt
 
 PROGS="test testcpp hello stack nyancat ttytest fork poweroff stat fbdoom doom1.wad open_sleep"
-RUST_PROGS="init shell mount umount unixsocket-server unixsocket-client forktest mprotecttest playwav threads sound-daemon"
+RUST_PROGS="init shell mount umount unixsocket-server unixsocket-client forktest mprotecttest playwav playmidi threads sound-daemon"
 
 sudo mount /dev/loop0p2 mnt
 sudo chown -R $USER:$USER mnt
@@ -47,6 +47,8 @@ for prog in $RUST_PROGS; do
 done
 
 cp sysroot/assets/imperial.wav mnt/
+cp sysroot/assets/D_E1M1.mid mnt/
+cp sysroot/assets/FluidR3_GM.sf2 mnt/
 
 rsync -a sysroot/cykusz/usr mnt/
 rsync -a sysroot/cykusz/etc mnt/

userspace/Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
 resolver = "2"
-members = ["init", "shell", "mount", "umount", "syscall-user", "unixsockets", "testprogs", "playwav", "sound-daemon"]
+members = ["init", "shell", "mount", "umount", "syscall-user", "unixsockets", "testprogs", "playaudio", "sound-daemon"]

userspace/playaudio/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "playaudio"
+version = "0.1.0"
+edition = "2021"
+
+[[bin]]
+name = "playwav"
+test = false
+bench = false
+path = "src/playwav/bin/main.rs"
+
+[[bin]]
+name = "playmidi"
+test = false
+bench = false
+path = "src/playmidi/bin/main.rs"
+
+[dependencies]
+rustysynth = "*"
+wavers = "*"
+
+[dependencies.syscall-defs]
+path = "../../syscall-defs"
+
+[dependencies.syscall-user]
+path = "../syscall-user"