Skip to content

V
vlc-2-2
Commit 1c15f75e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

OSS: trivial fixes

parent ead6ddbb
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
modules/audio_output/oss.c
View file @ 1c15f75e
...@@ -223,7 +223,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) ...@@ -223,7 +223,7 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
fmt->i_physical_channels = channels; fmt->i_physical_channels = channels;
} }
VolumeSync (aout): VolumeSync (aout);
sys->starting = true; sys->starting = true;
sys->format = *fmt; sys->format = *fmt;
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -332,6 +332,8 @@ static int VolumeSet (audio_output_t *aout, float vol) ...@@ -332,6 +332,8 @@ static int VolumeSet (audio_output_t *aout, float vol)
{ {
aout_sys_t *sys = aout->sys; aout_sys_t *sys = aout->sys;
int fd = sys->fd; int fd = sys->fd;
if (fd == -1)
return -1;
int level = lroundf (vol * 100.f); int level = lroundf (vol * 100.f);
if (level > 0xFF) if (level > 0xFF)
...@@ -353,6 +355,8 @@ static int MuteSet (audio_output_t *aout, bool mute) ...@@ -353,6 +355,8 @@ static int MuteSet (audio_output_t *aout, bool mute)
{ {
aout_sys_t *sys = aout->sys; aout_sys_t *sys = aout->sys;
int fd = sys->fd; int fd = sys->fd;
if (fd == -1)
return -1;
int level = mute ? 0 : (sys->level | (sys->level << 8)); int level = mute ? 0 : (sys->level | (sys->level << 8));
if (ioctl (fd, SNDCTL_DSP_SETPLAYVOL, &level) < 0) if (ioctl (fd, SNDCTL_DSP_SETPLAYVOL, &level) < 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment