Commit c45dcb73 authored by gbazin's avatar gbazin
Browse files

* modules/audio_output/waveout.c: get rid of roundf() which isn't supported on WinCE.

parent ecac4600
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
*****************************************************************************/ *****************************************************************************/
#include <string.h> /* strerror() */ #include <string.h> /* strerror() */
#include <stdlib.h> /* calloc(), malloc(), free() */ #include <stdlib.h> /* calloc(), malloc(), free() */
#include <math.h> /* roundf() */
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/aout.h> #include <vlc/aout.h>
...@@ -801,11 +800,8 @@ static int VolumeGet( aout_instance_t * p_aout, audio_volume_t * pi_volume ) ...@@ -801,11 +800,8 @@ static int VolumeGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
#endif #endif
i_waveout_vol &= 0xFFFF; i_waveout_vol &= 0xFFFF;
/* Force float computation, otherwise VolumeGet does not return the value
* which was set with VolumeSet, because of rounding issues */
*pi_volume = p_aout->output.i_volume = *pi_volume = p_aout->output.i_volume =
(audio_volume_t)roundf((float)i_waveout_vol * AOUT_VOLUME_MAX (i_waveout_vol * AOUT_VOLUME_MAX + 0xFFFF /*rounding*/) / 2 / 0xFFFF;
/ 2.0 / 0xFFFF);
return 0; return 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