/*****************************************************************************
* notification_thread_t: waveOut event thread
*****************************************************************************/
+struct lkwavehdr
+{
+ WAVEHDR hdr;
+ struct lkwavehdr * p_next;
+};
+
/* local functions */
-static void Probe ( audio_output_t *, const audio_sample_format_t * );
static int OpenWaveOut ( audio_output_t *, uint32_t,
int, int, int, int, bool );
static int OpenWaveOutPCM( audio_output_t *, uint32_t,
vlc_fourcc_t*, int, int, int, bool );
-static int PlayWaveOut ( audio_output_t *, HWAVEOUT, WAVEHDR *,
+static int PlayWaveOut ( audio_output_t *, HWAVEOUT, struct lkwavehdr *,
block_t *, bool );
static void CALLBACK WaveOutCallback ( HWAVEOUT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR );
+static void WaveOutClean( aout_sys_t * p_sys );
+
static void WaveOutClearBuffer( HWAVEOUT, WAVEHDR *);
static int ReloadWaveoutDevices( vlc_object_t *, const char *,
static int WaveOutTimeGet(audio_output_t * , mtime_t *);
static void WaveOutFlush( audio_output_t *, bool);
static void WaveOutPause( audio_output_t *, bool, mtime_t);
+static int WaveoutVolumeSet(audio_output_t * p_aout, float volume);
+static int WaveoutMuteSet(audio_output_t * p_aout, bool mute);
+
+static void WaveoutPollVolume( void * );
static const wchar_t device_name_fmt[] = L"%ls ($%x,$%x)";
* This structure is part of the audio output thread descriptor.
* It describes the waveOut specific properties of an audio device.
*****************************************************************************/
+
struct aout_sys_t
{
uint32_t i_wave_device_id; /* ID of selected output device */
int i_buffer_size;
int i_rate;
- bool b_spdif;
uint8_t *p_silence_buffer; /* buffer we use to play silence */
- float soft_gain;
- bool soft_mute;
+ float f_volume;
+ bool b_spdif;
+ bool b_mute;
+ bool b_soft; /* Use software gain */
uint8_t chans_to_reorder; /* do we need channel reordering */
+
uint8_t chan_table[AOUT_CHAN_MAX];
vlc_fourcc_t format;
mtime_t i_played_length;
+ struct lkwavehdr * p_free_list;
+
vlc_mutex_t lock;
vlc_cond_t cond;
+ vlc_timer_t volume_poll_timer;
};
-#include "volume.h"
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
"to apply.")
#define DEFAULT_AUDIO_DEVICE N_("Default Audio Device")
+#define AUDIO_CHAN_TEXT N_("Audio output channels")
+#define AUDIO_CHAN_LONGTEXT N_("Channels available for audio output. " \
+ "If the input has more channels than the output, it will be down-mixed. " \
+ "This parameter is ignored when digital pass-through is active.")
+
+#define VOLUME_TEXT N_("Audio volume")
+
vlc_module_begin ()
set_shortname( "WaveOut" )
set_description( N_("Win32 waveOut extension output") )
set_capability( "audio output", 50 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AOUT )
-
add_string( "waveout-audio-device", "wavemapper",
DEVICE_TEXT, DEVICE_LONG, false )
change_string_cb( ReloadWaveoutDevices )
- add_sw_gain( )
-
+ add_float( "waveout-volume", 1.0f, VOLUME_TEXT, NULL, true )
+ change_float_range(0.0f, 2.0f)
add_bool( "waveout-float32", true, FLOAT_TEXT, FLOAT_LONGTEXT, true )
-
+ add_integer ("waveout-audio-channels", 6, AUDIO_CHAN_TEXT,
+ AUDIO_CHAN_LONGTEXT, false)
+ change_integer_range(1,6)
set_callbacks( Open, Close )
vlc_module_end ()
p_aout->pause = WaveOutPause;
p_aout->flush = WaveOutFlush;
+ /* Default behaviour is to use software gain */
+ p_aout->sys->b_soft = true;
+
/*
check for configured audio device!
*/
+ fmt->i_format = var_InheritBool( p_aout, "waveout-float32" )?
+ VLC_CODEC_FL32: VLC_CODEC_S16N;
+
char *psz_waveout_dev = var_CreateGetString( p_aout, "waveout-audio-device");
p_aout->sys->i_wave_device_id =
- if( var_Type( p_aout, "audio-device" ) == 0 )
- {
- Probe( p_aout, fmt );
- }
-
- if( var_Get( p_aout, "audio-device", &val ) < 0 )
- {
- /* Probe() has failed. */
- var_Destroy( p_aout, "waveout-audio-device");
- free( p_aout->sys );
- return VLC_EGENERIC;
- }
-
-
/* Open the device */
- if( val.i_int == AOUT_VAR_SPDIF )
+ if( AOUT_FMT_SPDIF(fmt) && var_InheritBool (p_aout, "spdif") )
{
- fmt->i_format = VLC_CODEC_SPDIFL;
if( OpenWaveOut( p_aout, p_aout->sys->i_wave_device_id,
VLC_CODEC_SPDIFL, fmt->i_physical_channels,
aout_FormatNbChannels( fmt ), fmt->i_rate, false )
- != VLC_SUCCESS )
+ == VLC_SUCCESS )
{
- msg_Err( p_aout, "cannot open waveout audio device" );
- free( p_aout->sys );
- return VLC_EGENERIC;
- }
+ fmt->i_format = VLC_CODEC_SPDIFL;
- /* Calculate the frame size in bytes */
- fmt->i_bytes_per_frame = AOUT_SPDIF_SIZE;
- fmt->i_frame_length = A52_FRAME_NB;
- p_aout->sys->i_buffer_size = fmt->i_bytes_per_frame;
- p_aout->sys->b_spdif = true;
+ /* Calculate the frame size in bytes */
+ fmt->i_bytes_per_frame = AOUT_SPDIF_SIZE;
+ fmt->i_frame_length = A52_FRAME_NB;
+ p_aout->sys->i_buffer_size = fmt->i_bytes_per_frame;
+ p_aout->sys->b_spdif = true;
+
+ }
+ else
+ msg_Err( p_aout,
+ "cannot open waveout audio device for spdif fallback to PCM" );
}
- else
+
+ if( fmt->i_format != VLC_CODEC_SPDIFL )
{
- switch( val.i_int )
+ int max_chan = var_InheritInteger( p_aout, "waveout-audio-channels");
+ int i_channels = aout_FormatNbChannels(fmt);
+ i_channels = ( i_channels < max_chan )? i_channels: max_chan;
+ do
{
- case AOUT_VAR_5_1:
- fmt->i_physical_channels
- = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
- | AOUT_CHAN_LFE;
- break;
- case AOUT_VAR_2F2R:
- fmt->i_physical_channels
- = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
- break;
- case AOUT_VAR_MONO:
- fmt->i_physical_channels = AOUT_CHAN_CENTER;
- break;
- default:
- fmt->i_physical_channels = AOUT_CHANS_STEREO;
+ switch(i_channels)
+ {
+ case 6:
+ fmt->i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT
+ | AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE;
+ break;
+ case 5:
+ fmt->i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
+ | AOUT_CHAN_LFE;
+ break;
+ case 4:
+ fmt->i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ break;
+ case 3:
+ fmt->i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_LFE;
+ break;
+ case 2:
+ fmt->i_physical_channels = AOUT_CHANS_STEREO;
+ break;
+ case 1:
+ default:
+ fmt->i_physical_channels = AOUT_CHAN_CENTER;
+ }
+ msg_Dbg( p_aout, "Trying %d channels", i_channels );
}
+ while( ( OpenWaveOutPCM( p_aout, p_aout->sys->i_wave_device_id,
+ &fmt->i_format, fmt->i_physical_channels,
+ i_channels, fmt->i_rate, false ) != VLC_SUCCESS ) &&
+ --i_channels );
- if( OpenWaveOutPCM( p_aout, p_aout->sys->i_wave_device_id,
- &fmt->i_format, fmt->i_physical_channels,
- aout_FormatNbChannels( fmt ), fmt->i_rate, false )
- != VLC_SUCCESS )
+ if( !i_channels )
{
- msg_Err( p_aout, "cannot open waveout audio device" );
- free( p_aout->sys );
+ msg_Err(p_aout, "Waveout couldn't find appropriate channel mapping");
return VLC_EGENERIC;
}
aout_FormatPrepare( fmt );
p_aout->sys->i_buffer_size = FRAME_SIZE * fmt->i_bytes_per_frame;
- aout_SoftVolumeStart( p_aout );
+ if( waveoutcaps.dwSupport & WAVECAPS_VOLUME )
+ {
+ aout_GainRequest( p_aout, 1.0f );
+ p_aout->sys->b_soft = false;
+ }
+
+ WaveoutMuteSet( p_aout, p_aout->sys->b_mute );
p_aout->sys->b_spdif = false;
}
malloc( p_aout->sys->i_buffer_size );
if( p_aout->sys->p_silence_buffer == NULL )
{
- free( p_aout->sys );
+ msg_Err( p_aout, "Couldn't alloc silence buffer... aborting");
return VLC_ENOMEM;
}
p_aout->sys->i_repeat_counter = 0;
/* Now we need to setup our waveOut play notification structure */
p_aout->sys->i_frames = 0;
p_aout->sys->i_played_length = 0;
+ p_aout->sys->p_free_list = NULL;
return VLC_SUCCESS;
}
-/*****************************************************************************
- * Probe: probe the audio device for available formats and channels
- *****************************************************************************/
-static void Probe( audio_output_t * p_aout, const audio_sample_format_t *fmt )
-{
- vlc_value_t val, text;
- vlc_fourcc_t i_format;
- unsigned int i_physical_channels;
-
- var_Create( p_aout, "audio-device", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
- text.psz_string = _("Audio Device");
- var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL );
-
- /* Test for 5.1 support */
- i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
- AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT |
- AOUT_CHAN_REARRIGHT | AOUT_CHAN_LFE;
- if( fmt->i_physical_channels == i_physical_channels )
- {
- if( OpenWaveOutPCM( p_aout, p_aout->sys->i_wave_device_id,
- &i_format, i_physical_channels, 6,
- fmt->i_rate, true )
- == VLC_SUCCESS )
- {
- val.i_int = AOUT_VAR_5_1;
- text.psz_string = (char *)_("5.1");
- var_Change( p_aout, "audio-device",
- VLC_VAR_ADDCHOICE, &val, &text );
- msg_Dbg( p_aout, "device supports 5.1 channels" );
- }
- }
-
- /* Test for 2 Front 2 Rear support */
- i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
- AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
- if( ( fmt->i_physical_channels & i_physical_channels )
- == i_physical_channels )
- {
- if( OpenWaveOutPCM( p_aout,p_aout->sys->i_wave_device_id,
- &i_format, i_physical_channels, 4,
- fmt->i_rate, true )
- == VLC_SUCCESS )
- {
- val.i_int = AOUT_VAR_2F2R;
- text.psz_string = (char *)_("2 Front 2 Rear");
- var_Change( p_aout, "audio-device",
- VLC_VAR_ADDCHOICE, &val, &text );
- msg_Dbg( p_aout, "device supports 4 channels" );
- }
- }
-
- /* Test for stereo support */
- i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
- if( OpenWaveOutPCM( p_aout, p_aout->sys->i_wave_device_id,
- &i_format,i_physical_channels, 2,
- fmt->i_rate, true )
- == VLC_SUCCESS )
- {
- val.i_int = AOUT_VAR_STEREO;
- text.psz_string = (char *)_("Stereo");
- var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
- msg_Dbg( p_aout, "device supports 2 channels" );
- }
-
- /* Test for mono support */
- i_physical_channels = AOUT_CHAN_CENTER;
- if( OpenWaveOutPCM( p_aout, p_aout->sys->i_wave_device_id,
- &i_format, i_physical_channels, 1, fmt->i_rate, true )
- == VLC_SUCCESS )
- {
- val.i_int = AOUT_VAR_MONO;
- text.psz_string = (char *)_("Mono");
- var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text );
- msg_Dbg( p_aout, "device supports 1 channel" );
- }
-
- /* Test for SPDIF support */
- if ( AOUT_FMT_SPDIF( fmt ) )
- {
- if( OpenWaveOut( p_aout, p_aout->sys->i_wave_device_id,
- VLC_CODEC_SPDIFL, fmt->i_physical_channels,
- aout_FormatNbChannels( fmt ), fmt->i_rate, true )
- == VLC_SUCCESS )
- {
- msg_Dbg( p_aout, "device supports A/52 over S/PDIF" );
- val.i_int = AOUT_VAR_SPDIF;
- text.psz_string = (char *)_("A/52 over S/PDIF");
- var_Change( p_aout, "audio-device",
- VLC_VAR_ADDCHOICE, &val, &text );
- if( var_InheritBool( p_aout, "spdif" ) )
- var_Set( p_aout, "audio-device", val );
- }
- }
-
- var_Change( p_aout, "audio-device", VLC_VAR_CHOICESCOUNT, &val, NULL );
- if( val.i_int <= 0 )
- {
- /* Probe() has failed. */
- var_Destroy( p_aout, "audio-device" );
- return;
- }
-
- var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
-}
-
/*****************************************************************************
* Play: play a sound buffer
*****************************************************************************
*****************************************************************************/
static void Play( audio_output_t *p_aout, block_t *block )
{
- WAVEHDR * p_waveheader = (WAVEHDR *) malloc(sizeof(WAVEHDR));
+ struct lkwavehdr * p_waveheader =
+ (struct lkwavehdr *) malloc(sizeof(struct lkwavehdr));
if(!p_waveheader)
{
msg_Err(p_aout, "Couldn't alloc WAVEHDR");
+ if( block )
+ block_Release( block );
return;
}
+
+ p_waveheader->p_next = NULL;
+
if( block && p_aout->sys->chans_to_reorder )
{
aout_ChannelReorder( block->p_buffer, block->i_buffer,
p_aout->sys->waveformat.Format.nChannels,
p_aout->sys->chan_table, p_aout->sys->format );
}
- while( PlayWaveOut( p_aout, p_aout->sys->h_waveout, p_waveheader, block,
+ while( PlayWaveOut( p_aout, p_aout->sys->h_waveout, p_waveheader, block,
p_aout->sys->b_spdif ) != VLC_SUCCESS )
{
msleep( block->i_length );
}
+ WaveOutClean( p_aout->sys );
+ WaveoutPollVolume( p_aout );
+
vlc_mutex_lock( &p_aout->sys->lock );
p_aout->sys->i_frames++;
p_aout->sys->i_played_length += block->i_length;
}
}
+ /* wait for the frames to be queued in cleaning list */
+ WaveOutFlush( p_aout, true );
+ WaveOutClean( p_aout->sys );
+
/* now we can Close the device */
if( waveOutClose( p_sys->h_waveout ) != MMSYSERR_NOERROR )
{
free( p_sys->p_silence_buffer );
p_aout->sys->i_played_length = 0;
+ p_sys->b_soft = true;
}
/*****************************************************************************
waveformat.Samples.wValidBitsPerSample);
msg_Dbg( p_aout,"waveformat.Samples.wSamplesPerBlock = %d",
waveformat.Samples.wSamplesPerBlock);
- msg_Dbg( p_aout,"waveformat.dwChannelMask = %lu",
+ msg_Dbg( p_aout,"waveformat.dwChannelMask = %lx",
waveformat.dwChannelMask);
}
* PlayWaveOut: play a buffer through the WaveOut device
*****************************************************************************/
static int PlayWaveOut( audio_output_t *p_aout, HWAVEOUT h_waveout,
- WAVEHDR *p_waveheader, block_t *p_buffer, bool b_spdif)
+ struct lkwavehdr *p_waveheader, block_t *p_buffer, bool b_spdif)
{
MMRESULT result;
/* Prepare the buffer */
if( p_buffer != NULL )
{
- p_waveheader->lpData = (LPSTR)p_buffer->p_buffer;
- p_waveheader->dwBufferLength = p_buffer->i_buffer;
+ p_waveheader->hdr.lpData = (LPSTR)p_buffer->p_buffer;
+ p_waveheader->hdr.dwBufferLength = p_buffer->i_buffer;
/*
copy the buffer to the silence buffer :) so in case we don't
get the next buffer fast enough (I will repeat this one a time
0x00, p_aout->sys->i_buffer_size );
}
}
- p_waveheader->lpData = (LPSTR)p_aout->sys->p_silence_buffer;
- p_waveheader->dwBufferLength = p_aout->sys->i_buffer_size;
+ p_waveheader->hdr.lpData = (LPSTR)p_aout->sys->p_silence_buffer;
+ p_waveheader->hdr.dwBufferLength = p_aout->sys->i_buffer_size;
}
- p_waveheader->dwUser = p_buffer ? (DWORD_PTR)p_buffer : (DWORD_PTR)1;
- p_waveheader->dwFlags = 0;
+ p_waveheader->hdr.dwUser = p_buffer ? (DWORD_PTR)p_buffer : (DWORD_PTR)1;
+ p_waveheader->hdr.dwFlags = 0;
- result = waveOutPrepareHeader( h_waveout, p_waveheader, sizeof(WAVEHDR) );
+ result = waveOutPrepareHeader( h_waveout, &p_waveheader->hdr, sizeof(WAVEHDR) );
if( result != MMSYSERR_NOERROR )
{
msg_Err( p_aout, "waveOutPrepareHeader failed" );
}
/* Send the buffer to the waveOut queue */
- result = waveOutWrite( h_waveout, p_waveheader, sizeof(WAVEHDR) );
+ result = waveOutWrite( h_waveout, &p_waveheader->hdr, sizeof(WAVEHDR) );
if( result != MMSYSERR_NOERROR )
{
msg_Err( p_aout, "waveOutWrite failed" );
DWORD_PTR _p_aout,
DWORD_PTR dwParam1, DWORD_PTR dwParam2 )
{
- (void)dwParam2;
+ (void) h_waveout;
+ (void) dwParam2;
audio_output_t *p_aout = (audio_output_t *)_p_aout;
- WAVEHDR * p_waveheader = (WAVEHDR *) dwParam1;
+ struct lkwavehdr * p_waveheader = (struct lkwavehdr *) dwParam1;
if( uMsg != WOM_DONE ) return;
- WaveOutClearBuffer( h_waveout, p_waveheader );
-
- free(p_waveheader);
vlc_mutex_lock( &p_aout->sys->lock );
+ p_waveheader->p_next = p_aout->sys->p_free_list;
+ p_aout->sys->p_free_list = p_waveheader;
p_aout->sys->i_frames--;
vlc_cond_broadcast( &p_aout->sys->cond );
vlc_mutex_unlock( &p_aout->sys->lock );
}
+static void WaveOutClean( aout_sys_t * p_sys )
+{
+ struct lkwavehdr *p_whdr, *p_list;
+
+ vlc_mutex_lock(&p_sys->lock);
+ p_list = p_sys->p_free_list;
+ p_sys->p_free_list = NULL;
+ vlc_mutex_unlock(&p_sys->lock);
+
+ while( p_list )
+ {
+ p_whdr = p_list;
+ p_list = p_list->p_next;
+ WaveOutClearBuffer( p_sys->h_waveout, &p_whdr->hdr );
+ free(p_whdr);
+ }
+}
+
static void WaveOutClearBuffer( HWAVEOUT h_waveout, WAVEHDR *p_waveheader )
-{
+{
block_t *p_buffer = (block_t *)(p_waveheader->dwUser);
/* Unprepare and free the buffers which has just been played */
waveOutUnprepareHeader( h_waveout, p_waveheader, sizeof(WAVEHDR) );
aout->sys = sys;
aout->start = Start;
aout->stop = Stop;
- aout_SoftVolumeInit(aout);
+ aout->volume_set = WaveoutVolumeSet;
+ aout->mute_set = WaveoutMuteSet;
+
+ sys->f_volume = var_InheritFloat(aout, "waveout-volume");
+ sys->b_mute = var_InheritBool(aout, "mute");
+
+ aout_MuteReport(aout, sys->b_mute);
+ aout_VolumeReport(aout, sys->f_volume );
+
+ if( vlc_timer_create( &sys->volume_poll_timer,
+ WaveoutPollVolume, aout ) )
+ {
+ msg_Err( aout, "Couldn't create volume polling timer" );
+ free( sys );
+ return VLC_ENOMEM;
+ }
vlc_mutex_init( &sys->lock );
vlc_cond_init( &sys->cond );
+
return VLC_SUCCESS;
}
audio_output_t *aout = (audio_output_t *)obj;
aout_sys_t *sys = aout->sys;
+ vlc_timer_destroy( sys->volume_poll_timer );
+
vlc_cond_destroy( &sys->cond );
vlc_mutex_destroy( &sys->lock );
if( !p_aout->sys->i_frames )
return -1;
- if( waveOutGetPosition( p_aout->sys->h_waveout, &mmtime, sizeof(MMTIME) )
+ if( waveOutGetPosition( p_aout->sys->h_waveout, &mmtime, sizeof(MMTIME) )
!= MMSYSERR_NOERROR )
{
msg_Err( p_aout, "waveOutGetPosition failed");
static void WaveOutPause( audio_output_t * p_aout, bool pause, mtime_t date)
{
MMRESULT res;
+ (void) date;
if(pause)
{
+ vlc_timer_schedule( p_aout->sys->volume_poll_timer, false, 1, 200000 );
res = waveOutPause( p_aout->sys->h_waveout );
if( res != MMSYSERR_NOERROR )
{
}
else
{
+ vlc_timer_schedule( p_aout->sys->volume_poll_timer, false, 0, 0 );
res = waveOutRestart( p_aout->sys->h_waveout );
if( res != MMSYSERR_NOERROR )
{
}
}
}
+
+static int WaveoutVolumeSet( audio_output_t *p_aout, float volume )
+{
+ aout_sys_t *sys = p_aout->sys;
+
+ if( sys->b_soft )
+ {
+ float gain = volume * volume * volume;
+ if ( !sys->b_mute && aout_GainRequest( p_aout, gain ) )
+ return -1;
+ }
+ else
+ {
+ const HWAVEOUT hwo = sys->h_waveout;
+
+ uint32_t vol = lroundf( volume * 0x7fff.fp0 );
+
+ if( !sys->b_mute )
+ {
+ if( vol > 0xffff )
+ {
+ vol = 0xffff;
+ volume = 2.0f;
+ }
+
+ MMRESULT r = waveOutSetVolume( hwo, vol | ( vol << 16 ) );
+ if( r != MMSYSERR_NOERROR )
+ {
+ msg_Err( p_aout, "waveOutSetVolume failed (%u)", r );
+ return -1;
+ }
+ }
+ }
+
+ vlc_mutex_lock(&p_aout->sys->lock);
+ sys->f_volume = volume;
+
+ if( var_InheritBool( p_aout, "volume-save" ) )
+ config_PutFloat( p_aout, "waveout-volume", volume );
+
+ aout_VolumeReport( p_aout, volume );
+ vlc_mutex_unlock(&p_aout->sys->lock);
+
+ return 0;
+}
+
+static int WaveoutMuteSet( audio_output_t * p_aout, bool mute )
+{
+ aout_sys_t *sys = p_aout->sys;
+
+ if( sys->b_soft )
+ {
+ float gain = sys->f_volume * sys->f_volume * sys->f_volume;
+ if ( aout_GainRequest( p_aout, mute ? 0.f : gain ) )
+ return -1;
+ }
+ else
+ {
+
+ const HWAVEOUT hwo = sys->h_waveout;
+ uint32_t vol = mute ? 0 : lroundf( sys->f_volume * 0x7fff.fp0 );
+
+ if( vol > 0xffff )
+ vol = 0xffff;
+
+ MMRESULT r = waveOutSetVolume( hwo, vol | ( vol << 16 ) );
+ if( r != MMSYSERR_NOERROR )
+ {
+ msg_Err( p_aout, "waveOutSetVolume failed (%u)", r );
+ return -1;
+ }
+ }
+
+ vlc_mutex_lock(&p_aout->sys->lock);
+ sys->b_mute = mute;
+ aout_MuteReport( p_aout, mute );
+ vlc_mutex_unlock(&p_aout->sys->lock);
+
+ return 0;
+}
+
+static void WaveoutPollVolume( void * aout )
+{
+ audio_output_t * p_aout = (audio_output_t *) aout;
+ uint32_t vol;
+
+ MMRESULT r = waveOutGetVolume( p_aout->sys->h_waveout, (LPDWORD) &vol );
+
+ if( r != MMSYSERR_NOERROR )
+ {
+ msg_Err( p_aout, "waveOutGetVolume failed (%u)", r );
+ return;
+ }
+
+ float volume = (float) ( vol & UINT32_C( 0xffff ) );
+ volume /= 0x7fff.fp0;
+
+ vlc_mutex_lock(&p_aout->sys->lock);
+ if( !p_aout->sys->b_mute && volume != p_aout->sys->f_volume )
+ {
+ p_aout->sys->f_volume = volume;
+
+ if( var_InheritBool( p_aout, "volume-save" ) )
+ config_PutFloat( p_aout, "waveout-volume", volume );
+
+ aout_VolumeReport( p_aout, volume );
+ }
+ vlc_mutex_unlock(&p_aout->sys->lock);
+
+ return;
+}
projects / vlc / blobdiff