* 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.
*****************************************************************************/
/*****************************************************************************
{
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;
set_capability( "audio output", 100 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AOUT )
- add_shortcut( "directx" )
+ add_shortcut( "directx", "directsound" )
+
add_string( "directx-audio-device-name", "default", NULL,
DEVICE_TEXT, DEVICE_LONGTEXT, false )
- change_string_list( ppsz_adev, ppsz_adev_text, ReloadDirectXDevices )
- change_action_add( ReloadDirectXDevices, N_("Refresh list") )
+ add_deprecated_alias( "directx-audio-device" ) /* Since 1.1.0 */
+ change_string_list( ppsz_adev, ppsz_adev_text, ReloadDirectXDevices )
+ change_action_add( ReloadDirectXDevices, N_("Refresh list") )
+ change_need_restart ()
add_bool( "directx-audio-float32", false, NULL, FLOAT_TEXT,
FLOAT_LONGTEXT, true )
add_string( "directx-audio-speaker", "Windows default", NULL,
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;
}
text.psz_string = _("A/52 over S/PDIF");
var_Change( p_aout, "audio-device",
VLC_VAR_ADDCHOICE, &val, &text );
- if( config_GetInt( p_aout, "spdif" ) )
+ if( var_InheritBool( p_aout, "spdif" ) )
var_Set( p_aout, "audio-device", val );
}
}
if( !p_aout->output.p_sys->b_playing )
{
aout_buffer_t *p_buffer;
- int i;
p_aout->output.p_sys->b_playing = 1;
aout_FifoFirstDate( p_aout, &p_aout->output.fifo );
/* fill in the first samples */
- for( i = 0; i < FRAMES_NUM; i++ )
+ for( int i = 0; i < FRAMES_NUM; i++ )
{
p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
if( !p_buffer ) break;
/* kill the position notification thread, if any */
if( p_sys->p_notif )
{
- vlc_object_detach( p_sys->p_notif );
vlc_object_kill( p_sys->p_notif );
/* wake up the audio thread if needed */
if( !p_sys->b_playing ) SetEvent( p_sys->p_notif->event );
/*****************************************************************************
* CallBackDirectSoundEnum: callback to enumerate available devices
*****************************************************************************/
-static int CALLBACK CallBackDirectSoundEnum( LPGUID p_guid, LPCSTR psz_desc,
- LPCSTR psz_mod, LPVOID _p_aout )
+static int CALLBACK CallBackDirectSoundEnum( LPGUID p_guid, LPCWSTR psz_desc,
+ LPCWSTR psz_mod, LPVOID _p_aout )
{
VLC_UNUSED( psz_mod );
aout_instance_t *p_aout = (aout_instance_t *)_p_aout;
- msg_Dbg( p_aout, "found device: %s", psz_desc );
+ char *psz_device = FromWide( psz_desc );
+ msg_Dbg( p_aout, "found device: %s", psz_device );
- if( p_aout->output.p_sys->psz_device && !strcmp(p_aout->output.p_sys->psz_device, psz_desc) && p_guid )
+ if( p_aout->output.p_sys->psz_device &&
+ !strcmp(p_aout->output.p_sys->psz_device, psz_device) && p_guid )
{
/* Use the device corresponding to psz_device */
p_aout->output.p_sys->p_device_guid = malloc( sizeof( GUID ) );
*p_aout->output.p_sys->p_device_guid = *p_guid;
- msg_Dbg( p_aout, "using device: %s", psz_desc );
+ msg_Dbg( p_aout, "using device: %s", psz_device );
}
else
{
/* If no default device has been selected, chose the first one */
if( !p_aout->output.p_sys->psz_device && p_guid )
{
- p_aout->output.p_sys->psz_device = strdup( psz_desc );
+ p_aout->output.p_sys->psz_device = strdup( psz_device );
p_aout->output.p_sys->p_device_guid = malloc( sizeof( GUID ) );
*p_aout->output.p_sys->p_device_guid = *p_guid;
- msg_Dbg( p_aout, "using device: %s", psz_desc );
+ msg_Dbg( p_aout, "using device: %s", psz_device );
}
}
- return 1;
+
+ free( psz_device );
+ return true;
}
/*****************************************************************************
static int InitDirectSound( aout_instance_t *p_aout )
{
HRESULT (WINAPI *OurDirectSoundCreate)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN);
- HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACK, LPVOID);
+ HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACKW, LPVOID);
p_aout->output.p_sys->hdsound_dll = LoadLibrary("DSOUND.DLL");
if( p_aout->output.p_sys->hdsound_dll == NULL )
/* 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");
+ p_aout->output.p_sys->psz_device = var_InheritString(p_aout, "directx-audio-device-name");
/* Attempt enumeration */
if( FAILED( OurDirectSoundEnumerate( CallBackDirectSoundEnum,
p_aout ) ) )
p_notif->i_frame_size, /* Number of bytes */
&p_write_position, /* Address of lock start */
&l_bytes1, /* Count of bytes locked before wrap around */
- &p_wrap_around, /* Buffer adress (if wrap around) */
+ &p_wrap_around, /* Buffer address (if wrap around) */
&l_bytes2, /* Count of bytes after wrap around */
0 ); /* Flags */
if( dsresult == DSERR_BUFFERLOST )
/*****************************************************************************
* CallBackConfigNBEnum: callback to get the number of available devices
*****************************************************************************/
-static int CALLBACK CallBackConfigNBEnum( LPGUID p_guid, LPCSTR psz_desc,
- LPCSTR psz_mod, LPVOID p_nb )
+static int CALLBACK CallBackConfigNBEnum( LPGUID p_guid, LPCWSTR psz_desc,
+ LPCWSTR 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;
- return 1;
+ (*a)++;
+ return true;
}
/*****************************************************************************
* CallBackConfigEnum: callback to add available devices to the preferences list
*****************************************************************************/
-static int CALLBACK CallBackConfigEnum( LPGUID p_guid, LPCSTR psz_desc,
- LPCSTR psz_mod, LPVOID _p_item )
+static int CALLBACK CallBackConfigEnum( LPGUID p_guid, LPCWSTR psz_desc,
+ LPCWSTR psz_mod, LPVOID _p_item )
{
- VLC_UNUSED( psz_mod );
- VLC_UNUSED( p_guid );
+ VLC_UNUSED( psz_mod ); VLC_UNUSED( p_guid );
module_config_t *p_item = (module_config_t *) _p_item;
- p_item->ppsz_list[p_item->i_list] = FromLocaleDup(psz_desc);
- p_item->ppsz_list_text[p_item->i_list] = FromLocaleDup(psz_desc);
- p_item->i_list = p_item->i_list +1;
- return 1;
+ p_item->ppsz_list[p_item->i_list] = FromWide( psz_desc );
+ p_item->ppsz_list_text[p_item->i_list] = FromWide( psz_desc );
+ p_item->i_list++;
+ return true;
}
/*****************************************************************************
vlc_value_t newval, vlc_value_t oldval, void *data )
{
VLC_UNUSED( newval ); VLC_UNUSED( oldval ); VLC_UNUSED( data );
+
module_config_t *p_item = config_FindConfig( p_this, psz_name );
if( !p_item ) return VLC_SUCCESS;
/* Clear-up the current list */
if( p_item->i_list )
{
- int i;
- for( i = 0; i < p_item->i_list; i++ )
+ for( int i = 0; i < p_item->i_list; i++ )
{
free((char *)(p_item->ppsz_list[i]) );
free((char *)(p_item->ppsz_list_text[i]) );
}
}
- HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACK, LPVOID);
+ HRESULT (WINAPI *OurDirectSoundEnumerate)(LPDSENUMCALLBACKW, LPVOID);
HANDLE hdsound_dll = LoadLibrary("DSOUND.DLL");
if( hdsound_dll == NULL )
{
msg_Warn( p_this, "cannot open DSOUND.DLL" );
+ return VLC_SUCCESS;
}
/* Get DirectSoundEnumerate */
OurDirectSoundEnumerate = (void *)
- GetProcAddress( hdsound_dll,
- "DirectSoundEnumerateA" );
+ GetProcAddress( hdsound_dll, "DirectSoundEnumerateW" );
+
+ if( OurDirectSoundEnumerate == NULL )
+ goto error;
+
int nb_devices = 0;
OurDirectSoundEnumerate(CallBackConfigNBEnum, &nb_devices);
msg_Dbg(p_this,"found %d devices", nb_devices);
p_item->ppsz_list = xrealloc( p_item->ppsz_list,
- nb_devices * sizeof(char *) );
+ nb_devices * sizeof(char *) );
p_item->ppsz_list_text = xrealloc( p_item->ppsz_list_text,
- nb_devices * sizeof(char *) );
+ nb_devices * sizeof(char *) );
p_item->i_list = 0;
OurDirectSoundEnumerate(CallBackConfigEnum, p_item);
- FreeLibrary(hdsound_dll);
-
/* Signal change to the interface */
p_item->b_dirty = true;
+error:
+ FreeLibrary(hdsound_dll);
+
return VLC_SUCCESS;
}
projects / vlc / blobdiff