# include "config.h"
#endif
+#include <stdio.h>
+#include <wchar.h>
+
+#define UNICODE
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_aout_intf.h>
-#include <vlc_charset.h> /* FromLocaleDup, LocaleFree */
+#include <vlc_charset.h> /* FromWide() */
#include <vlc_atomic.h>
#include "windows_audio_common.h"
static int PlayWaveOut ( audio_output_t *, HWAVEOUT, WAVEHDR *,
aout_buffer_t *, bool );
-static void CALLBACK WaveOutCallback ( HWAVEOUT, UINT, DWORD, DWORD, DWORD );
+static void CALLBACK WaveOutCallback ( HWAVEOUT, UINT, DWORD_PTR, DWORD_PTR, DWORD_PTR );
static void* WaveOutThread( void * );
static int VolumeSet( audio_output_t *, float, bool );
vlc_value_t, vlc_value_t, void * );
static uint32_t findDeviceID(char *);
-static const char psz_device_name_fmt[] = "%s ($%x,$%x)";
+static const wchar_t device_name_fmt[] = L"%ls ($%x,$%x)";
static const char *const ppsz_adev[] = { "wavemapper", };
static const char *const ppsz_adev_text[] = { N_("Microsoft Soundmapper") };
set_capability( "audio output", 50 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AOUT )
- add_bool( "waveout-float32", true, FLOAT_TEXT, FLOAT_LONGTEXT, true )
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_action_add( ReloadWaveoutDevices, N_("Refresh list") )
+ add_bool( "waveout-float32", true, FLOAT_TEXT, FLOAT_LONGTEXT, true )
+
set_callbacks( Open, Close )
vlc_module_end ()
*****************************************************************************/
struct aout_sys_t
{
+ aout_packet_t packet;
uint32_t i_wave_device_id; /* ID of selected output device */
HWAVEOUT h_waveout; /* handle to waveout instance */
return VLC_ENOMEM;
p_aout->pf_play = Play;
- p_aout->pf_pause = NULL;
- p_aout->pf_flush = NULL;
+ p_aout->pf_pause = aout_PacketPause;
+ p_aout->pf_flush = aout_PacketFlush;
/*
initialize/update Device selection List
{
/* log debug some infos about driver, to know who to blame
if it doesn't work */
- msg_Dbg( p_aout, "Drivername: %s", waveoutcaps.szPname);
+ msg_Dbg( p_aout, "Drivername: %ls", waveoutcaps.szPname);
msg_Dbg( p_aout, "Driver Version: %d.%d",
(waveoutcaps.vDriverVersion>>8)&255,
waveoutcaps.vDriverVersion & 255);
}
/* Calculate the frame size in bytes */
- p_aout->i_nb_samples = A52_FRAME_NB;
p_aout->format.i_bytes_per_frame = AOUT_SPDIF_SIZE;
p_aout->format.i_frame_length = A52_FRAME_NB;
p_aout->sys->i_buffer_size =
p_aout->format.i_bytes_per_frame;
+ aout_PacketInit( p_aout, &p_aout->sys->packet, A52_FRAME_NB );
aout_VolumeNoneInit( p_aout );
}
else
}
/* Calculate the frame size in bytes */
- p_aout->i_nb_samples = FRAME_SIZE;
aout_FormatPrepare( &p_aout->format );
p_aout->sys->i_buffer_size = FRAME_SIZE *
p_aout->format.i_bytes_per_frame;
- aout_VolumeSoftInit( p_aout );
+ aout_PacketInit( p_aout, &p_aout->sys->packet, FRAME_SIZE );
/* Check for hardware volume support */
if( waveOutGetDevCaps( (UINT_PTR)p_aout->sys->h_waveout,
- &wocaps, sizeof(wocaps) ) == MMSYSERR_NOERROR &&
- wocaps.dwSupport & WAVECAPS_VOLUME )
- {
- DWORD i_dummy;
- if( waveOutGetVolume( p_aout->sys->h_waveout, &i_dummy )
- == MMSYSERR_NOERROR )
- {
- p_aout->pf_volume_set = VolumeSet;
- }
- }
+ &wocaps, sizeof(wocaps) ) == MMSYSERR_NOERROR
+ && (wocaps.dwSupport & WAVECAPS_VOLUME) )
+ aout_VolumeHardInit( p_aout, VolumeSet, false /* ?? */ );
+ else
+ aout_VolumeSoftInit( p_aout );
}
malloc( p_aout->sys->i_buffer_size );
if( p_aout->sys->p_silence_buffer == NULL )
{
+ aout_PacketDestroy( p_aout );
free( p_aout->sys );
return VLC_ENOMEM;
}
}
/* Test for SPDIF support */
- if ( AOUT_FMT_NON_LINEAR( &p_aout->format ) )
+ if ( AOUT_FMT_SPDIF( &p_aout->format ) )
{
if( OpenWaveOut( p_aout,
p_aout->sys->i_wave_device_id,
*****************************************************************************/
static void Play( audio_output_t *_p_aout, block_t *block )
{
- aout_FifoPush( &_p_aout->fifo, block );
-
if( !_p_aout->sys->b_playing )
{
_p_aout->sys->b_playing = 1;
} else {
SetEvent( _p_aout->sys->new_buffer_event );
}
+
+ aout_PacketPlay( _p_aout, block );
}
/*****************************************************************************
CloseHandle( p_sys->new_buffer_event);
free( p_sys->p_silence_buffer );
+ aout_PacketDestroy( p_aout );
free( p_sys );
}
* WaveOutCallback: what to do once WaveOut has played its sound samples
*****************************************************************************/
static void CALLBACK WaveOutCallback( HWAVEOUT h_waveout, UINT uMsg,
- DWORD _p_aout,
- DWORD dwParam1, DWORD dwParam2 )
+ DWORD_PTR _p_aout,
+ DWORD_PTR dwParam1, DWORD_PTR dwParam2 )
{
(void)h_waveout; (void)dwParam1; (void)dwParam2;
audio_output_t *p_aout = (audio_output_t *)_p_aout;
int i, i_queued_frames;
bool b_sleek;
mtime_t next_date;
- uint32_t i_buffer_length = 64;
int canc = vlc_savecancel ();
/* We don't want any resampling when using S/PDIF */
// than wait a short time... before grabbing first frames
mwait( p_sys->start_date - AOUT_MAX_PTS_ADVANCE/4 );
-#define waveout_warn(msg) msg_Warn( p_aout, "aout_OutputNextBuffer no buffer "\
+#define waveout_warn(msg) msg_Warn( p_aout, "aout_PacketNext no buffer "\
"got next_date=%d ms, "\
"%d frames to play, %s",\
(int)(next_date/(mtime_t)1000), \
/* Take into account the latency */
- p_buffer = aout_OutputNextBuffer( p_aout,
- next_date,
- b_sleek );
-
+ p_buffer = aout_PacketNext( p_aout, next_date );
if(!p_buffer)
{
#if 0
- msg_Dbg( p_aout, "aout_OutputNextBuffer no buffer "
- "got next_date=%d ms, "
- "%d frames to play",
- (int)(next_date/(mtime_t)1000),
- i_queued_frames);
+ msg_Dbg( p_aout, "aout_PacketNext no buffer got "
+ "next_date=%"PRId64" ms, %d frames to play",
+ next_date/1000, i_queued_frames);
#endif
// means we are too early to request a new buffer?
waveout_warn("waiting...")
- next_date = aout_FifoFirstDate( &p_aout->fifo );
mwait( next_date - AOUT_MAX_PTS_ADVANCE/4 );
next_date = mdate();
- p_buffer = aout_OutputNextBuffer( p_aout, next_date,
- b_sleek );
+ p_buffer = aout_PacketNext( p_aout, next_date );
}
if( !p_buffer && i_queued_frames )
{
mtime_t buffer_length = p_buffer->i_length;
next_date = next_date + buffer_length;
- i_buffer_length = buffer_length/1000;
}
/* Do the channel reordering */
p_item->ppsz_list_text = xrealloc( p_item->ppsz_list_text,
(wave_devices+2) * sizeof(char *) );
- WAVEOUTCAPS caps;
- char sz_dev_name[MAXPNAMELEN+32];
int j=1;
for(int i=0; i<wave_devices; i++)
{
- if(waveOutGetDevCaps(i, &caps, sizeof(WAVEOUTCAPS))
- == MMSYSERR_NOERROR)
- {
- sprintf( sz_dev_name, psz_device_name_fmt, caps.szPname,
- caps.wMid,
- caps.wPid
- );
- p_item->ppsz_list[j] = FromLocaleDup( sz_dev_name );
- p_item->ppsz_list_text[j] = FromLocaleDup( sz_dev_name );
- p_item->i_list++;
- j++;
- }
+ WAVEOUTCAPS caps;
+ wchar_t dev_name[MAXPNAMELEN+32];
+ if(waveOutGetDevCaps(i, &caps, sizeof(WAVEOUTCAPS))
+ != MMSYSERR_NOERROR)
+ continue;
+
+ _snwprintf(dev_name, MAXPNAMELEN + 32, device_name_fmt,
+ caps.szPname, caps.wMid, caps.wPid);
+ p_item->ppsz_list[j] = FromWide( dev_name );
+ p_item->ppsz_list_text[j] = FromWide( dev_name );
+ p_item->i_list++;
+ j++;
}
p_item->ppsz_list[j] = NULL;
p_item->ppsz_list_text[j] = NULL;
- /* Signal change to the interface */
- p_item->b_dirty = true;
-
return VLC_SUCCESS;
}
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++ )
{
+ WAVEOUTCAPS caps;
+ wchar_t dev_name[MAXPNAMELEN+32];
+
if( waveOutGetDevCaps( i, &caps, sizeof(WAVEOUTCAPS) )
- == MMSYSERR_NOERROR)
- {
- sprintf( sz_dev_name, psz_device_name_fmt, caps.szPname,
- caps.wMid,
- caps.wPid
- );
- char *psz_temp = FromLocaleDup(sz_dev_name);
+ != MMSYSERR_NOERROR )
+ continue;
- if( !stricmp(psz_temp, psz_device_name) )
- {
- LocaleFree( psz_temp );
- return i;
- }
- LocaleFree( psz_temp );
+ _snwprintf( dev_name, MAXPNAMELEN + 32, device_name_fmt,
+ caps.szPname, caps.wMid, caps.wPid );
+ char *u8 = FromWide(dev_name);
+ if( !stricmp(u8, psz_device_name) )
+ {
+ free( u8 );
+ return i;
}
+ free( u8 );
}
return WAVE_MAPPER;
projects / vlc / blobdiff