7e4392ae68
This implements a proof-of-concept for an improved audio frontend. The largest change is the introduction of events and event handling: both by time elapsed and by track events, such as ending or looping. Following on from this, the library now includes a basic, event-driven track queue system (which people seem to ask for unusually often). A new sample, `examples/13_voice_events`, demonstrates both the `TrackQueue` system and some basic events via the `~queue` and `~play_fade` commands. Locks are removed from around the control of `Audio` objects, which should allow the backend to be moved to a more granular futures-based backend solution in a cleaner way.
98 lines
2.2 KiB
Rust
98 lines
2.2 KiB
Rust
use super::message::*;
|
|
use crate::ws::Error as WsError;
|
|
use audiopus::Error as OpusError;
|
|
use flume::SendError;
|
|
use std::io::Error as IoError;
|
|
use xsalsa20poly1305::aead::Error as CryptoError;
|
|
|
|
#[derive(Debug)]
|
|
pub enum Recipient {
|
|
AuxNetwork,
|
|
Event,
|
|
Mixer,
|
|
UdpRx,
|
|
UdpTx,
|
|
}
|
|
|
|
pub type Result<T> = std::result::Result<T, Error>;
|
|
|
|
#[derive(Debug)]
|
|
pub enum Error {
|
|
Crypto(CryptoError),
|
|
/// Received an illegal voice packet on the voice UDP socket.
|
|
IllegalVoicePacket,
|
|
InterconnectFailure(Recipient),
|
|
Io(IoError),
|
|
Opus(OpusError),
|
|
Ws(WsError),
|
|
}
|
|
|
|
impl Error {
|
|
pub(crate) fn should_trigger_connect(&self) -> bool {
|
|
matches!(
|
|
self,
|
|
Error::InterconnectFailure(Recipient::AuxNetwork)
|
|
| Error::InterconnectFailure(Recipient::UdpRx)
|
|
| Error::InterconnectFailure(Recipient::UdpTx)
|
|
)
|
|
}
|
|
|
|
pub(crate) fn should_trigger_interconnect_rebuild(&self) -> bool {
|
|
matches!(self, Error::InterconnectFailure(Recipient::Event))
|
|
}
|
|
}
|
|
|
|
impl From<CryptoError> for Error {
|
|
fn from(e: CryptoError) -> Self {
|
|
Error::Crypto(e)
|
|
}
|
|
}
|
|
|
|
impl From<IoError> for Error {
|
|
fn from(e: IoError) -> Error {
|
|
Error::Io(e)
|
|
}
|
|
}
|
|
|
|
impl From<OpusError> for Error {
|
|
fn from(e: OpusError) -> Error {
|
|
Error::Opus(e)
|
|
}
|
|
}
|
|
|
|
impl From<SendError<WsMessage>> for Error {
|
|
fn from(_e: SendError<WsMessage>) -> Error {
|
|
Error::InterconnectFailure(Recipient::AuxNetwork)
|
|
}
|
|
}
|
|
|
|
impl From<SendError<EventMessage>> for Error {
|
|
fn from(_e: SendError<EventMessage>) -> Error {
|
|
Error::InterconnectFailure(Recipient::Event)
|
|
}
|
|
}
|
|
|
|
impl From<SendError<MixerMessage>> for Error {
|
|
fn from(_e: SendError<MixerMessage>) -> Error {
|
|
Error::InterconnectFailure(Recipient::Mixer)
|
|
}
|
|
}
|
|
|
|
impl From<SendError<UdpRxMessage>> for Error {
|
|
fn from(_e: SendError<UdpRxMessage>) -> Error {
|
|
Error::InterconnectFailure(Recipient::UdpRx)
|
|
}
|
|
}
|
|
|
|
impl From<SendError<UdpTxMessage>> for Error {
|
|
fn from(_e: SendError<UdpTxMessage>) -> Error {
|
|
Error::InterconnectFailure(Recipient::UdpTx)
|
|
}
|
|
}
|
|
|
|
impl From<WsError> for Error {
|
|
fn from(e: WsError) -> Error {
|
|
Error::Ws(e)
|
|
}
|
|
}
|