vlc | branch: master | Alexandre Ratchov <[email protected]> | Sat Mar 23 13:41:32 2013 +0200| [296b7b3f8598f78e80181eb8acc0934076227a71] | committer: Rémi Denis-Courmont
sndio: fix typos Signed-off-by: Rémi Denis-Courmont <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=296b7b3f8598f78e80181eb8acc0934076227a71 --- configure.ac | 2 +- modules/audio_output/sndio.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 5b3501d..5c579e0 100644 --- a/configure.ac +++ b/configure.ac @@ -3440,7 +3440,7 @@ dnl AC_ARG_ENABLE([sndio], [AS_HELP_STRING([--disable-sndio], [support the OpenBSD sndio (default auto)])],, [ - AS_IF([test "$SYS" = "opensd"], [ + AS_IF([test "$SYS" = "openbsd"], [ enable_sndio="yes" ]) ]) diff --git a/modules/audio_output/sndio.c b/modules/audio_output/sndio.c index 7f121dc..7a3e33d 100644 --- a/modules/audio_output/sndio.c +++ b/modules/audio_output/sndio.c @@ -32,7 +32,7 @@ #include <sndio.h> static int Open (vlc_object_t *); -static void Close (vlc_objec_t *); +static void Close (vlc_object_t *); vlc_module_begin () set_shortname ("sndio") @@ -43,7 +43,7 @@ vlc_module_begin () set_callbacks (Open, Close) vlc_module_end () -static int TimeGet (audio_output, mtime_t *); +static int TimeGet (audio_output_t *, mtime_t *); static void Play (audio_output_t *, block_t *); static void Flush (audio_output_t *, bool); static int VolumeSet (audio_output_t *, float); @@ -87,13 +87,13 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) if (!sio_setpar (sys->hdl, &par) || !sio_getpar (sys->hdl, &par)) { - msg_Err (obj, "cannot negotiate audio playback parameters"); + msg_Err (aout, "cannot negotiate audio playback parameters"); goto error; } if (par.bps != par.bits >> 3) { - msg_Err (obj, "unsupported audio sample format (%u bits in %u bytes)", + msg_Err (aout, "unsupported audio sample format (%u bits in %u bytes)", par.bits, par.bps); goto error; } @@ -128,7 +128,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) fmt->i_format = VLC_CODEC_S32N; break; default: - msg_Err (obj, "unsupported audio sample format (%u bits)", + msg_Err (aout, "unsupported audio sample format (%u bits)", par.bits); goto error; } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
