Merge branch 'fixes' into 'master'

Custom commands + impl std::error::Error

See merge request mpv-ipc/mpvipc!2
This commit is contained in:
Jonas Frei 2019-11-04 17:04:20 +00:00
commit ac2d94754c
1 changed files with 9 additions and 0 deletions

View File

@ -172,6 +172,8 @@ impl Display for Error {
} }
} }
impl std::error::Error for Error {}
impl Display for ErrorCode { impl Display for ErrorCode {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self { match *self {
@ -500,6 +502,13 @@ impl Mpv {
} }
} }
/// Run a custom command.
/// This should only be used if the desired command is not implemented
/// with [MpvCommand].
pub fn run_command_raw(&self, command: &str, args: &[&str]) -> Result<(), Error> {
run_mpv_command(self, command, args)
}
pub fn playlist_add( pub fn playlist_add(
&self, &self,
file: &str, file: &str,