* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
-#include <vlc_charset.h>
+#include <vlc_charset.h> /* FromLocaleDup, LocaleFree */
#include "windows_audio_common.h"
static void CALLBACK WaveOutCallback ( HWAVEOUT, UINT, DWORD, DWORD, DWORD );
static void* WaveOutThread( vlc_object_t * );
-static int VolumeGet( aout_instance_t *, audio_volume_t * );
-static int VolumeSet( aout_instance_t *, audio_volume_t );
+static int VolumeSet( aout_instance_t *, audio_volume_t, bool );
static int WaveOutClearDoneBuffers(aout_sys_t *p_sys);
static const char *const ppsz_adev_text[] = { N_("Microsoft Soundmapper") };
-
/*****************************************************************************
* Module descriptor
*****************************************************************************/
set_capability( "audio output", 50 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AOUT )
- add_bool( "waveout-float32", true, NULL, FLOAT_TEXT, FLOAT_LONGTEXT, true )
+ add_bool( "waveout-float32", true, FLOAT_TEXT, FLOAT_LONGTEXT, true )
- add_string( "waveout-audio-device", "wavemapper", NULL,
+ add_string( "waveout-audio-device", "wavemapper",
DEVICE_TEXT, DEVICE_LONG, false )
add_deprecated_alias( "waveout-dev" ) /* deprecated since 0.9.3 */
change_string_list( ppsz_adev, ppsz_adev_text, ReloadWaveoutDevices )
- change_need_restart ()
change_action_add( ReloadWaveoutDevices, N_("Refresh list") )
-
set_callbacks( Open, Close )
vlc_module_end ()
if( waveOutGetVolume( p_aout->output.p_sys->h_waveout, &i_dummy )
== MMSYSERR_NOERROR )
{
- p_aout->output.pf_volume_get = VolumeGet;
p_aout->output.pf_volume_set = VolumeSet;
}
}
/* Then launch the notification thread */
if( vlc_thread_create( p_aout->output.p_sys->p_notif,
- "waveOut Notification Thread", WaveOutThread,
- VLC_THREAD_PRIORITY_OUTPUT ) )
+ WaveOutThread, VLC_THREAD_PRIORITY_OUTPUT ) )
{
msg_Err( p_aout, "cannot create WaveOutThread" );
}
text.psz_string = (char *)_("A/52 over S/PDIF");
var_Change( p_aout, "audio-device",
VLC_VAR_ADDCHOICE, &val, &text );
- if( var_InheritInteger( p_aout, "spdif" ) )
+ if( var_InheritBool( p_aout, "spdif" ) )
var_Set( p_aout, "audio-device", val );
}
}
}
var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
- var_SetBool( p_aout, "intf-change", true );
+ var_TriggerCallback( p_aout, "intf-change" );
}
/*****************************************************************************
bool b_probe )
{
MMRESULT result;
- unsigned int i;
/* Set sound format */
#define waveformat p_aout->output.p_sys->waveformat
waveformat.dwChannelMask = 0;
- for( i = 0; i < sizeof(pi_channels_src)/sizeof(uint32_t); i++ )
+ for( unsigned i = 0; i < sizeof(pi_channels_src)/sizeof(uint32_t); i++ )
{
if( i_channels & pi_channels_src[i] )
waveformat.dwChannelMask |= pi_channels_in[i];
/* Prepare the buffer */
if( p_buffer != NULL )
{
- p_waveheader->lpData = p_buffer->p_buffer;
+ p_waveheader->lpData = (LPSTR)p_buffer->p_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->output.p_sys->i_buffer_size );
}
}
- p_waveheader->lpData = p_aout->output.p_sys->p_silence_buffer;
+ p_waveheader->lpData = (LPSTR)p_aout->output.p_sys->p_silence_buffer;
}
p_waveheader->dwUser = p_buffer ? (DWORD_PTR)p_buffer : (DWORD_PTR)1;
{
(void)h_waveout; (void)dwParam1; (void)dwParam2;
aout_instance_t *p_aout = (aout_instance_t *)_p_aout;
- int i, i_queued_frames = 0;
+ int i_queued_frames = 0;
if( uMsg != WOM_DONE ) return;
if( !vlc_object_alive (p_aout) ) return;
/* Find out the current latency */
- for( i = 0; i < FRAMES_NUM; i++ )
+ for( int i = 0; i < FRAMES_NUM; i++ )
{
/* Check if frame buf is available */
if( !(p_aout->output.p_sys->waveheader[i].dwFlags & WHDR_DONE) )
return NULL;
}
-static int VolumeGet( aout_instance_t * p_aout, audio_volume_t * pi_volume )
+static int VolumeSet( aout_instance_t * p_aout, audio_volume_t i_volume,
+ bool mute )
{
- DWORD i_waveout_vol;
-
-#ifdef UNDER_CE
- waveOutGetVolume( 0, &i_waveout_vol );
-#else
- waveOutGetVolume( p_aout->output.p_sys->h_waveout, &i_waveout_vol );
-#endif
+ if( mute )
+ i_volume = AOUT_VOLUME_MIN;
- i_waveout_vol &= 0xFFFF;
- *pi_volume = p_aout->output.i_volume =
- (i_waveout_vol * AOUT_VOLUME_MAX + 0xFFFF /*rounding*/) / 2 / 0xFFFF;
- return 0;
-}
-
-static int VolumeSet( aout_instance_t * p_aout, audio_volume_t i_volume )
-{
unsigned long i_waveout_vol = i_volume * 0xFFFF * 2 / AOUT_VOLUME_MAX;
i_waveout_vol |= (i_waveout_vol << 16);
#else
waveOutSetVolume( p_aout->output.p_sys->h_waveout, i_waveout_vol );
#endif
-
- p_aout->output.i_volume = i_volume;
return 0;
}
*/
static uint32_t findDeviceID(char *psz_device_name)
{
- if(!psz_device_name)
+ if( !psz_device_name )
return WAVE_MAPPER;
uint32_t wave_devices = waveOutGetNumDevs();
WAVEOUTCAPS caps;
char sz_dev_name[MAXPNAMELEN+32];
- for(uint32_t i=0; i<wave_devices; i++)
+
+ for( uint32_t i = 0; i < wave_devices; i++ )
{
- if(waveOutGetDevCaps(i, &caps, sizeof(WAVEOUTCAPS))
+ if( waveOutGetDevCaps( i, &caps, sizeof(WAVEOUTCAPS) )
== MMSYSERR_NOERROR)
{
- sprintf(sz_dev_name, psz_device_name_fmt, caps.szPname,
+ sprintf( sz_dev_name, psz_device_name_fmt, caps.szPname,
caps.wMid,
caps.wPid
);
projects / vlc / blobdiff