Skip to content

V
vlc
Commit 9be0932d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

waveout: fix volume initialization

parent a89517ca
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 11 deletions
modules/audio_output/waveout.c
View file @ 9be0932d
...@@ -291,20 +291,14 @@ static int Open( vlc_object_t *p_this ) ...@@ -291,20 +291,14 @@ static int Open( vlc_object_t *p_this )
p_aout->format.i_bytes_per_frame; p_aout->format.i_bytes_per_frame;
aout_PacketInit( p_aout, &p_aout->sys->packet, FRAME_SIZE ); aout_PacketInit( p_aout, &p_aout->sys->packet, FRAME_SIZE );
aout_VolumeSoftInit( p_aout );
/* Check for hardware volume support */ /* Check for hardware volume support */
if( waveOutGetDevCaps( (UINT_PTR)p_aout->sys->h_waveout, if( waveOutGetDevCaps( (UINT_PTR)p_aout->sys->h_waveout,
&wocaps, sizeof(wocaps) ) == MMSYSERR_NOERROR && &wocaps, sizeof(wocaps) ) == MMSYSERR_NOERROR
wocaps.dwSupport & WAVECAPS_VOLUME ) && (wocaps.dwSupport & WAVECAPS_VOLUME) )
{ aout_VolumeHardInit( p_aout, VolumeSet );
DWORD i_dummy; else
if( waveOutGetVolume( p_aout->sys->h_waveout, &i_dummy ) aout_VolumeSoftInit( p_aout );
== MMSYSERR_NOERROR )
{
p_aout->pf_volume_set = VolumeSet;
}
}
} }
......
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