vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <[email protected]> | Wed Jun 27 02:39:21 2012 +0200| [00ae211bc43f1624dd1bd2dba85e145c473e26fd] | committer: Jean-Baptiste Kempf
Revert "DirectX: 10L fix compilation of backports" This reverts commit 7be07b1a0ffb1a7f5c091d16de5e6d6b32b540f9. > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=00ae211bc43f1624dd1bd2dba85e145c473e26fd --- modules/audio_output/directx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c index 8133c65..df3f04c 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 ); + aout_VolumeHardInit( p_aout, VolumeSet, true ); } /* 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 ) 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 ) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
