#include <vlc_aout.h>
#include <vlc_charset.h>
-#include <windows.h>
-#include <mmsystem.h>
+#include "windows_audio_common.h"
+
#include <dsound.h>
#define FRAME_SIZE ((int)p_aout->output.output.i_rate/20) /* Size in samples */
-#define FRAMES_NUM 8 /* Needs to be > 3 */
-
-/*****************************************************************************
- * DirectSound GUIDs.
- * Defining them here allows us to get rid of the dxguid library during
- * the linking stage.
- *****************************************************************************/
-#include <initguid.h>
-
-/*****************************************************************************
- * Useful macros
- *****************************************************************************/
-#ifndef WAVE_FORMAT_IEEE_FLOAT
-# define WAVE_FORMAT_IEEE_FLOAT 0x0003
-#endif
-
-#ifndef WAVE_FORMAT_DOLBY_AC3_SPDIF
-# define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092
-#endif
-
-#ifndef WAVE_FORMAT_EXTENSIBLE
-#define WAVE_FORMAT_EXTENSIBLE 0xFFFE
-#endif
-
-#ifndef SPEAKER_FRONT_LEFT
-# define SPEAKER_FRONT_LEFT 0x1
-# define SPEAKER_FRONT_RIGHT 0x2
-# define SPEAKER_FRONT_CENTER 0x4
-# define SPEAKER_LOW_FREQUENCY 0x8
-# define SPEAKER_BACK_LEFT 0x10
-# define SPEAKER_BACK_RIGHT 0x20
-# define SPEAKER_FRONT_LEFT_OF_CENTER 0x40
-# define SPEAKER_FRONT_RIGHT_OF_CENTER 0x80
-# define SPEAKER_BACK_CENTER 0x100
-# define SPEAKER_SIDE_LEFT 0x200
-# define SPEAKER_SIDE_RIGHT 0x400
-# define SPEAKER_TOP_CENTER 0x800
-# define SPEAKER_TOP_FRONT_LEFT 0x1000
-# define SPEAKER_TOP_FRONT_CENTER 0x2000
-# define SPEAKER_TOP_FRONT_RIGHT 0x4000
-# define SPEAKER_TOP_BACK_LEFT 0x8000
-# define SPEAKER_TOP_BACK_CENTER 0x10000
-# define SPEAKER_TOP_BACK_RIGHT 0x20000
-# define SPEAKER_RESERVED 0x80000000
-#endif
-
-#ifndef DSSPEAKER_DSSPEAKER_DIRECTOUT
-# define DSSPEAKER_DSSPEAKER_DIRECTOUT 0x00000000
-#endif
-#ifndef DSSPEAKER_HEADPHONE
-# define DSSPEAKER_HEADPHONE 0x00000001
-#endif
-#ifndef DSSPEAKER_MONO
-# define DSSPEAKER_MONO 0x00000002
-#endif
-#ifndef DSSPEAKER_QUAD
-# define DSSPEAKER_QUAD 0x00000003
-#endif
-#ifndef DSSPEAKER_STEREO
-# define DSSPEAKER_STEREO 0x00000004
-#endif
-#ifndef DSSPEAKER_SURROUND
-# define DSSPEAKER_SURROUND 0x00000005
-#endif
-#ifndef DSSPEAKER_5POINT1
-# define DSSPEAKER_5POINT1 0x00000006
-#endif
-#ifndef DSSPEAKER_7POINT1
-# define DSSPEAKER_7POINT1 0x00000007
-#endif
-#ifndef DSSPEAKER_7POINT1_SURROUND
-# define DSSPEAKER_7POINT1_SURROUND 0x00000008
-#endif
-#ifndef DSSPEAKER_7POINT1_WIDE
-# define DSSPEAKER_7POINT1_WIDE DSSPEAKER_7POINT1
-#endif
-
-#ifndef _WAVEFORMATEXTENSIBLE_
-typedef struct {
- WAVEFORMATEX Format;
- union {
- WORD wValidBitsPerSample; /* bits of precision */
- WORD wSamplesPerBlock; /* valid if wBitsPerSample==0 */
- WORD wReserved; /* If neither applies, set to zero. */
- } Samples;
- DWORD dwChannelMask; /* which channels are */
- /* present in stream */
- GUID SubFormat;
-} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
-#endif
-
-
-DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, WAVE_FORMAT_IEEE_FLOAT, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
-DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_PCM, WAVE_FORMAT_PCM, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
-DEFINE_GUID( _KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF, WAVE_FORMAT_DOLBY_AC3_SPDIF, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 );
/*****************************************************************************
* notification_thread_t: DirectX event thread
{
HINSTANCE hdsound_dll; /* handle of the opened dsound dll */
- char * psz_device; /* user defined device name */
+ char * psz_device; /* user defined device name */
LPGUID p_device_guid;
LPDIRECTSOUND p_dsobject; /* main Direct Sound object */
notification_thread_t *p_notif; /* DirectSoundThread id */
- int b_playing; /* playing status */
+ int b_playing; /* playing status */
- int i_frame_size; /* Size in bytes of one frame */
+ int i_frame_size; /* Size in bytes of one frame */
- int i_speaker_setup; /* Speaker setup override */
+ int i_speaker_setup; /* Speaker setup override */
- bool b_chan_reorder; /* do we need channel reordering */
- int pi_chan_table[AOUT_CHAN_MAX];
+ bool b_chan_reorder; /* do we need channel reordering */
+ int pi_chan_table[AOUT_CHAN_MAX];
uint32_t i_channel_mask;
uint32_t i_bits_per_sample;
uint32_t i_channels;
};
-static const uint32_t pi_channels_src[] =
- { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT,
- AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT,
- AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER,
- AOUT_CHAN_CENTER, AOUT_CHAN_LFE, 0 };
-static const uint32_t pi_channels_in[] =
- { SPEAKER_FRONT_LEFT, SPEAKER_FRONT_RIGHT,
- SPEAKER_SIDE_LEFT, SPEAKER_SIDE_RIGHT,
- SPEAKER_BACK_LEFT, SPEAKER_BACK_RIGHT, SPEAKER_BACK_CENTER,
- SPEAKER_FRONT_CENTER, SPEAKER_LOW_FREQUENCY, 0 };
-static const uint32_t pi_channels_out[] =
- { SPEAKER_FRONT_LEFT, SPEAKER_FRONT_RIGHT,
- SPEAKER_FRONT_CENTER, SPEAKER_LOW_FREQUENCY,
- SPEAKER_BACK_LEFT, SPEAKER_BACK_RIGHT,
- SPEAKER_BACK_CENTER,
- SPEAKER_SIDE_LEFT, SPEAKER_SIDE_RIGHT, 0 };
-
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
*****************************************************************************/
#define DEVICE_TEXT N_("Output device")
#define DEVICE_LONGTEXT N_("Select your audio output device")
-#define FLOAT_TEXT N_("Use float32 output")
-#define FLOAT_LONGTEXT N_( \
- "The option allows you to enable or disable the high-quality float32 " \
- "audio output mode (which is not well supported by some soundcards)." )
+
#define SPEAKER_TEXT N_("Speaker configuration")
#define SPEAKER_LONGTEXT N_("Select speaker configuration you want to use. " \
"This option doesn't upmix! So NO e.g. Stereo -> 5.1 conversion." )
const char * const * ppsz_compare = speaker_list;
- msg_Dbg( p_aout, "OpenAudio" );
+ msg_Dbg( p_aout, "Opening DirectSound Audio Output" );
/* Allocate structure */
p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) );
if ( *ppsz_compare == NULL )
{
- msg_Err( p_aout, "(%s) isn't valid speaker setup option",
- psz_speaker );
+ msg_Err( p_aout, "(%s) isn't valid speaker setup option", psz_speaker );
msg_Err( p_aout, "Defaulting to Windows default speaker config");
i = 0;
}
/* Get DirectSoundEnumerate */
OurDirectSoundEnumerate = (void *)
GetProcAddress( p_aout->output.p_sys->hdsound_dll,
- "DirectSoundEnumerateA" );
+ "DirectSoundEnumerateW" );
if( OurDirectSoundEnumerate )
{
p_aout->output.p_sys->psz_device = config_GetPsz(p_aout, "directx-audio-device-name");
static int CALLBACK CallBackConfigNBEnum( LPGUID p_guid, LPCSTR psz_desc,
LPCSTR psz_mod, LPVOID p_nb )
{
- VLC_UNUSED( psz_mod );
- VLC_UNUSED( psz_desc );
- VLC_UNUSED( p_guid );
+ VLC_UNUSED( psz_mod ); VLC_UNUSED( psz_desc ); VLC_UNUSED( p_guid );
+
int * a = (int *)p_nb;
- *a = *a +1;
+ (*a)++;
return 1;
}
/* Get DirectSoundEnumerate */
OurDirectSoundEnumerate = (void *)
GetProcAddress( hdsound_dll,
- "DirectSoundEnumerateA" );
+ "DirectSoundEnumerateW" );
int nb_devices = 0;
OurDirectSoundEnumerate(CallBackConfigNBEnum, &nb_devices);
msg_Dbg(p_this,"found %d devices", nb_devices);
projects / vlc / blobdiff