Skip to content

V
vlc
Commit 00ae211b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Revert "DirectX: 10L fix compilation of backports" 

This reverts commit 7be07b1a.
parent df8462b3
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
modules/audio_output/directx.c
View file @ 00ae211b
...@@ -287,7 +287,7 @@ static int OpenAudio( vlc_object_t *p_this ) ...@@ -287,7 +287,7 @@ static int OpenAudio( vlc_object_t *p_this )
/* Calculate the frame size in bytes */ /* Calculate the frame size in bytes */
aout_FormatPrepare( &p_aout->format ); aout_FormatPrepare( &p_aout->format );
aout_PacketInit( p_aout, &p_aout->sys->packet, FRAME_SIZE ); aout_PacketInit( p_aout, &p_aout->sys->packet, FRAME_SIZE );
aout_VolumeHardInit( p_aout, VolumeSet ); aout_VolumeHardInit( p_aout, VolumeSet, true );
} }
/* Now we need to setup our DirectSound play notification structure */ /* Now we need to setup our DirectSound play notification structure */
...@@ -588,6 +588,7 @@ static int VolumeSet( audio_output_t *p_aout, float vol, bool mute ) ...@@ -588,6 +588,7 @@ static int VolumeSet( audio_output_t *p_aout, float vol, bool mute )
LONG mb = lroundf(2000.f * log10f(vol)); LONG mb = lroundf(2000.f * log10f(vol));
/* Clamp to allowed DirectSound range */ /* Clamp to allowed DirectSound range */
static_assert( DSBVOLUME_MIN < DSBVOLUME_MAX, "DSBVOLUME_* confused" );
if( mb >= DSBVOLUME_MAX ) if( mb >= DSBVOLUME_MAX )
mb = DSBVOLUME_MAX; mb = DSBVOLUME_MAX;
if( mb <= DSBVOLUME_MIN ) if( mb <= DSBVOLUME_MIN )
......
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