[vlc-commits] DirectX: 10L fix compilation of backports
Jean-Baptiste Kempf
git at videolan.org
Thu Jun 7 16:27:57 CEST 2012
vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jun 7 16:27:56 2012 +0200| [7be07b1a0ffb1a7f5c091d16de5e6d6b32b540f9] | committer: Jean-Baptiste Kempf
DirectX: 10L fix compilation of backports
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=7be07b1a0ffb1a7f5c091d16de5e6d6b32b540f9
---
modules/audio_output/directx.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index df3f04c..8133c65 100644
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -287,7 +287,7 @@ static int OpenAudio( vlc_object_t *p_this )
/* Calculate the frame size in bytes */
aout_FormatPrepare( &p_aout->format );
aout_PacketInit( p_aout, &p_aout->sys->packet, FRAME_SIZE );
- aout_VolumeHardInit( p_aout, VolumeSet, true );
+ aout_VolumeHardInit( p_aout, VolumeSet );
}
/* Now we need to setup our DirectSound play notification structure */
@@ -588,7 +588,6 @@ static int VolumeSet( audio_output_t *p_aout, float vol, bool mute )
LONG mb = lroundf(2000.f * log10f(vol));
/* Clamp to allowed DirectSound range */
- static_assert( DSBVOLUME_MIN < DSBVOLUME_MAX, "DSBVOLUME_* confused" );
if( mb >= DSBVOLUME_MAX )
mb = DSBVOLUME_MAX;
if( mb <= DSBVOLUME_MIN )
More information about the vlc-commits
mailing list