feat(audio): add guest voice controls and reliable lifecycle delivery
Intrepid/Prometeu/Runtime/pipeline/pr-master This commit looks good
Intrepid/Prometeu/Runtime/pipeline/pr-master This commit looks good
This commit is contained in:
@@ -3,7 +3,7 @@ use crate::fs::{FsState, VirtualFS};
|
||||
use crate::services::memcard::MemcardService;
|
||||
use prometeu_bytecode::{TRAP_INVALID_SYSCALL, TRAP_OOB, TRAP_TYPE, Value};
|
||||
use prometeu_hal::app_mode::AppMode;
|
||||
use prometeu_hal::asset::{AssetId, AssetOpStatus, BankType, SlotRef};
|
||||
use prometeu_hal::asset::{AssetId, AssetOpStatus, BankType};
|
||||
use prometeu_hal::color::Color;
|
||||
use prometeu_hal::glyph::Glyph;
|
||||
use prometeu_hal::log::{LogLevel, LogSource};
|
||||
@@ -495,15 +495,17 @@ impl NativeInterface for VmRuntimeHost<'_> {
|
||||
Ok(())
|
||||
}
|
||||
Syscall::AudioPlay => {
|
||||
let bank_id = expect_int(args, 0)? as u8;
|
||||
let bank_id_raw = expect_int(args, 0)?;
|
||||
let sample_id_raw = expect_int(args, 1)?;
|
||||
let voice_id_raw = expect_int(args, 2)?;
|
||||
let volume_raw = expect_int(args, 3)?;
|
||||
let pan_raw = expect_int(args, 4)?;
|
||||
let pitch = expect_number(args, 5, "pitch")?;
|
||||
let loop_mode = match expect_int(args, 6)? {
|
||||
0 => prometeu_hal::LoopMode::Off,
|
||||
_ => prometeu_hal::LoopMode::On,
|
||||
let loop_raw = expect_int(args, 6)?;
|
||||
let loop_mode = if loop_raw == 0 {
|
||||
prometeu_hal::LoopMode::Off
|
||||
} else {
|
||||
prometeu_hal::LoopMode::On
|
||||
};
|
||||
|
||||
if !(0..16).contains(&voice_id_raw) {
|
||||
@@ -511,18 +513,18 @@ impl NativeInterface for VmRuntimeHost<'_> {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if platform.assets().slot_info(SlotRef::audio(bank_id as usize)).asset_id.is_none()
|
||||
{
|
||||
if !(0..16).contains(&bank_id_raw) {
|
||||
ret.push_int(AudioOpStatus::BankInvalid as i64);
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let bank_id = bank_id_raw as u8;
|
||||
if sample_id_raw < 0
|
||||
|| sample_id_raw > u16::MAX as i64
|
||||
|| !(0..=255).contains(&volume_raw)
|
||||
|| !(0..=255).contains(&pan_raw)
|
||||
|| !pitch.is_finite()
|
||||
|| pitch <= 0.0
|
||||
|| !(0..=1).contains(&loop_raw)
|
||||
{
|
||||
ret.push_int(AudioOpStatus::ArgRangeInvalid as i64);
|
||||
return Ok(());
|
||||
@@ -541,6 +543,38 @@ impl NativeInterface for VmRuntimeHost<'_> {
|
||||
ret.push_int(status as i64);
|
||||
Ok(())
|
||||
}
|
||||
Syscall::AudioStop
|
||||
| Syscall::AudioSetVolume
|
||||
| Syscall::AudioSetPan
|
||||
| Syscall::AudioSetPitch => {
|
||||
let voice = expect_int(args, 0)?;
|
||||
// Decode all types before reporting operational validation failures.
|
||||
let value = match syscall {
|
||||
Syscall::AudioSetVolume | Syscall::AudioSetPan => expect_int(args, 1)?,
|
||||
_ => 0,
|
||||
};
|
||||
let pitch = if syscall == Syscall::AudioSetPitch {
|
||||
expect_number(args, 1, "pitch")?
|
||||
} else {
|
||||
1.0
|
||||
};
|
||||
let status = if !(0..16).contains(&voice) {
|
||||
AudioOpStatus::VoiceInvalid
|
||||
} else if !(0..=255).contains(&value) || !pitch.is_finite() || pitch <= 0.0 {
|
||||
AudioOpStatus::ArgRangeInvalid
|
||||
} else {
|
||||
let audio = platform.audio_mut();
|
||||
match syscall {
|
||||
Syscall::AudioStop => audio.stop(voice as usize),
|
||||
Syscall::AudioSetVolume => audio.set_volume(voice as usize, value as u8),
|
||||
Syscall::AudioSetPan => audio.set_pan(voice as usize, value as u8),
|
||||
Syscall::AudioSetPitch => audio.set_pitch(voice as usize, pitch),
|
||||
_ => unreachable!(),
|
||||
}
|
||||
};
|
||||
ret.push_int(status as i64);
|
||||
Ok(())
|
||||
}
|
||||
Syscall::FsOpen => {
|
||||
let path = expect_string(args, 0, "path")?;
|
||||
if *self.fs_state != FsState::Mounted {
|
||||
|
||||
Reference in New Issue
Block a user